diff options
-rw-r--r-- | bootloader/sansa_as3525.c | 16 | ||||
-rw-r--r-- | firmware/export/config/sansac200v2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansaclip.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansaclipzip.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansae200v2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansafuze.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansafuzev2.h | 1 | ||||
-rw-r--r-- | firmware/export/config/sansam200v4.h | 1 | ||||
-rw-r--r-- | firmware/usb.c | 4 |
11 files changed, 18 insertions, 13 deletions
diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c index 3558d01674..14cb2ab7a5 100644 --- a/bootloader/sansa_as3525.c +++ b/bootloader/sansa_as3525.c | |||
@@ -29,10 +29,10 @@ | |||
29 | #include "gcc_extensions.h" | 29 | #include "gcc_extensions.h" |
30 | #include "../kernel-internal.h" | 30 | #include "../kernel-internal.h" |
31 | #include "lcd.h" | 31 | #include "lcd.h" |
32 | #ifdef USE_ROCKBOX_USB | 32 | #ifdef HAVE_BOOTLOADER_USB_MODE |
33 | #include "usb.h" | 33 | #include "usb.h" |
34 | #include "sysfont.h" | 34 | #include "sysfont.h" |
35 | #endif /* USE_ROCKBOX_USB */ | 35 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
36 | #include "backlight.h" | 36 | #include "backlight.h" |
37 | #include "button-target.h" | 37 | #include "button-target.h" |
38 | #include "common.h" | 38 | #include "common.h" |
@@ -46,7 +46,7 @@ | |||
46 | 46 | ||
47 | void show_logo(void); | 47 | void show_logo(void); |
48 | 48 | ||
49 | #ifdef USE_ROCKBOX_USB | 49 | #ifdef HAVE_BOOTLOADER_USB_MODE |
50 | static void usb_mode(void) | 50 | static void usb_mode(void) |
51 | { | 51 | { |
52 | if(usb_detect() != USB_INSERTED) | 52 | if(usb_detect() != USB_INSERTED) |
@@ -73,7 +73,7 @@ static void usb_mode(void) | |||
73 | reset_screen(); | 73 | reset_screen(); |
74 | lcd_update(); | 74 | lcd_update(); |
75 | } | 75 | } |
76 | #endif /* USE_ROCKBOX_USB */ | 76 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
77 | 77 | ||
78 | void main(void) NORETURN_ATTR; | 78 | void main(void) NORETURN_ATTR; |
79 | void main(void) | 79 | void main(void) |
@@ -122,7 +122,7 @@ void main(void) | |||
122 | 122 | ||
123 | filesystem_init(); | 123 | filesystem_init(); |
124 | 124 | ||
125 | #ifdef USE_ROCKBOX_USB | 125 | #ifdef HAVE_BOOTLOADER_USB_MODE |
126 | usb_init(); | 126 | usb_init(); |
127 | 127 | ||
128 | /* Enter USB mode if USB is plugged and SELECT button is pressed */ | 128 | /* Enter USB mode if USB is plugged and SELECT button is pressed */ |
@@ -131,11 +131,11 @@ void main(void) | |||
131 | if(usb_detect() == USB_INSERTED) | 131 | if(usb_detect() == USB_INSERTED) |
132 | usb_mode(); | 132 | usb_mode(); |
133 | } | 133 | } |
134 | #endif /* USE_ROCKBOX_USB */ | 134 | #endif /* HAVE_BOOTLOADER_USB_MODE */ |
135 | 135 | ||
136 | while((ret = disk_mount_all()) <= 0) | 136 | while((ret = disk_mount_all()) <= 0) |
137 | { | 137 | { |
138 | #ifdef USE_ROCKBOX_USB | 138 | #ifdef HAVE_BOOTLOADER_USB_MODE |
139 | error(EDISK, ret, false); | 139 | error(EDISK, ret, false); |
140 | usb_mode(); | 140 | usb_mode(); |
141 | #else | 141 | #else |
@@ -150,7 +150,7 @@ void main(void) | |||
150 | 150 | ||
151 | while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY) | 151 | while((ret = load_firmware(loadbuffer, BOOTFILE, buffer_size)) <= EFILE_EMPTY) |
152 | { | 152 | { |
153 | #ifdef USE_ROCKBOX_USB | 153 | #ifdef HAVE_BOOTLOADER_USB_MODE |
154 | error(EBOOTFILE, ret, false); | 154 | error(EBOOTFILE, ret, false); |
155 | usb_mode(); | 155 | usb_mode(); |
156 | #else | 156 | #else |
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h index 9e9c8b835f..0da8b6a67b 100644 --- a/firmware/export/config/sansac200v2.h +++ b/firmware/export/config/sansac200v2.h | |||
@@ -187,6 +187,7 @@ | |||
187 | //#define USB_ENABLE_SERIAL | 187 | //#define USB_ENABLE_SERIAL |
188 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
189 | #define USB_PRODUCT_ID 0x7452 | 189 | #define USB_PRODUCT_ID 0x7452 |
190 | #define HAVE_BOOTLOADER_USB_MODE | ||
190 | #define HAVE_USB_HID_MOUSE | 191 | #define HAVE_USB_HID_MOUSE |
191 | 192 | ||
192 | /* Define this if you have adjustable CPU frequency */ | 193 | /* Define this if you have adjustable CPU frequency */ |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index 54500402d7..43a24cb5c4 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -182,6 +182,7 @@ | |||
182 | #define USB_VENDOR_ID 0x0781 | 182 | #define USB_VENDOR_ID 0x0781 |
183 | #define USB_PRODUCT_ID 0x7433 | 183 | #define USB_PRODUCT_ID 0x7433 |
184 | #define HAVE_USB_HID_MOUSE | 184 | #define HAVE_USB_HID_MOUSE |
185 | #define HAVE_BOOTLOADER_USB_MODE | ||
185 | 186 | ||
186 | /* Define this if you have adjustable CPU frequency */ | 187 | /* Define this if you have adjustable CPU frequency */ |
187 | #define HAVE_ADJUSTABLE_CPU_FREQ | 188 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index dc9ad90b5b..a2df3d21c8 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -188,7 +188,7 @@ | |||
188 | #define HAVE_USBSTACK | 188 | #define HAVE_USBSTACK |
189 | #define USB_VENDOR_ID 0x0781 | 189 | #define USB_VENDOR_ID 0x0781 |
190 | #define USB_PRODUCT_ID 0x74d1 | 190 | #define USB_PRODUCT_ID 0x74d1 |
191 | 191 | #define HAVE_BOOTLOADER_USB_MODE | |
192 | 192 | ||
193 | /* Virtual LED (icon) */ | 193 | /* Virtual LED (icon) */ |
194 | #define CONFIG_LED LED_VIRTUAL | 194 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index a61d5ba18c..8b0b84c1d0 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -184,6 +184,7 @@ | |||
184 | #define HAVE_USBSTACK | 184 | #define HAVE_USBSTACK |
185 | #define USB_VENDOR_ID 0x0781 | 185 | #define USB_VENDOR_ID 0x0781 |
186 | #define USB_PRODUCT_ID 0x7435 | 186 | #define USB_PRODUCT_ID 0x7435 |
187 | #define HAVE_BOOTLOADER_USB_MODE | ||
187 | 188 | ||
188 | /* Virtual LED (icon) */ | 189 | /* Virtual LED (icon) */ |
189 | #define CONFIG_LED LED_VIRTUAL | 190 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index 50147b9714..9743261a52 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -187,7 +187,7 @@ | |||
187 | #define HAVE_USBSTACK | 187 | #define HAVE_USBSTACK |
188 | #define USB_VENDOR_ID 0x0781 | 188 | #define USB_VENDOR_ID 0x0781 |
189 | #define USB_PRODUCT_ID 0x74e5 | 189 | #define USB_PRODUCT_ID 0x74e5 |
190 | 190 | #define HAVE_BOOTLOADER_USB_MODE | |
191 | 191 | ||
192 | /* Virtual LED (icon) */ | 192 | /* Virtual LED (icon) */ |
193 | #define CONFIG_LED LED_VIRTUAL | 193 | #define CONFIG_LED LED_VIRTUAL |
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h index 23bee8c98a..3541e0f107 100644 --- a/firmware/export/config/sansae200v2.h +++ b/firmware/export/config/sansae200v2.h | |||
@@ -204,6 +204,7 @@ | |||
204 | #define USB_VENDOR_ID 0x0781 | 204 | #define USB_VENDOR_ID 0x0781 |
205 | #define USB_PRODUCT_ID 0x7423 | 205 | #define USB_PRODUCT_ID 0x7423 |
206 | #define HAVE_USB_HID_MOUSE | 206 | #define HAVE_USB_HID_MOUSE |
207 | #define HAVE_BOOTLOADER_USB_MODE | ||
207 | 208 | ||
208 | /* Define this if you have adjustable CPU frequency */ | 209 | /* Define this if you have adjustable CPU frequency */ |
209 | #define HAVE_ADJUSTABLE_CPU_FREQ | 210 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h index b2cdf061dd..f15d424c1b 100644 --- a/firmware/export/config/sansafuze.h +++ b/firmware/export/config/sansafuze.h | |||
@@ -205,6 +205,7 @@ | |||
205 | #define USB_VENDOR_ID 0x0781 | 205 | #define USB_VENDOR_ID 0x0781 |
206 | #define USB_PRODUCT_ID 0x74c1 | 206 | #define USB_PRODUCT_ID 0x74c1 |
207 | #define HAVE_USB_HID_MOUSE | 207 | #define HAVE_USB_HID_MOUSE |
208 | #define HAVE_BOOTLOADER_USB_MODE | ||
208 | 209 | ||
209 | /* Define this if you have adjustable CPU frequency */ | 210 | /* Define this if you have adjustable CPU frequency */ |
210 | #define HAVE_ADJUSTABLE_CPU_FREQ | 211 | #define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h index a0197bfb41..f53c287d87 100644 --- a/firmware/export/config/sansafuzev2.h +++ b/firmware/export/config/sansafuzev2.h | |||
@@ -205,6 +205,7 @@ | |||
205 | #define HAVE_USBSTACK | 205 | #define HAVE_USBSTACK |
206 | #define USB_VENDOR_ID 0x0781 | 206 | #define USB_VENDOR_ID 0x0781 |
207 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ | 207 | #define USB_PRODUCT_ID 0x74c3 /* MSC = 0x74c3, MTP = 0x74c2 */ |
208 | #define HAVE_BOOTLOADER_USB_MODE | ||
208 | 209 | ||
209 | /* Define this if you have adjustable CPU frequency */ | 210 | /* Define this if you have adjustable CPU frequency */ |
210 | //#define HAVE_ADJUSTABLE_CPU_FREQ | 211 | //#define HAVE_ADJUSTABLE_CPU_FREQ |
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h index 99e84e65e0..d905d10c95 100644 --- a/firmware/export/config/sansam200v4.h +++ b/firmware/export/config/sansam200v4.h | |||
@@ -148,6 +148,7 @@ | |||
148 | #define USB_VENDOR_ID 0x0781 | 148 | #define USB_VENDOR_ID 0x0781 |
149 | #define USB_PRODUCT_ID 0x7431 | 149 | #define USB_PRODUCT_ID 0x7431 |
150 | #define HAVE_USB_HID_MOUSE | 150 | #define HAVE_USB_HID_MOUSE |
151 | #define HAVE_BOOTLOADER_USB_MODE | ||
151 | 152 | ||
152 | #define CONFIG_LCD LCD_SSD1815 | 153 | #define CONFIG_LCD LCD_SSD1815 |
153 | 154 | ||
diff --git a/firmware/usb.c b/firmware/usb.c index e5210efc11..ee6ed2c12c 100644 --- a/firmware/usb.c +++ b/firmware/usb.c | |||
@@ -48,10 +48,8 @@ | |||
48 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ | 48 | (defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \ |
49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ | 49 | (defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \ |
50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ | 50 | (defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \ |
51 | (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_S3C6400X) || \ | ||
52 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ | 51 | defined(CPU_TCC77X) || defined(CPU_TCC780X) || \ |
53 | (CONFIG_USBOTG == USBOTG_JZ4740) || \ | 52 | (CONFIG_USBOTG == USBOTG_JZ4740) |
54 | (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_AS3525) | ||
55 | #define USB_FULL_INIT | 53 | #define USB_FULL_INIT |
56 | #endif | 54 | #endif |
57 | 55 | ||