diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/export/config-gigabeat-s.h | 1 | ||||
-rw-r--r-- | firmware/export/config-iaudio7.h | 1 | ||||
-rw-r--r-- | firmware/export/config-logikdax.h | 1 | ||||
-rw-r--r-- | firmware/target/arm/usb-drv-arc.c | 2 | ||||
-rw-r--r-- | firmware/usbstack/usb_core.c | 2 |
5 files changed, 2 insertions, 5 deletions
diff --git a/firmware/export/config-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 71d84de5b3..8ddca5ca6d 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h | |||
@@ -139,7 +139,6 @@ | |||
139 | #define CONFIG_USBOTG USBOTG_ARC | 139 | #define CONFIG_USBOTG USBOTG_ARC |
140 | 140 | ||
141 | /* enable these for the experimental usb stack */ | 141 | /* enable these for the experimental usb stack */ |
142 | #define USE_HIGH_SPEED | ||
143 | #define USE_ROCKBOX_USB | 142 | #define USE_ROCKBOX_USB |
144 | #define HAVE_USBSTACK | 143 | #define HAVE_USBSTACK |
145 | #define USB_STORAGE | 144 | #define USB_STORAGE |
diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h index a5dd30d568..eb3360e5c6 100644 --- a/firmware/export/config-iaudio7.h +++ b/firmware/export/config-iaudio7.h | |||
@@ -58,7 +58,6 @@ | |||
58 | 58 | ||
59 | #if 0 && !defined(SIMULATOR) /* Enable for USB driver test */ | 59 | #if 0 && !defined(SIMULATOR) /* Enable for USB driver test */ |
60 | #define HAVE_USBSTACK | 60 | #define HAVE_USBSTACK |
61 | #define USE_HIGH_SPEED | ||
62 | #define USB_VENDOR_ID 0x0e21 | 61 | #define USB_VENDOR_ID 0x0e21 |
63 | #define USB_PRODUCT_ID 0x0750 | 62 | #define USB_PRODUCT_ID 0x0750 |
64 | 63 | ||
diff --git a/firmware/export/config-logikdax.h b/firmware/export/config-logikdax.h index da5a9e2bae..78a39d32b7 100644 --- a/firmware/export/config-logikdax.h +++ b/firmware/export/config-logikdax.h | |||
@@ -17,7 +17,6 @@ | |||
17 | 17 | ||
18 | #if 0 /* Enable for USB driver test */ | 18 | #if 0 /* Enable for USB driver test */ |
19 | #define HAVE_USBSTACK | 19 | #define HAVE_USBSTACK |
20 | #define USE_HIGH_SPEED | ||
21 | #define USB_VENDOR_ID 0x13d1 | 20 | #define USB_VENDOR_ID 0x13d1 |
22 | #define USB_PRODUCT_ID 0x1002 | 21 | #define USB_PRODUCT_ID 0x1002 |
23 | #endif | 22 | #endif |
diff --git a/firmware/target/arm/usb-drv-arc.c b/firmware/target/arm/usb-drv-arc.c index 529f6cf7f8..914d220233 100644 --- a/firmware/target/arm/usb-drv-arc.c +++ b/firmware/target/arm/usb-drv-arc.c | |||
@@ -424,7 +424,7 @@ void usb_drv_init(void) | |||
424 | REG_PORTSC1 = (REG_PORTSC1 & ~PORTSCX_PHY_TYPE_SEL) | PORTSCX_PTS_ULPI; | 424 | REG_PORTSC1 = (REG_PORTSC1 & ~PORTSCX_PHY_TYPE_SEL) | PORTSCX_PTS_ULPI; |
425 | #endif | 425 | #endif |
426 | 426 | ||
427 | #ifndef USE_HIGH_SPEED | 427 | #ifdef USB_NO_HIGH_SPEED |
428 | /* Force device to full speed */ | 428 | /* Force device to full speed */ |
429 | /* See 32.9.5.9.2 */ | 429 | /* See 32.9.5.9.2 */ |
430 | REG_PORTSC1 |= PORTSCX_PORT_FORCE_FULL_SPEED; | 430 | REG_PORTSC1 |= PORTSCX_PORT_FORCE_FULL_SPEED; |
diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index 5f22d87c5e..72900d830f 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c | |||
@@ -66,7 +66,7 @@ static const struct usb_device_descriptor __attribute__((aligned(2))) | |||
66 | { | 66 | { |
67 | .bLength = sizeof(struct usb_device_descriptor), | 67 | .bLength = sizeof(struct usb_device_descriptor), |
68 | .bDescriptorType = USB_DT_DEVICE, | 68 | .bDescriptorType = USB_DT_DEVICE, |
69 | #ifdef USE_HIGH_SPEED | 69 | #ifndef USB_NO_HIGH_SPEED |
70 | .bcdUSB = 0x0200, | 70 | .bcdUSB = 0x0200, |
71 | #else | 71 | #else |
72 | .bcdUSB = 0x0110, | 72 | .bcdUSB = 0x0110, |