summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/config.h6
-rw-r--r--firmware/export/usb.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 95f38c5995..f5ee003308 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -733,6 +733,12 @@ Lyre prototype 1 */
733 733
734#endif /* BOOTLOADER */ 734#endif /* BOOTLOADER */
735 735
736#ifdef PHILIPS_SA9200
737/* Instead use the request for a device descriptor to detect a host */
738#undef USB_DETECT_BY_DRV
739#define USB_DETECT_BY_CORE
740#endif
741
736#if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \ 742#if defined(HAVE_USBSTACK) || (CONFIG_CPU == JZ4732) \
737 || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \ 743 || (CONFIG_CPU == AS3525) || (CONFIG_CPU == AS3525v2) \
738 || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \ 744 || defined(CPU_S5L870X) || (CONFIG_CPU == S3C2440) \
diff --git a/firmware/export/usb.h b/firmware/export/usb.h
index e192748e4d..aceecb55ae 100644
--- a/firmware/export/usb.h
+++ b/firmware/export/usb.h
@@ -33,10 +33,11 @@
33enum { 33enum {
34 USB_EXTRACTED = 0, /* Event+State */ 34 USB_EXTRACTED = 0, /* Event+State */
35 USB_INSERTED, /* Event+State */ 35 USB_INSERTED, /* Event+State */
36#if defined(HAVE_USB_POWER) || defined(USB_DETECT_BY_DRV) 36#if defined(HAVE_USB_POWER) || defined(USB_DETECT_BY_DRV) || \
37 defined(USB_DETECT_BY_CORE)
37 USB_POWERED, /* Event+State */ 38 USB_POWERED, /* Event+State */
38#endif 39#endif
39#ifdef USB_DETECT_BY_DRV 40#if defined(USB_DETECT_BY_DRV) || defined(USB_DETECT_BY_CORE)
40 USB_UNPOWERED, /* Event */ 41 USB_UNPOWERED, /* Event */
41#endif 42#endif
42#ifdef HAVE_LCD_BITMAP 43#ifdef HAVE_LCD_BITMAP