diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-10-07 20:23:56 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-10-07 20:23:56 +0000 |
commit | 9003c116ca06e7a11f444dfe026075dd2a2ff8d9 (patch) | |
tree | 2ac37ef034b3cf0958de9679eef84fea603b7fa9 /firmware/export | |
parent | 6b84f600466ab02f5a671d5004cc5b13f18460af (diff) | |
download | rockbox-9003c116ca06e7a11f444dfe026075dd2a2ff8d9.tar.gz rockbox-9003c116ca06e7a11f444dfe026075dd2a2ff8d9.zip |
Fix TABs and get rid of HAVE_BUTTON_HOLD
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18737 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config-creativezv.h | 1 | ||||
-rw-r--r-- | firmware/export/config-creativezvm.h | 1 | ||||
-rw-r--r-- | firmware/export/config-creativezvm60gb.h | 1 | ||||
-rw-r--r-- | firmware/export/config-ondavx747.h | 1 | ||||
-rw-r--r-- | firmware/export/config-ondavx767.h | 1 | ||||
-rw-r--r-- | firmware/export/jz4740.h | 25 |
6 files changed, 13 insertions, 17 deletions
diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h index 0cb487ad6d..2225e8c45e 100644 --- a/firmware/export/config-creativezv.h +++ b/firmware/export/config-creativezv.h | |||
@@ -73,7 +73,6 @@ | |||
73 | #define HAVE_LCD_ENABLE | 73 | #define HAVE_LCD_ENABLE |
74 | 74 | ||
75 | #define CONFIG_KEYPAD CREATIVEZV_PAD | 75 | #define CONFIG_KEYPAD CREATIVEZV_PAD |
76 | #define HAVE_BUTTON_HOLD | ||
77 | #define HAVE_HEADPHONE_DETECTION | 76 | #define HAVE_HEADPHONE_DETECTION |
78 | //#define HAVE_TOUCHPAD | 77 | //#define HAVE_TOUCHPAD |
79 | 78 | ||
diff --git a/firmware/export/config-creativezvm.h b/firmware/export/config-creativezvm.h index e4ccfc775f..02ec490284 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h | |||
@@ -73,7 +73,6 @@ | |||
73 | #define HAVE_LCD_ENABLE | 73 | #define HAVE_LCD_ENABLE |
74 | 74 | ||
75 | #define CONFIG_KEYPAD CREATIVEZVM_PAD | 75 | #define CONFIG_KEYPAD CREATIVEZVM_PAD |
76 | #define HAVE_BUTTON_HOLD | ||
77 | #define HAVE_HEADPHONE_DETECTION | 76 | #define HAVE_HEADPHONE_DETECTION |
78 | //#define HAVE_TOUCHPAD | 77 | //#define HAVE_TOUCHPAD |
79 | 78 | ||
diff --git a/firmware/export/config-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h index bcf361690d..f319dead47 100644 --- a/firmware/export/config-creativezvm60gb.h +++ b/firmware/export/config-creativezvm60gb.h | |||
@@ -73,7 +73,6 @@ | |||
73 | #define HAVE_LCD_ENABLE | 73 | #define HAVE_LCD_ENABLE |
74 | 74 | ||
75 | #define CONFIG_KEYPAD CREATIVEZVM_PAD | 75 | #define CONFIG_KEYPAD CREATIVEZVM_PAD |
76 | #define HAVE_BUTTON_HOLD | ||
77 | #define HAVE_HEADPHONE_DETECTION | 76 | #define HAVE_HEADPHONE_DETECTION |
78 | //#define HAVE_TOUCHPAD | 77 | //#define HAVE_TOUCHPAD |
79 | 78 | ||
diff --git a/firmware/export/config-ondavx747.h b/firmware/export/config-ondavx747.h index 5144631416..49047d6a3c 100644 --- a/firmware/export/config-ondavx747.h +++ b/firmware/export/config-ondavx747.h | |||
@@ -67,7 +67,6 @@ | |||
67 | #define HAVE_LCD_ENABLE | 67 | #define HAVE_LCD_ENABLE |
68 | 68 | ||
69 | #define CONFIG_KEYPAD ONDAVX747_PAD | 69 | #define CONFIG_KEYPAD ONDAVX747_PAD |
70 | #define HAVE_BUTTON_HOLD | ||
71 | #define HAVE_TOUCHSCREEN | 70 | #define HAVE_TOUCHSCREEN |
72 | #define HAVE_BUTTON_DATA | 71 | #define HAVE_BUTTON_DATA |
73 | 72 | ||
diff --git a/firmware/export/config-ondavx767.h b/firmware/export/config-ondavx767.h index 9d3ed9d7ec..55a6791cbc 100644 --- a/firmware/export/config-ondavx767.h +++ b/firmware/export/config-ondavx767.h | |||
@@ -67,7 +67,6 @@ | |||
67 | //#define HAVE_LCD_ENABLE | 67 | //#define HAVE_LCD_ENABLE |
68 | 68 | ||
69 | #define CONFIG_KEYPAD ONDAVX767_PAD | 69 | #define CONFIG_KEYPAD ONDAVX767_PAD |
70 | #define HAVE_BUTTON_HOLD | ||
71 | 70 | ||
72 | /* Define this if you do software codec */ | 71 | /* Define this if you do software codec */ |
73 | #define CONFIG_CODEC SWCODEC | 72 | #define CONFIG_CODEC SWCODEC |
diff --git a/firmware/export/jz4740.h b/firmware/export/jz4740.h index a025b94116..3688819b19 100644 --- a/firmware/export/jz4740.h +++ b/firmware/export/jz4740.h | |||
@@ -2354,31 +2354,32 @@ | |||
2354 | 2354 | ||
2355 | 2355 | ||
2356 | /* Power register bit masks */ | 2356 | /* Power register bit masks */ |
2357 | #define USB_POWER_SUSPENDM 0x01 | 2357 | #define USB_POWER_SUSPENDM 0x01 |
2358 | #define USB_POWER_RESUME 0x04 | 2358 | #define USB_POWER_RESUME 0x04 |
2359 | #define USB_POWER_HSMODE 0x10 | 2359 | #define USB_POWER_HSMODE 0x10 |
2360 | #define USB_POWER_HSENAB 0x20 | 2360 | #define USB_POWER_HSENAB 0x20 |
2361 | #define USB_POWER_SOFTCONN 0x40 | 2361 | #define USB_POWER_SOFTCONN 0x40 |
2362 | 2362 | ||
2363 | /* Interrupt register bit masks */ | 2363 | /* Interrupt register bit masks */ |
2364 | #define USB_INTR_SUSPEND 0x01 | 2364 | #define USB_INTR_SUSPEND 0x01 |
2365 | #define USB_INTR_RESUME 0x02 | 2365 | #define USB_INTR_RESUME 0x02 |
2366 | #define USB_INTR_RESET 0x04 | 2366 | #define USB_INTR_RESET 0x04 |
2367 | 2367 | ||
2368 | #define USB_INTR_EP0 0x0001 | 2368 | #define USB_INTR_EP0 0x0001 |
2369 | #define USB_INTR_INEP1 0x0002 | 2369 | #define USB_INTR_INEP1 0x0002 |
2370 | #define USB_INTR_INEP2 0x0004 | 2370 | #define USB_INTR_INEP2 0x0004 |
2371 | #define USB_INTR_OUTEP1 0x0002 | 2371 | #define USB_INTR_OUTEP1 0x0002 |
2372 | #define USB_INTR_OUTEP2 0x0004 | ||
2372 | 2373 | ||
2373 | /* CSR0 bit masks */ | 2374 | /* CSR0 bit masks */ |
2374 | #define USB_CSR0_OUTPKTRDY 0x01 | 2375 | #define USB_CSR0_OUTPKTRDY 0x01 |
2375 | #define USB_CSR0_INPKTRDY 0x02 | 2376 | #define USB_CSR0_INPKTRDY 0x02 |
2376 | #define USB_CSR0_SENTSTALL 0x04 | 2377 | #define USB_CSR0_SENTSTALL 0x04 |
2377 | #define USB_CSR0_DATAEND 0x08 | 2378 | #define USB_CSR0_DATAEND 0x08 |
2378 | #define USB_CSR0_SETUPEND 0x10 | 2379 | #define USB_CSR0_SETUPEND 0x10 |
2379 | #define USB_CSR0_SENDSTALL 0x20 | 2380 | #define USB_CSR0_SENDSTALL 0x20 |
2380 | #define USB_CSR0_SVDOUTPKTRDY 0x40 | 2381 | #define USB_CSR0_SVDOUTPKTRDY 0x40 |
2381 | #define USB_CSR0_SVDSETUPEND 0x80 | 2382 | #define USB_CSR0_SVDSETUPEND 0x80 |
2382 | 2383 | ||
2383 | /* Endpoint CSR register bits */ | 2384 | /* Endpoint CSR register bits */ |
2384 | #define USB_INCSRH_AUTOSET 0x80 | 2385 | #define USB_INCSRH_AUTOSET 0x80 |