diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/usb.h | 2 | ||||
-rw-r--r-- | firmware/export/usb_core.h | 8 | ||||
-rw-r--r-- | firmware/export/usb_drv.h | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/firmware/export/usb.h b/firmware/export/usb.h index 9952a074bb..08ae27999a 100644 --- a/firmware/export/usb.h +++ b/firmware/export/usb.h | |||
@@ -85,7 +85,7 @@ enum { | |||
85 | struct usb_transfer_completion_event_data | 85 | struct usb_transfer_completion_event_data |
86 | { | 86 | { |
87 | unsigned char endpoint; | 87 | unsigned char endpoint; |
88 | bool in; | 88 | int dir; |
89 | int status; | 89 | int status; |
90 | int length; | 90 | int length; |
91 | void* data; | 91 | void* data; |
diff --git a/firmware/export/usb_core.h b/firmware/export/usb_core.h index 6aada54399..9d9e327bb3 100644 --- a/firmware/export/usb_core.h +++ b/firmware/export/usb_core.h | |||
@@ -45,10 +45,12 @@ | |||
45 | 45 | ||
46 | extern int usb_max_pkt_size; | 46 | extern int usb_max_pkt_size; |
47 | 47 | ||
48 | struct usb_class_driver; | ||
49 | |||
48 | void usb_core_init(void); | 50 | void usb_core_init(void); |
49 | void usb_core_exit(void); | 51 | void usb_core_exit(void); |
50 | void usb_core_control_request(struct usb_ctrlrequest* req); | 52 | void usb_core_control_request(struct usb_ctrlrequest* req); |
51 | void usb_core_transfer_complete(int endpoint, bool in, int status, int length); | 53 | void usb_core_transfer_complete(int endpoint, int dir, int status, int length); |
52 | void usb_core_bus_reset(void); | 54 | void usb_core_bus_reset(void); |
53 | bool usb_core_exclusive_connection(void); | 55 | bool usb_core_exclusive_connection(void); |
54 | void usb_core_enable_driver(int driver,bool enabled); | 56 | void usb_core_enable_driver(int driver,bool enabled); |
@@ -56,6 +58,10 @@ bool usb_core_driver_enabled (int driver); | |||
56 | void usb_core_handle_transfer_completion( | 58 | void usb_core_handle_transfer_completion( |
57 | struct usb_transfer_completion_event_data* event); | 59 | struct usb_transfer_completion_event_data* event); |
58 | int usb_core_ack_control(struct usb_ctrlrequest* req); | 60 | int usb_core_ack_control(struct usb_ctrlrequest* req); |
61 | |||
62 | int usb_core_request_endpoint(int dir, struct usb_class_driver *drv); | ||
63 | void usb_core_release_endpoint(int dir); | ||
64 | |||
59 | #ifdef HAVE_HOTSWAP | 65 | #ifdef HAVE_HOTSWAP |
60 | void usb_core_hotswap_event(int volume,bool inserted); | 66 | void usb_core_hotswap_event(int volume,bool inserted); |
61 | #endif | 67 | #endif |
diff --git a/firmware/export/usb_drv.h b/firmware/export/usb_drv.h index 3db82efd6a..3bd8e1fdf4 100644 --- a/firmware/export/usb_drv.h +++ b/firmware/export/usb_drv.h | |||
@@ -41,5 +41,7 @@ int usb_drv_port_speed(void); | |||
41 | void usb_drv_cancel_all_transfers(void); | 41 | void usb_drv_cancel_all_transfers(void); |
42 | void usb_drv_set_test_mode(int mode); | 42 | void usb_drv_set_test_mode(int mode); |
43 | bool usb_drv_connected(void); | 43 | bool usb_drv_connected(void); |
44 | int usb_drv_request_endpoint(int dir); | ||
45 | void usb_drv_release_endpoint(int ep); | ||
44 | 46 | ||
45 | #endif | 47 | #endif |