diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-27 07:20:42 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2006-12-27 07:20:42 +0000 |
commit | acf73af2e846c4981aa69ea81b6aae4adc10ecb0 (patch) | |
tree | c421199cffce15a5ad59181fc968d157d2db9fa4 /apps | |
parent | 5f23fe0277f75690554018561bf3c16d7fb211f2 (diff) | |
download | rockbox-acf73af2e846c4981aa69ea81b6aae4adc10ecb0.tar.gz rockbox-acf73af2e846c4981aa69ea81b6aae4adc10ecb0.zip |
Go back to the old button code for the debug ports screen so its usable
again. (FS#6087, the first comment)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11847 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/debug_menu.c | 42 |
1 files changed, 38 insertions, 4 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index a63eb7de6d..9a50970b92 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -930,6 +930,40 @@ static bool dbg_spdif(void) | |||
930 | 930 | ||
931 | #ifndef SIMULATOR | 931 | #ifndef SIMULATOR |
932 | #ifdef HAVE_LCD_BITMAP | 932 | #ifdef HAVE_LCD_BITMAP |
933 | /* button definitions */ | ||
934 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | ||
935 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | ||
936 | # define DEBUG_CANCEL BUTTON_OFF | ||
937 | |||
938 | #elif CONFIG_KEYPAD == RECORDER_PAD | ||
939 | # define DEBUG_CANCEL BUTTON_OFF | ||
940 | |||
941 | #elif CONFIG_KEYPAD == ONDIO_PAD | ||
942 | # define DEBUG_CANCEL BUTTON_MENU | ||
943 | |||
944 | #elif CONFIG_KEYPAD == GMINI100_PAD | ||
945 | # define DEBUG_CANCEL BUTTON_OFF | ||
946 | |||
947 | #elif (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | ||
948 | (CONFIG_KEYPAD == IPOD_4G_PAD) | ||
949 | # define DEBUG_CANCEL BUTTON_MENU | ||
950 | |||
951 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | ||
952 | # define DEBUG_CANCEL BUTTON_PLAY | ||
953 | |||
954 | #elif CONFIG_KEYPAD == IAUDIO_X5_PAD | ||
955 | # define DEBUG_CANCEL BUTTON_REC | ||
956 | |||
957 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | ||
958 | # define DEBUG_CANCEL BUTTON_A | ||
959 | |||
960 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | ||
961 | # define DEBUG_CANCEL BUTTON_REW | ||
962 | |||
963 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | ||
964 | # define DEBUG_CANCEL BUTTON_LEFT | ||
965 | #endif /* key definitios */ | ||
966 | |||
933 | /* Test code!!! */ | 967 | /* Test code!!! */ |
934 | bool dbg_ports(void) | 968 | bool dbg_ports(void) |
935 | { | 969 | { |
@@ -975,7 +1009,7 @@ bool dbg_ports(void) | |||
975 | lcd_puts(0, 7, buf); | 1009 | lcd_puts(0, 7, buf); |
976 | #endif | 1010 | #endif |
977 | lcd_update(); | 1011 | lcd_update(); |
978 | if (action_userabort(HZ/10)) | 1012 | if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)) |
979 | return false; | 1013 | return false; |
980 | } | 1014 | } |
981 | #elif defined(CPU_COLDFIRE) | 1015 | #elif defined(CPU_COLDFIRE) |
@@ -1063,7 +1097,7 @@ bool dbg_ports(void) | |||
1063 | #endif | 1097 | #endif |
1064 | 1098 | ||
1065 | lcd_update(); | 1099 | lcd_update(); |
1066 | if (action_userabort(HZ/10)) | 1100 | if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)) |
1067 | return false; | 1101 | return false; |
1068 | } | 1102 | } |
1069 | 1103 | ||
@@ -1125,7 +1159,7 @@ bool dbg_ports(void) | |||
1125 | lcd_puts(0, line++, buf); | 1159 | lcd_puts(0, line++, buf); |
1126 | #endif | 1160 | #endif |
1127 | lcd_update(); | 1161 | lcd_update(); |
1128 | if (action_userabort(HZ/10)) | 1162 | if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)) |
1129 | return false; | 1163 | return false; |
1130 | } | 1164 | } |
1131 | 1165 | ||
@@ -1153,7 +1187,7 @@ bool dbg_ports(void) | |||
1153 | lcd_puts(0, line++, buf); | 1187 | lcd_puts(0, line++, buf); |
1154 | 1188 | ||
1155 | lcd_update(); | 1189 | lcd_update(); |
1156 | if (action_userabort(HZ/10)) | 1190 | if (button_get_w_tmo(HZ/10) == (DEBUG_CANCEL|BUTTON_REL)) |
1157 | return false; | 1191 | return false; |
1158 | } | 1192 | } |
1159 | #endif /* CPU */ | 1193 | #endif /* CPU */ |