diff options
Diffstat (limited to 'firmware/usbstack/drivers/device')
-rw-r--r-- | firmware/usbstack/drivers/device/usb_serial.c | 5 | ||||
-rw-r--r-- | firmware/usbstack/drivers/device/usb_serial.h | 2 | ||||
-rw-r--r-- | firmware/usbstack/drivers/device/usb_storage.c | 5 | ||||
-rw-r--r-- | firmware/usbstack/drivers/device/usb_storage.h | 4 |
4 files changed, 9 insertions, 7 deletions
diff --git a/firmware/usbstack/drivers/device/usb_serial.c b/firmware/usbstack/drivers/device/usb_serial.c index 7299dc6765..0e6d7bf9f9 100644 --- a/firmware/usbstack/drivers/device/usb_serial.c +++ b/firmware/usbstack/drivers/device/usb_serial.c | |||
@@ -169,7 +169,7 @@ void usb_serial_driver_init(void) | |||
169 | 169 | ||
170 | /*-------------------------------------------------------------------------*/ | 170 | /*-------------------------------------------------------------------------*/ |
171 | 171 | ||
172 | void usb_serial_driver_bind(void* controler_ops) | 172 | int usb_serial_driver_bind(void* controler_ops) |
173 | { | 173 | { |
174 | logf("usb serial: bind"); | 174 | logf("usb serial: bind"); |
175 | ops = controler_ops; | 175 | ops = controler_ops; |
@@ -201,10 +201,11 @@ void usb_serial_driver_bind(void* controler_ops) | |||
201 | serial_debug_desc.bDebugInEndpoint = dev.in->ep_num; | 201 | serial_debug_desc.bDebugInEndpoint = dev.in->ep_num; |
202 | serial_debug_desc.bDebugOutEndpoint = dev.out->ep_num; | 202 | serial_debug_desc.bDebugOutEndpoint = dev.out->ep_num; |
203 | 203 | ||
204 | return; | 204 | return 0; |
205 | 205 | ||
206 | autoconf_fail: | 206 | autoconf_fail: |
207 | logf("failed to find endpoints"); | 207 | logf("failed to find endpoints"); |
208 | return -EOPNOTSUPP; | ||
208 | } | 209 | } |
209 | 210 | ||
210 | int usb_serial_driver_request(struct usb_ctrlrequest* request) | 211 | int usb_serial_driver_request(struct usb_ctrlrequest* request) |
diff --git a/firmware/usbstack/drivers/device/usb_serial.h b/firmware/usbstack/drivers/device/usb_serial.h index 657a233f05..8b9d96814e 100644 --- a/firmware/usbstack/drivers/device/usb_serial.h +++ b/firmware/usbstack/drivers/device/usb_serial.h | |||
@@ -25,7 +25,7 @@ | |||
25 | /* register serial driver in usb stack */ | 25 | /* register serial driver in usb stack */ |
26 | void usb_serial_driver_init(void); | 26 | void usb_serial_driver_init(void); |
27 | 27 | ||
28 | void usb_serial_driver_bind(void* controller_ops); | 28 | int usb_serial_driver_bind(void* controller_ops); |
29 | int usb_serial_driver_request(struct usb_ctrlrequest* req); | 29 | int usb_serial_driver_request(struct usb_ctrlrequest* req); |
30 | void usb_serial_driver_speed(enum usb_device_speed speed); | 30 | void usb_serial_driver_speed(enum usb_device_speed speed); |
31 | 31 | ||
diff --git a/firmware/usbstack/drivers/device/usb_storage.c b/firmware/usbstack/drivers/device/usb_storage.c index 3db379c1df..7d7ab8c4b8 100644 --- a/firmware/usbstack/drivers/device/usb_storage.c +++ b/firmware/usbstack/drivers/device/usb_storage.c | |||
@@ -160,7 +160,7 @@ void usb_storage_driver_init(void) | |||
160 | /*-------------------------------------------------------------------------*/ | 160 | /*-------------------------------------------------------------------------*/ |
161 | /* device driver ops */ | 161 | /* device driver ops */ |
162 | 162 | ||
163 | void usb_storage_driver_bind(void* controler_ops) | 163 | int usb_storage_driver_bind(void* controler_ops) |
164 | { | 164 | { |
165 | ops = controler_ops; | 165 | ops = controler_ops; |
166 | 166 | ||
@@ -181,10 +181,11 @@ void usb_storage_driver_bind(void* controler_ops) | |||
181 | dev.out->claimed = true; | 181 | dev.out->claimed = true; |
182 | logf("usb storage: out: %s", dev.out->name); | 182 | logf("usb storage: out: %s", dev.out->name); |
183 | 183 | ||
184 | return; | 184 | return 0; |
185 | 185 | ||
186 | autoconf_fail: | 186 | autoconf_fail: |
187 | logf("failed to find endpoints"); | 187 | logf("failed to find endpoints"); |
188 | return -EOPNOTSUPP; | ||
188 | } | 189 | } |
189 | 190 | ||
190 | int usb_storage_driver_request(struct usb_ctrlrequest* request) | 191 | int usb_storage_driver_request(struct usb_ctrlrequest* request) |
diff --git a/firmware/usbstack/drivers/device/usb_storage.h b/firmware/usbstack/drivers/device/usb_storage.h index ff4b187064..efd20fe8ee 100644 --- a/firmware/usbstack/drivers/device/usb_storage.h +++ b/firmware/usbstack/drivers/device/usb_storage.h | |||
@@ -22,10 +22,10 @@ | |||
22 | 22 | ||
23 | #include "usbstack/core.h" | 23 | #include "usbstack/core.h" |
24 | 24 | ||
25 | /* register serial driver in usb stack */ | 25 | /* register storage driver in usb stack */ |
26 | void usb_storage_driver_init(void); | 26 | void usb_storage_driver_init(void); |
27 | 27 | ||
28 | void usb_storage_driver_bind(void* controller_ops); | 28 | int usb_storage_driver_bind(void* controller_ops); |
29 | int usb_storage_driver_request(struct usb_ctrlrequest* req); | 29 | int usb_storage_driver_request(struct usb_ctrlrequest* req); |
30 | void usb_storage_driver_speed(enum usb_device_speed speed); | 30 | void usb_storage_driver_speed(enum usb_device_speed speed); |
31 | 31 | ||