summaryrefslogtreecommitdiff
path: root/apps/debug_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r--apps/debug_menu.c460
1 files changed, 217 insertions, 243 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 12ba0c5fbe..7ef531f4df 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -93,10 +93,7 @@ bool dbg_os(void)
93 93
94 switch(button) 94 switch(button)
95 { 95 {
96#ifdef BUTTON_OFF 96 case SETTINGS_CANCEL:
97 case BUTTON_OFF:
98#endif
99 case BUTTON_LEFT:
100 return false; 97 return false;
101 } 98 }
102 } 99 }
@@ -127,16 +124,16 @@ bool dbg_os(void)
127 124
128 switch(button) 125 switch(button)
129 { 126 {
130 case BUTTON_STOP: 127 case SETTINGS_CANCEL:
131 return false; 128 return false;
132 129
133 case BUTTON_LEFT: 130 case SETTINGS_DEC:
134 currval--; 131 currval--;
135 if(currval < 0) 132 if(currval < 0)
136 currval = num_threads-1; 133 currval = num_threads-1;
137 break; 134 break;
138 135
139 case BUTTON_RIGHT: 136 case SETTINGS_INC:
140 currval++; 137 currval++;
141 if(currval > num_threads-1) 138 if(currval > num_threads-1)
142 currval = 0; 139 currval = 0;
@@ -161,7 +158,7 @@ bool dbg_mpeg_thread(void)
161 button = button_get_w_tmo(HZ/5); 158 button = button_get_w_tmo(HZ/5);
162 switch(button) 159 switch(button)
163 { 160 {
164 case BUTTON_OFF | BUTTON_REL: 161 case SETTINGS_CANCEL:
165 return false; 162 return false;
166 } 163 }
167 164
@@ -375,7 +372,7 @@ bool dbg_hw_info(void)
375 while(1) 372 while(1)
376 { 373 {
377 button = button_get(true); 374 button = button_get(true);
378 if(button == (BUTTON_OFF | BUTTON_REL)) 375 if(button == SETTINGS_CANCEL)
379 return false; 376 return false;
380 } 377 }
381 378
@@ -460,16 +457,16 @@ bool dbg_hw_info(void)
460 457
461 switch(button) 458 switch(button)
462 { 459 {
463 case BUTTON_STOP: 460 case SETTINGS_CANCEL:
464 return false; 461 return false;
465 462
466 case BUTTON_LEFT: 463 case SETTINGS_DEC:
467 currval--; 464 currval--;
468 if(currval < 0) 465 if(currval < 0)
469 currval = 5; 466 currval = 5;
470 break; 467 break;
471 468
472 case BUTTON_RIGHT: 469 case SETTINGS_INC:
473 currval++; 470 currval++;
474 if(currval > 5) 471 if(currval > 5)
475 currval = 0; 472 currval = 0;
@@ -507,26 +504,17 @@ bool dbg_partitions(void)
507 504
508 switch(button) 505 switch(button)
509 { 506 {
510#ifdef HAVE_RECORDER_KEYPAD 507 case SETTINGS_OK:
511 case BUTTON_OFF: 508 case SETTINGS_CANCEL:
512#else
513 case BUTTON_STOP:
514#endif
515 return false; 509 return false;
516 510
517#ifdef HAVE_RECORDER_KEYPAD 511 case SETTINGS_DEC:
518 case BUTTON_UP:
519#endif
520 case BUTTON_LEFT:
521 partition--; 512 partition--;
522 if (partition < 0) 513 if (partition < 0)
523 partition = 3; 514 partition = 3;
524 break; 515 break;
525 516
526#ifdef HAVE_RECORDER_KEYPAD 517 case SETTINGS_INC:
527 case BUTTON_DOWN:
528#endif
529 case BUTTON_RIGHT:
530 partition++; 518 partition++;
531 if (partition > 3) 519 if (partition > 3)
532 partition = 0; 520 partition = 0;
@@ -595,7 +583,7 @@ bool dbg_ports(void)
595 583
596 switch(button) 584 switch(button)
597 { 585 {
598 case BUTTON_OFF | BUTTON_REL: 586 case SETTINGS_CANCEL:
599 return false; 587 return false;
600 } 588 }
601 } 589 }
@@ -675,16 +663,16 @@ bool dbg_ports(void)
675 663
676 switch(button) 664 switch(button)
677 { 665 {
678 case BUTTON_STOP | BUTTON_REL: 666 case SETTINGS_CANCEL:
679 return false; 667 return false;
680 668
681 case BUTTON_LEFT: 669 case SETTINGS_DEC:
682 currval--; 670 currval--;
683 if(currval < 0) 671 if(currval < 0)
684 currval = 10; 672 currval = 10;
685 break; 673 break;
686 674
687 case BUTTON_RIGHT: 675 case SETTINGS_INC:
688 currval++; 676 currval++;
689 if(currval > 10) 677 if(currval > 10)
690 currval = 0; 678 currval = 0;
@@ -727,20 +715,25 @@ bool dbg_rtc(void)
727 715
728 switch(button) 716 switch(button)
729 { 717 {
730 case BUTTON_DOWN: 718 case SETTINGS_INC:
731 if (addr < 63-16) { addr += 16; } 719 if (addr < 63-16) { addr += 16; }
732 break; 720 break;
733 case BUTTON_UP: 721
734 if (addr) { addr -= 16; } 722 case SETTINGS_DEC:
735 break; 723 if (addr) { addr -= 16; }
736 case BUTTON_F2: 724 break;
737 /* clear the user RAM space */ 725
738 for (c = 0; c <= 43; c++) 726#ifdef BUTTON_F2
739 rtc_write(0x14 + c, 0); 727 case BUTTON_F2:
740 break; 728 /* clear the user RAM space */
741 case BUTTON_OFF | BUTTON_REL: 729 for (c = 0; c <= 43; c++)
742 case BUTTON_LEFT | BUTTON_REL: 730 rtc_write(0x14 + c, 0);
743 return false; 731 break;
732#endif
733
734 case SETTINGS_OK:
735 case SETTINGS_CANCEL:
736 return false;
744 } 737 }
745 } 738 }
746 return false; 739 return false;
@@ -781,26 +774,17 @@ bool dbg_mas(void)
781 774
782 switch(button_get_w_tmo(HZ/16)) 775 switch(button_get_w_tmo(HZ/16))
783 { 776 {
784#ifdef HAVE_RECORDER_KEYPAD 777 case SETTINGS_INC:
785 case BUTTON_DOWN: 778 addr = (addr + NUMROWS) & 0xFF; /* register addrs are 8 bit */
786#else 779 break;
787 case BUTTON_RIGHT: 780
788#endif 781 case SETTINGS_DEC:
789 addr = (addr + NUMROWS) & 0xFF; /* register addrs are 8 bit */ 782 addr = (addr - NUMROWS) & 0xFF; /* register addrs are 8 bit */
790 break; 783 break;
791#ifdef HAVE_RECORDER_KEYPAD 784
792 case BUTTON_UP: 785 case SETTINGS_OK:
793#else 786 case SETTINGS_CANCEL:
794 case BUTTON_LEFT: 787 return false;
795#endif
796 addr = (addr - NUMROWS) & 0xFF; /* register addrs are 8 bit */
797 break;
798#ifdef HAVE_RECORDER_KEYPAD
799 case BUTTON_LEFT:
800#else
801 case BUTTON_DOWN:
802#endif
803 return false;
804 } 788 }
805 } 789 }
806 return false; 790 return false;
@@ -830,15 +814,16 @@ bool dbg_mas_codec(void)
830 814
831 switch(button_get_w_tmo(HZ/16)) 815 switch(button_get_w_tmo(HZ/16))
832 { 816 {
833 case BUTTON_DOWN: 817 case SETTINGS_INC:
834 addr += 4; 818 addr += 4;
835 break; 819 break;
836 case BUTTON_UP: 820 case SETTINGS_DEC:
837 if (addr) { addr -= 4; } 821 if (addr) { addr -= 4; }
838 break; 822 break;
839 case BUTTON_LEFT | BUTTON_REL: 823
840 case BUTTON_OFF | BUTTON_REL: 824 case SETTINGS_OK:
841 return false; 825 case SETTINGS_CANCEL:
826 return false;
842 } 827 }
843 } 828 }
844 return false; 829 return false;
@@ -994,18 +979,18 @@ bool view_battery(void)
994 979
995 switch(button_get_w_tmo(HZ/2)) 980 switch(button_get_w_tmo(HZ/2))
996 { 981 {
997 case BUTTON_UP: 982 case SETTINGS_DEC:
998 if (view) 983 if (view)
999 view--; 984 view--;
1000 break; 985 break;
1001 986
1002 case BUTTON_DOWN: 987 case SETTINGS_INC:
1003 if (view < 3) 988 if (view < 3)
1004 view++; 989 view++;
1005 break; 990 break;
1006 991
1007 case BUTTON_LEFT | BUTTON_REL: 992 case SETTINGS_OK:
1008 case BUTTON_OFF | BUTTON_REL: 993 case SETTINGS_CANCEL:
1009 return false; 994 return false;
1010 } 995 }
1011 } 996 }
@@ -1031,158 +1016,159 @@ bool dbg_mas_info(void)
1031 { 1016 {
1032 switch(currval) 1017 switch(currval)
1033 { 1018 {
1034 case 0: 1019 case 0:
1035 mas_readmem(MAS_BANK_D1, 0xff7, &val, 1); 1020 mas_readmem(MAS_BANK_D1, 0xff7, &val, 1);
1036 lcd_puts(0, 0, "Design Code"); 1021 lcd_puts(0, 0, "Design Code");
1037 snprintf(buf, 32, "%05x ", val); 1022 snprintf(buf, 32, "%05x ", val);
1038 break; 1023 break;
1039 case 1: 1024 case 1:
1040 lcd_puts(0, 0, "DC/DC mode "); 1025 lcd_puts(0, 0, "DC/DC mode ");
1041 snprintf(buf, 32, "8e: %05x ", mas_readreg(0x8e) & 0xfffff); 1026 snprintf(buf, 32, "8e: %05x ", mas_readreg(0x8e) & 0xfffff);
1042 break; 1027 break;
1043 case 2: 1028 case 2:
1044 lcd_puts(0, 0, "Mute/Bypass"); 1029 lcd_puts(0, 0, "Mute/Bypass");
1045 snprintf(buf, 32, "aa: %05x ", mas_readreg(0xaa) & 0xfffff); 1030 snprintf(buf, 32, "aa: %05x ", mas_readreg(0xaa) & 0xfffff);
1046 break; 1031 break;
1047 case 3: 1032 case 3:
1048 lcd_puts(0, 0, "PIOData "); 1033 lcd_puts(0, 0, "PIOData ");
1049 snprintf(buf, 32, "ed: %05x ", mas_readreg(0xed) & 0xfffff); 1034 snprintf(buf, 32, "ed: %05x ", mas_readreg(0xed) & 0xfffff);
1050 break; 1035 break;
1051 case 4: 1036 case 4:
1052 lcd_puts(0, 0, "Startup Cfg"); 1037 lcd_puts(0, 0, "Startup Cfg");
1053 snprintf(buf, 32, "e6: %05x ", mas_readreg(0xe6) & 0xfffff); 1038 snprintf(buf, 32, "e6: %05x ", mas_readreg(0xe6) & 0xfffff);
1054 break; 1039 break;
1055 case 5: 1040 case 5:
1056 lcd_puts(0, 0, "KPrescale "); 1041 lcd_puts(0, 0, "KPrescale ");
1057 snprintf(buf, 32, "e7: %05x ", mas_readreg(0xe7) & 0xfffff); 1042 snprintf(buf, 32, "e7: %05x ", mas_readreg(0xe7) & 0xfffff);
1058 break; 1043 break;
1059 case 6: 1044 case 6:
1060 lcd_puts(0, 0, "KBass "); 1045 lcd_puts(0, 0, "KBass ");
1061 snprintf(buf, 32, "6b: %05x ", mas_readreg(0x6b) & 0xfffff); 1046 snprintf(buf, 32, "6b: %05x ", mas_readreg(0x6b) & 0xfffff);
1062 break; 1047 break;
1063 case 7: 1048 case 7:
1064 lcd_puts(0, 0, "KTreble "); 1049 lcd_puts(0, 0, "KTreble ");
1065 snprintf(buf, 32, "6f: %05x ", mas_readreg(0x6f) & 0xfffff); 1050 snprintf(buf, 32, "6f: %05x ", mas_readreg(0x6f) & 0xfffff);
1066 break; 1051 break;
1067 case 8: 1052 case 8:
1068 mas_readmem(MAS_BANK_D0, 0x300, &val, 1); 1053 mas_readmem(MAS_BANK_D0, 0x300, &val, 1);
1069 lcd_puts(0, 0, "Frame Count"); 1054 lcd_puts(0, 0, "Frame Count");
1070 snprintf(buf, 32, "0/300: %04x", val & 0xffff); 1055 snprintf(buf, 32, "0/300: %04x", val & 0xffff);
1071 break; 1056 break;
1072 case 9: 1057 case 9:
1073 mas_readmem(MAS_BANK_D0, 0x301, &val, 1); 1058 mas_readmem(MAS_BANK_D0, 0x301, &val, 1);
1074 lcd_puts(0, 0, "Status1 "); 1059 lcd_puts(0, 0, "Status1 ");
1075 snprintf(buf, 32, "0/301: %04x", val & 0xffff); 1060 snprintf(buf, 32, "0/301: %04x", val & 0xffff);
1076 break; 1061 break;
1077 case 10: 1062 case 10:
1078 mas_readmem(MAS_BANK_D0, 0x302, &val, 1); 1063 mas_readmem(MAS_BANK_D0, 0x302, &val, 1);
1079 lcd_puts(0, 0, "Status2 "); 1064 lcd_puts(0, 0, "Status2 ");
1080 snprintf(buf, 32, "0/302: %04x", val & 0xffff); 1065 snprintf(buf, 32, "0/302: %04x", val & 0xffff);
1081 break; 1066 break;
1082 case 11: 1067 case 11:
1083 mas_readmem(MAS_BANK_D0, 0x303, &val, 1); 1068 mas_readmem(MAS_BANK_D0, 0x303, &val, 1);
1084 lcd_puts(0, 0, "CRC Count "); 1069 lcd_puts(0, 0, "CRC Count ");
1085 snprintf(buf, 32, "0/303: %04x", val & 0xffff); 1070 snprintf(buf, 32, "0/303: %04x", val & 0xffff);
1086 break; 1071 break;
1087 case 12: 1072 case 12:
1088 mas_readmem(MAS_BANK_D0, 0x36d, &val, 1); 1073 mas_readmem(MAS_BANK_D0, 0x36d, &val, 1);
1089 lcd_puts(0, 0, "PLLOffset48"); 1074 lcd_puts(0, 0, "PLLOffset48");
1090 snprintf(buf, 32, "0/36d %05x", val & 0xfffff); 1075 snprintf(buf, 32, "0/36d %05x", val & 0xfffff);
1091 break; 1076 break;
1092 case 13: 1077 case 13:
1093 mas_readmem(MAS_BANK_D0, 0x32d, &val, 1); 1078 mas_readmem(MAS_BANK_D0, 0x32d, &val, 1);
1094 lcd_puts(0, 0, "PLLOffset48"); 1079 lcd_puts(0, 0, "PLLOffset48");
1095 snprintf(buf, 32, "0/32d %05x", val & 0xfffff); 1080 snprintf(buf, 32, "0/32d %05x", val & 0xfffff);
1096 break; 1081 break;
1097 case 14: 1082 case 14:
1098 mas_readmem(MAS_BANK_D0, 0x36e, &val, 1); 1083 mas_readmem(MAS_BANK_D0, 0x36e, &val, 1);
1099 lcd_puts(0, 0, "PLLOffset44"); 1084 lcd_puts(0, 0, "PLLOffset44");
1100 snprintf(buf, 32, "0/36e %05x", val & 0xfffff); 1085 snprintf(buf, 32, "0/36e %05x", val & 0xfffff);
1101 break; 1086 break;
1102 case 15: 1087 case 15:
1103 mas_readmem(MAS_BANK_D0, 0x32e, &val, 1); 1088 mas_readmem(MAS_BANK_D0, 0x32e, &val, 1);
1104 lcd_puts(0, 0, "PLLOffset44"); 1089 lcd_puts(0, 0, "PLLOffset44");
1105 snprintf(buf, 32, "0/32e %05x", val & 0xfffff); 1090 snprintf(buf, 32, "0/32e %05x", val & 0xfffff);
1106 break; 1091 break;
1107 case 16: 1092 case 16:
1108 mas_readmem(MAS_BANK_D0, 0x36f, &val, 1); 1093 mas_readmem(MAS_BANK_D0, 0x36f, &val, 1);
1109 lcd_puts(0, 0, "OutputConf "); 1094 lcd_puts(0, 0, "OutputConf ");
1110 snprintf(buf, 32, "0/36f %05x", val & 0xfffff); 1095 snprintf(buf, 32, "0/36f %05x", val & 0xfffff);
1111 break; 1096 break;
1112 case 17: 1097 case 17:
1113 mas_readmem(MAS_BANK_D0, 0x32f, &val, 1); 1098 mas_readmem(MAS_BANK_D0, 0x32f, &val, 1);
1114 lcd_puts(0, 0, "OutputConf "); 1099 lcd_puts(0, 0, "OutputConf ");
1115 snprintf(buf, 32, "0/32f %05x", val & 0xfffff); 1100 snprintf(buf, 32, "0/32f %05x", val & 0xfffff);
1116 break; 1101 break;
1117 case 18: 1102 case 18:
1118 mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1); 1103 mas_readmem(MAS_BANK_D1, 0x7f8, &val, 1);
1119 lcd_puts(0, 0, "LL Gain "); 1104 lcd_puts(0, 0, "LL Gain ");
1120 snprintf(buf, 32, "1/7f8 %05x", val & 0xfffff); 1105 snprintf(buf, 32, "1/7f8 %05x", val & 0xfffff);
1121 break; 1106 break;
1122 case 19: 1107 case 19:
1123 mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1); 1108 mas_readmem(MAS_BANK_D1, 0x7f9, &val, 1);
1124 lcd_puts(0, 0, "LR Gain "); 1109 lcd_puts(0, 0, "LR Gain ");
1125 snprintf(buf, 32, "1/7f9 %05x", val & 0xfffff); 1110 snprintf(buf, 32, "1/7f9 %05x", val & 0xfffff);
1126 break; 1111 break;
1127 case 20: 1112 case 20:
1128 mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1); 1113 mas_readmem(MAS_BANK_D1, 0x7fa, &val, 1);
1129 lcd_puts(0, 0, "RL Gain "); 1114 lcd_puts(0, 0, "RL Gain ");
1130 snprintf(buf, 32, "1/7fa %05x", val & 0xfffff); 1115 snprintf(buf, 32, "1/7fa %05x", val & 0xfffff);
1131 break; 1116 break;
1132 case 21: 1117 case 21:
1133 mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1); 1118 mas_readmem(MAS_BANK_D1, 0x7fb, &val, 1);
1134 lcd_puts(0, 0, "RR Gain "); 1119 lcd_puts(0, 0, "RR Gain ");
1135 snprintf(buf, 32, "1/7fb %05x", val & 0xfffff); 1120 snprintf(buf, 32, "1/7fb %05x", val & 0xfffff);
1136 break; 1121 break;
1137 case 22: 1122 case 22:
1138 lcd_puts(0, 0, "L Trailbits"); 1123 lcd_puts(0, 0, "L Trailbits");
1139 snprintf(buf, 32, "c5: %05x ", mas_readreg(0xc5) & 0xfffff); 1124 snprintf(buf, 32, "c5: %05x ", mas_readreg(0xc5) & 0xfffff);
1140 break; 1125 break;
1141 case 23: 1126 case 23:
1142 lcd_puts(0, 0, "R Trailbits"); 1127 lcd_puts(0, 0, "R Trailbits");
1143 snprintf(buf, 32, "c6: %05x ", mas_readreg(0xc6) & 0xfffff); 1128 snprintf(buf, 32, "c6: %05x ", mas_readreg(0xc6) & 0xfffff);
1144 break; 1129 break;
1145 } 1130 }
1146 lcd_puts(0, 1, buf); 1131 lcd_puts(0, 1, buf);
1147 1132
1148 button = button_get_w_tmo(HZ/5); 1133 button = button_get_w_tmo(HZ/5);
1149 switch(button) 1134 switch(button)
1150 { 1135 {
1151 case BUTTON_STOP: 1136 case SETTINGS_CANCEL:
1152 return false; 1137 return false;
1153 1138
1154 case BUTTON_LEFT: 1139 case SETTINGS_DEC:
1155 currval--; 1140 currval--;
1156 if(currval < 0) 1141 if(currval < 0)
1157 currval = 23; 1142 currval = 23;
1158 break; 1143 break;
1159 1144
1160 case BUTTON_RIGHT: 1145 case SETTINGS_INC:
1161 currval++; 1146 currval++;
1162 if(currval > 23) 1147 if(currval > 23)
1163 currval = 0; 1148 currval = 0;
1164 break; 1149 break;
1165 case BUTTON_PLAY: 1150
1166 pll_toggle = !pll_toggle; 1151 case SETTINGS_OK:
1167 if(pll_toggle) 1152 pll_toggle = !pll_toggle;
1168 { 1153 if(pll_toggle)
1169 /* 14.31818 MHz crystal */ 1154 {
1170 pll48 = 0x5d9d0; 1155 /* 14.31818 MHz crystal */
1171 pll44 = 0xfffceceb; 1156 pll48 = 0x5d9d0;
1172 config = 0; 1157 pll44 = 0xfffceceb;
1173 } 1158 config = 0;
1174 else 1159 }
1175 { 1160 else
1176 /* 14.725 MHz crystal */ 1161 {
1177 pll48 = 0x2d0de; 1162 /* 14.725 MHz crystal */
1178 pll44 = 0xfffa2319; 1163 pll48 = 0x2d0de;
1179 config = 0; 1164 pll44 = 0xfffa2319;
1180 } 1165 config = 0;
1181 mas_writemem(MAS_BANK_D0, 0x32d, &pll48, 1); 1166 }
1182 mas_writemem(MAS_BANK_D0, 0x32e, &pll44, 1); 1167 mas_writemem(MAS_BANK_D0, 0x32d, &pll48, 1);
1183 mas_writemem(MAS_BANK_D0, 0x32f, &config, 1); 1168 mas_writemem(MAS_BANK_D0, 0x32e, &pll44, 1);
1184 mas_run(0x475); 1169 mas_writemem(MAS_BANK_D0, 0x32f, &config, 1);
1185 break; 1170 mas_run(0x475);
1171 break;
1186 } 1172 }
1187 } 1173 }
1188 return false; 1174 return false;
@@ -1233,23 +1219,19 @@ static bool view_runtime(void)
1233 /* Wait for a key to be pushed */ 1219 /* Wait for a key to be pushed */
1234 key = button_get_w_tmo(HZ); 1220 key = button_get_w_tmo(HZ);
1235 switch(key) { 1221 switch(key) {
1236#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) 1222 case SETTINGS_CANCEL:
1237 case BUTTON_STOP | BUTTON_REL:
1238#elif HAVE_RECORDER_KEYPAD
1239 case BUTTON_OFF | BUTTON_REL:
1240#endif
1241 done = true; 1223 done = true;
1242 break; 1224 break;
1243 1225
1244 case BUTTON_LEFT: 1226 case SETTINGS_INC:
1245 case BUTTON_RIGHT: 1227 case SETTINGS_DEC:
1246 if (state == 1) 1228 if (state == 1)
1247 state = 2; 1229 state = 2;
1248 else 1230 else
1249 state = 1; 1231 state = 1;
1250 break; 1232 break;
1251 1233
1252 case BUTTON_PLAY: 1234 case SETTINGS_OK:
1253 lcd_clear_display(); 1235 lcd_clear_display();
1254 lcd_puts(0,0,"Clear time?"); 1236 lcd_puts(0,0,"Clear time?");
1255 lcd_puts(0,1,"PLAY = Yes"); 1237 lcd_puts(0,1,"PLAY = Yes");
@@ -1258,7 +1240,7 @@ static bool view_runtime(void)
1258 key = button_get_w_tmo(HZ*10); 1240 key = button_get_w_tmo(HZ*10);
1259 if ( key & BUTTON_REL ) 1241 if ( key & BUTTON_REL )
1260 continue; 1242 continue;
1261 if ( key == BUTTON_PLAY ) { 1243 if ( key == SETTINGS_OK ) {
1262 if ( state == 1 ) 1244 if ( state == 1 )
1263 global_settings.runtime = 0; 1245 global_settings.runtime = 0;
1264 else 1246 else
@@ -1412,25 +1394,21 @@ static bool dbg_disk_info(void)
1412 /* Wait for a key to be pushed */ 1394 /* Wait for a key to be pushed */
1413 key = button_get_w_tmo(HZ*5); 1395 key = button_get_w_tmo(HZ*5);
1414 switch(key) { 1396 switch(key) {
1415#if defined(HAVE_PLAYER_KEYPAD) || defined(HAVE_NEO_KEYPAD) || defined(HAVE_ONDIO_KEYPAD) 1397 case SETTINGS_CANCEL:
1416 case BUTTON_STOP | BUTTON_REL:
1417#else
1418 case BUTTON_OFF | BUTTON_REL:
1419#endif
1420 done = true; 1398 done = true;
1421 break; 1399 break;
1422 1400
1423 case BUTTON_LEFT: 1401 case SETTINGS_DEC:
1424 if (--page < 0) 1402 if (--page < 0)
1425 page = max_page; 1403 page = max_page;
1426 break; 1404 break;
1427 1405
1428 case BUTTON_RIGHT: 1406 case SETTINGS_INC:
1429 if (++page > max_page) 1407 if (++page > max_page)
1430 page = 0; 1408 page = 0;
1431 break; 1409 break;
1432 1410
1433 case BUTTON_PLAY: 1411 case SETTINGS_OK:
1434 if (page == 3) { 1412 if (page == 3) {
1435 mpeg_stop(); /* stop playback, to avoid disk access */ 1413 mpeg_stop(); /* stop playback, to avoid disk access */
1436 lcd_clear_display(); 1414 lcd_clear_display();
@@ -1498,11 +1476,7 @@ bool dbg_fm_radio(void)
1498 1476
1499 switch(button) 1477 switch(button)
1500 { 1478 {
1501#ifdef HAVE_RECORDER_KEYPAD 1479 case SETTINGS_CANCEL:
1502 case BUTTON_OFF:
1503#else
1504 case BUTTON_STOP:
1505#endif
1506 return false; 1480 return false;
1507 } 1481 }
1508 } 1482 }
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-24 02:14:20 +0000