diff options
Diffstat (limited to 'firmware/target/arm/usb-fw-pp502x.c')
-rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index 8f754fd04b..536535e059 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c | |||
@@ -65,10 +65,10 @@ | |||
65 | #define USB_GPIO_VAL 0x04 | 65 | #define USB_GPIO_VAL 0x04 |
66 | 66 | ||
67 | #elif defined(PHILIPS_SA9200) | 67 | #elif defined(PHILIPS_SA9200) |
68 | /* GPIO F bit 7 (low) is usb detect */ | 68 | /* GPIO B bit 6 (high) is usb bus power detect */ |
69 | #define USB_GPIO GPIOF | 69 | #define USB_GPIO GPIOB |
70 | #define USB_GPIO_MASK 0x80 | 70 | #define USB_GPIO_MASK 0x40 |
71 | #define USB_GPIO_VAL 0x00 | 71 | #define USB_GPIO_VAL 0x40 |
72 | 72 | ||
73 | #elif defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) | 73 | #elif defined(PHILIPS_HDD1630) || defined(PHILIPS_HDD6330) |
74 | /* GPIO E bit 2 is usb detect */ | 74 | /* GPIO E bit 2 is usb detect */ |
@@ -225,10 +225,12 @@ void usb_insert_int(void) | |||
225 | timeout_register(&usb_oneshot, usb_timeout_event, HZ/5, val); | 225 | timeout_register(&usb_oneshot, usb_timeout_event, HZ/5, val); |
226 | } | 226 | } |
227 | 227 | ||
228 | /* Called during the bus reset interrupt when in detect mode - filter for | 228 | /* USB_DETECT_BY_DRV: Called during the bus reset interrupt when in detect mode |
229 | * invalid bus reset when unplugging by checking the pin state. */ | 229 | * USB_DETECT_BY_CORE: Called when device descriptor is requested |
230 | */ | ||
230 | void usb_drv_usb_detect_event(void) | 231 | void usb_drv_usb_detect_event(void) |
231 | { | 232 | { |
233 | /* Filter for invalid bus reset when unplugging by checking the pin state. */ | ||
232 | if(usb_plugged()) { | 234 | if(usb_plugged()) { |
233 | usb_status_event(USB_INSERTED); | 235 | usb_status_event(USB_INSERTED); |
234 | } | 236 | } |