diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/kernel.h | 1 | ||||
-rw-r--r-- | firmware/export/usb.h | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h index cfc7a232ac..20743c554b 100644 --- a/firmware/export/kernel.h +++ b/firmware/export/kernel.h | |||
@@ -64,7 +64,6 @@ | |||
64 | #define SYS_USB_CONNECTED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 0) | 64 | #define SYS_USB_CONNECTED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 0) |
65 | #define SYS_USB_CONNECTED_ACK MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 1) | 65 | #define SYS_USB_CONNECTED_ACK MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 1) |
66 | #define SYS_USB_DISCONNECTED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 2) | 66 | #define SYS_USB_DISCONNECTED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 2) |
67 | #define SYS_USB_DISCONNECTED_ACK MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 3) | ||
68 | #define SYS_USB_LUN_LOCKED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 4) | 67 | #define SYS_USB_LUN_LOCKED MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 4) |
69 | #define SYS_USB_READ_DATA MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 5) | 68 | #define SYS_USB_READ_DATA MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 5) |
70 | #define SYS_USB_WRITE_DATA MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 6) | 69 | #define SYS_USB_WRITE_DATA MAKE_SYS_EVENT(SYS_EVENT_CLS_USB, 6) |
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 |