diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-09-14 14:05:07 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-09-14 14:05:07 +0000 |
commit | 207131c53b15e7b5956177e90932b7445ff5b4ce (patch) | |
tree | d9fa50afd9fac8c180dcbf82190b7c9d7d9a04aa /firmware/export | |
parent | 08d285b414627851ca49f89a49e085fac83f1e89 (diff) | |
download | rockbox-207131c53b15e7b5956177e90932b7445ff5b4ce.tar.gz rockbox-207131c53b15e7b5956177e90932b7445ff5b4ce.zip |
Convert ARC USB driver code to always use setup packet detection and remove the bus-reset-based detection method for it. This prevents false USB detection from chargers or other accesories that aren't actually a host but can trigger the bus reset condition.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30546 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 8addb62e95..e6a87915fc 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -736,7 +736,7 @@ Lyre prototype 1 */ | |||
736 | /* Priority in bootloader is wanted */ | 736 | /* Priority in bootloader is wanted */ |
737 | #define HAVE_PRIORITY_SCHEDULING | 737 | #define HAVE_PRIORITY_SCHEDULING |
738 | #define USB_STATUS_BY_EVENT | 738 | #define USB_STATUS_BY_EVENT |
739 | #define USB_DETECT_BY_DRV | 739 | #define USB_DETECT_BY_CORE |
740 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC | 740 | #if defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_ARC |
741 | #define INCLUDE_TIMEOUT_API | 741 | #define INCLUDE_TIMEOUT_API |
742 | #endif | 742 | #endif |
@@ -763,7 +763,7 @@ Lyre prototype 1 */ | |||
763 | #ifdef HAVE_USBSTACK | 763 | #ifdef HAVE_USBSTACK |
764 | #if CONFIG_USBOTG == USBOTG_ARC | 764 | #if CONFIG_USBOTG == USBOTG_ARC |
765 | #define USB_STATUS_BY_EVENT | 765 | #define USB_STATUS_BY_EVENT |
766 | #define USB_DETECT_BY_DRV | 766 | #define USB_DETECT_BY_CORE |
767 | #define INCLUDE_TIMEOUT_API | 767 | #define INCLUDE_TIMEOUT_API |
768 | #elif CONFIG_USBOTG == USBOTG_AS3525 | 768 | #elif CONFIG_USBOTG == USBOTG_AS3525 |
769 | #define USB_STATUS_BY_EVENT | 769 | #define USB_STATUS_BY_EVENT |
@@ -779,12 +779,6 @@ Lyre prototype 1 */ | |||
779 | 779 | ||
780 | #endif /* BOOTLOADER */ | 780 | #endif /* BOOTLOADER */ |
781 | 781 | ||
782 | #ifdef PHILIPS_SA9200 | ||
783 | /* Instead use the request for a device descriptor to detect a host */ | ||
784 | #undef USB_DETECT_BY_DRV | ||
785 | #define USB_DETECT_BY_CORE | ||
786 | #endif | ||
787 | |||
788 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ | 782 | #if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ |
789 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ | 783 | || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ |
790 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ | 784 | || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ |