From 453550a6877afcda342ac2477cf05028fff053f9 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Tue, 18 Jan 2011 14:10:06 +0000 Subject: Try to get some control over #ifdef hell in usb.c by refactoring and inline function use. SYS_USB_DISCONNECTED_ACK hasn't been doing anything useful for the USB thread; remove it. USB thread simply ignores that value. Observe only valid usb_state transitions. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29084 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/usb.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'firmware/export/usb.h') diff --git a/firmware/export/usb.h b/firmware/export/usb.h index aceecb55ae..a3425dae2f 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h @@ -33,10 +33,7 @@ enum { USB_EXTRACTED = 0, /* Event+State */ USB_INSERTED, /* Event+State */ -#if defined(HAVE_USB_POWER) || defined(USB_DETECT_BY_DRV) || \ - defined(USB_DETECT_BY_CORE) - USB_POWERED, /* Event+State */ -#endif + USB_POWERED, /* Event+State - transitional indicator if no power */ #if defined(USB_DETECT_BY_DRV) || defined(USB_DETECT_BY_CORE) USB_UNPOWERED, /* Event */ #endif -- cgit v1.2.3