diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-01-18 14:10:06 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-01-18 14:10:06 +0000 |
| commit | 453550a6877afcda342ac2477cf05028fff053f9 (patch) | |
| tree | 0c1da0af945d93a6c4af2da5eb359f737e6a7f53 /firmware/export/usb.h | |
| parent | 980225c3e20b3102382c910da6e1406cc8c7f1b5 (diff) | |
| download | rockbox-453550a6877afcda342ac2477cf05028fff053f9.tar.gz rockbox-453550a6877afcda342ac2477cf05028fff053f9.zip | |
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
Diffstat (limited to 'firmware/export/usb.h')
| -rw-r--r-- | firmware/export/usb.h | 5 |
1 files changed, 1 insertions, 4 deletions
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 @@ | |||
| 33 | enum { | 33 | enum { |
| 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 | USB_POWERED, /* Event+State - transitional indicator if no power */ |
| 37 | defined(USB_DETECT_BY_CORE) | ||
| 38 | USB_POWERED, /* Event+State */ | ||
| 39 | #endif | ||
| 40 | #if defined(USB_DETECT_BY_DRV) || defined(USB_DETECT_BY_CORE) | 37 | #if defined(USB_DETECT_BY_DRV) || defined(USB_DETECT_BY_CORE) |
| 41 | USB_UNPOWERED, /* Event */ | 38 | USB_UNPOWERED, /* Event */ |
| 42 | #endif | 39 | #endif |