From b9c49fd474b7ce0111d3e5e4de6498e8ade96bba Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sun, 30 Nov 2008 15:53:36 +0000 Subject: Replace USE_HIGH_SPEED with USB_NO_HIGH_SPEED, as high speed support is the normal case git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19274 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-gigabeat-s.h | 1 - firmware/export/config-iaudio7.h | 1 - firmware/export/config-logikdax.h | 1 - firmware/target/arm/usb-drv-arc.c | 2 +- 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 @@ #define CONFIG_USBOTG USBOTG_ARC /* enable these for the experimental usb stack */ -#define USE_HIGH_SPEED #define USE_ROCKBOX_USB #define HAVE_USBSTACK #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 @@ #if 0 && !defined(SIMULATOR) /* Enable for USB driver test */ #define HAVE_USBSTACK -#define USE_HIGH_SPEED #define USB_VENDOR_ID 0x0e21 #define USB_PRODUCT_ID 0x0750 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 @@ #if 0 /* Enable for USB driver test */ #define HAVE_USBSTACK -#define USE_HIGH_SPEED #define USB_VENDOR_ID 0x13d1 #define USB_PRODUCT_ID 0x1002 #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) REG_PORTSC1 = (REG_PORTSC1 & ~PORTSCX_PHY_TYPE_SEL) | PORTSCX_PTS_ULPI; #endif -#ifndef USE_HIGH_SPEED +#ifdef USB_NO_HIGH_SPEED /* Force device to full speed */ /* See 32.9.5.9.2 */ 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))) { .bLength = sizeof(struct usb_device_descriptor), .bDescriptorType = USB_DT_DEVICE, -#ifdef USE_HIGH_SPEED +#ifndef USB_NO_HIGH_SPEED .bcdUSB = 0x0200, #else .bcdUSB = 0x0110, -- cgit v1.2.3