diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 04:57:28 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 04:57:28 +0000 |
commit | ac61951452e001da48430d8487521ad32b7a123c (patch) | |
tree | 0696d0c278976c9ec51fd6b5adb65429739b0164 | |
parent | 00d249ab672e2ce5c27ddd35ea7a40f71ec7a426 (diff) | |
download | rockbox-ac61951452e001da48430d8487521ad32b7a123c.tar.gz rockbox-ac61951452e001da48430d8487521ad32b7a123c.zip |
Do the CONFIG_USBOTG define correctly
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12382 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/main.c | 8 | ||||
-rw-r--r-- | firmware/export/config.h | 4 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/system-iriver.c | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/apps/main.c b/apps/main.c index 70a3f8ddea..9a55be8eda 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -95,11 +95,11 @@ | |||
95 | #include "lcd-remote.h" | 95 | #include "lcd-remote.h" |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_ISP1362 | 98 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
99 | #include "isp1362.h" | 99 | #include "isp1362.h" |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_M5636 | 102 | #if CONFIG_USBOTG == USBOTG_M5636 |
103 | #include "m5636.h" | 103 | #include "m5636.h" |
104 | #endif | 104 | #endif |
105 | 105 | ||
@@ -350,9 +350,9 @@ static void init(void) | |||
350 | adc_init(); | 350 | adc_init(); |
351 | 351 | ||
352 | usb_init(); | 352 | usb_init(); |
353 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_ISP1362 | 353 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
354 | isp1362_init(); | 354 | isp1362_init(); |
355 | #elif defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_M5636 | 355 | #elif CONFIG_USBOTG == USBOTG_M5636 |
356 | m5636_init(); | 356 | m5636_init(); |
357 | #endif | 357 | #endif |
358 | 358 | ||
diff --git a/firmware/export/config.h b/firmware/export/config.h index 8519628d47..aaaac686b1 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -222,6 +222,10 @@ | |||
222 | #define CONFIG_TUNER 0 | 222 | #define CONFIG_TUNER 0 |
223 | #endif | 223 | #endif |
224 | 224 | ||
225 | #ifndef CONFIG_USBOTG | ||
226 | #define CONFIG_USBOTG 0 | ||
227 | #endif | ||
228 | |||
225 | /* Enable the directory cache and tagcache in RAM if we have | 229 | /* Enable the directory cache and tagcache in RAM if we have |
226 | * plenty of RAM. Both features can be enabled independently. */ | 230 | * plenty of RAM. Both features can be enabled independently. */ |
227 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ | 231 | #if ((defined(MEMORYSIZE) && (MEMORYSIZE > 8)) || MEM > 8) && \ |
diff --git a/firmware/target/coldfire/iriver/system-iriver.c b/firmware/target/coldfire/iriver/system-iriver.c index 1cb0a502be..32fc44f963 100644 --- a/firmware/target/coldfire/iriver/system-iriver.c +++ b/firmware/target/coldfire/iriver/system-iriver.c | |||
@@ -85,7 +85,7 @@ void set_cpu_frequency(long frequency) | |||
85 | PLLCR = 0x018ae025 | (PLLCR & 0x70400000); | 85 | PLLCR = 0x018ae025 | (PLLCR & 0x70400000); |
86 | CSCR0 = 0x00001180; /* Flash: 4 wait states */ | 86 | CSCR0 = 0x00001180; /* Flash: 4 wait states */ |
87 | CSCR1 = 0x00001580; /* LCD: 5 wait states */ | 87 | CSCR1 = 0x00001580; /* LCD: 5 wait states */ |
88 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_ISP1362 | 88 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
89 | CSCR3 = 0x00002180; /* USBOTG: 8 wait states */ | 89 | CSCR3 = 0x00002180; /* USBOTG: 8 wait states */ |
90 | #endif | 90 | #endif |
91 | while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. | 91 | while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. |
@@ -112,7 +112,7 @@ void set_cpu_frequency(long frequency) | |||
112 | PLLCR = 0x038be025 | (PLLCR & 0x70400000); | 112 | PLLCR = 0x038be025 | (PLLCR & 0x70400000); |
113 | CSCR0 = 0x00000580; /* Flash: 1 wait state */ | 113 | CSCR0 = 0x00000580; /* Flash: 1 wait state */ |
114 | CSCR1 = 0x00000180; /* LCD: 0 wait states */ | 114 | CSCR1 = 0x00000180; /* LCD: 0 wait states */ |
115 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_ISP1362 | 115 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
116 | CSCR3 = 0x00000580; /* USBOTG: 1 wait state */ | 116 | CSCR3 = 0x00000580; /* USBOTG: 1 wait state */ |
117 | #endif | 117 | #endif |
118 | while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. | 118 | while(!(PLLCR & 0x80000000)) {}; /* Wait until the PLL has locked. |
@@ -139,7 +139,7 @@ void set_cpu_frequency(long frequency) | |||
139 | PLLCR = 0x00800200 | (PLLCR & 0x70400000); | 139 | PLLCR = 0x00800200 | (PLLCR & 0x70400000); |
140 | CSCR0 = 0x00000180; /* Flash: 0 wait states */ | 140 | CSCR0 = 0x00000180; /* Flash: 0 wait states */ |
141 | CSCR1 = 0x00000180; /* LCD: 0 wait states */ | 141 | CSCR1 = 0x00000180; /* LCD: 0 wait states */ |
142 | #if defined(CONFIG_USBOTG) && CONFIG_USBOTG == USBOTG_ISP1362 | 142 | #if CONFIG_USBOTG == USBOTG_ISP1362 |
143 | CSCR3 = 0x00000180; /* USBOTG: 0 wait states */ | 143 | CSCR3 = 0x00000180; /* USBOTG: 0 wait states */ |
144 | #endif | 144 | #endif |
145 | DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ | 145 | DCR = (0x8000 | DEFAULT_REFRESH_TIMER); /* Refresh timer */ |