From 47bade1437d5281a5aca0ec8b2b9a3956f88f685 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Thu, 15 Dec 2011 00:14:36 +0000 Subject: Simplify and neaten-up usb.c a bit. USB_INSERTED and USB_EXTRACTED are always used as events to indicate cable state. USB_HOSTED is posted to indicated that a host was detected. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31263 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'firmware/target/arm/imx31') diff --git a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c index c52a9a6dec..19c3b3173f 100644 --- a/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c +++ b/firmware/target/arm/imx31/gigabeat-s/usb-gigabeat-s.c @@ -66,7 +66,7 @@ void usb_connect_event(void) usb_status = status; /* Notify power that USB charging is potentially available */ charger_usb_detect_event(status); - usb_status_event((status == USB_INSERTED) ? USB_POWERED : USB_UNPOWERED); + usb_status_event(status); } int usb_detect(void) @@ -138,11 +138,11 @@ void usb_drv_int_enable(bool enable) } } -/* Called during the bus reset interrupt when in detect mode */ +/* Called during the setup packet request by the host */ void usb_drv_usb_detect_event(void) { if (usb_drv_powered()) - usb_status_event(USB_INSERTED); + usb_status_event(USB_HOSTED); } /* Called when reading the MBR */ -- cgit v1.2.3