3 files changed, 43 insertions, 9 deletions

diff --git a/firmware/export/usb_ch9.h b/firmware/export/usb_ch9.h
index 1bfc152a8a..d5885ac9b8 100644
--- a/firmware/export/usb_ch9.h
+++ b/firmware/export/usb_ch9.h
@@ -245,7 +245,7 @@ struct usb_string_descriptor {
     uint8_t  bDescriptorType;
 
     uint16_t wString[]; /* UTF-16LE encoded */
-} __attribute__ ((packed));
+} __attribute__ ((packed,aligned(2)));
 
 /* note that "string" zero is special, it holds language codes that
  * the device supports, not Unicode characters.
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h
index 2027cca5e8..73cf5c0127 100644
--- a/firmware/export/usb_core.h
+++ b/firmware/export/usb_core.h
@@ -19,6 +19,22 @@
 #ifndef USB_CORE_H
 #define USB_CORE_H
 
+#ifndef BOOTLOADER
+#define USB_THREAD
+
+#ifdef USE_ROCKBOX_USB
+//#define USB_SERIAL
+//#define USB_BENCHMARK
+#define USB_STORAGE
+
+#else
+#define USB_CHARGING_ONLY
+
+#endif /* USE_ROCKBOX_USB */
+#else
+#define USB_CHARGING_ONLY
+#endif /* BOOTLOADER */
+
 #include "usb_ch9.h"
 
 #if defined(CPU_PP)
@@ -26,14 +42,31 @@
 #define USB_IRAM_SIZE     ((size_t)0xc000)
 #endif
 
+
+enum {
+        USB_CORE_QUIT,
+        USB_CORE_TRANSFER_COMPLETION
+};
+
 /* endpoints */
 enum {
-    EP_CONTROL = 0,
-    EP_RX,
-    EP_TX,
-    NUM_ENDPOINTS
+        EP_CONTROL = 0,
+#ifdef USB_STORAGE
+        EP_MASS_STORAGE,
+#endif
+#ifdef USB_SERIAL
+        EP_SERIAL,
+#endif
+#ifdef USB_CHARGING_ONLY
+        EP_CHARGING_ONLY,
+#endif
+#ifdef USB_BENCHMARK
+        EP_BENCHMARK,
+#endif
+        NUM_ENDPOINTS
 };
 
+
 /* queue events */
 #define USB_TRANSFER_COMPLETE 1
 
@@ -48,7 +81,7 @@ extern int usb_max_pkt_size;
 void usb_core_init(void);
 void usb_core_exit(void);
 void usb_core_control_request(struct usb_ctrlrequest* req);
-void usb_core_transfer_complete(int endpoint, bool in);
+void usb_core_transfer_complete(int endpoint, bool in, int status, int length);
 void usb_core_bus_reset(void);
 bool usb_core_data_connection(void);
 
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h
index 6a37144c1a..430f03bdc7 100644
--- a/firmware/export/usb_drv.h
+++ b/firmware/export/usb_drv.h
@@ -24,16 +24,17 @@
 void usb_drv_init(void);
 void usb_drv_exit(void);
 void usb_drv_int(void);
-void usb_drv_stall(int endpoint, bool stall);
+void usb_drv_stall(int endpoint, bool stall,bool in);
+bool usb_drv_stalled(int endpoint,bool in);
 int usb_drv_send(int endpoint, void* ptr, int length);
+int usb_drv_send_nonblocking(int endpoint, void* ptr, int length);
 int usb_drv_recv(int endpoint, void* ptr, int length);
 void usb_drv_ack(struct usb_ctrlrequest* req);
 void usb_drv_set_address(int address);
 void usb_drv_reset_endpoint(int endpoint, bool send);
 void usb_drv_wait(int endpoint, bool send);
 bool usb_drv_powered(void);
-int usb_drv_get_last_transfer_status(void);
-int usb_drv_get_last_transfer_length(void);
 int usb_drv_port_speed(void);
+void usb_drv_cancel_all_transfers(void);
 
 #endif