Changeset 5a6cc679 in mainline for uspace/lib/drv/generic/remote_usbhc.c
- Timestamp:
- 2018-01-31T02:21:24Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a0a9cc2
- Parents:
- 132ab5d1
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/drv/generic/remote_usbhc.c
r132ab5d1 r5a6cc679 104 104 * 105 105 */ 106 int usbhc_device_remove(async_exch_t *exch, unsigned port)106 errno_t usbhc_device_remove(async_exch_t *exch, unsigned port) 107 107 { 108 108 if (!exch) … … 112 112 } 113 113 114 int usbhc_register_endpoint(async_exch_t *exch, usb_pipe_desc_t *pipe_desc,114 errno_t usbhc_register_endpoint(async_exch_t *exch, usb_pipe_desc_t *pipe_desc, 115 115 const usb_endpoint_descriptors_t *desc) 116 116 { … … 153 153 } 154 154 155 int usbhc_unregister_endpoint(async_exch_t *exch, const usb_pipe_desc_t *pipe_desc)155 errno_t usbhc_unregister_endpoint(async_exch_t *exch, const usb_pipe_desc_t *pipe_desc) 156 156 { 157 157 if (!exch) … … 178 178 } 179 179 180 int usbhc_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,180 errno_t usbhc_read(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup, 181 181 void *data, size_t size, size_t *rec_size) 182 182 { … … 208 208 209 209 /* Wait for the answer. */ 210 int data_request_rc;211 int opening_request_rc;210 errno_t data_request_rc; 211 errno_t opening_request_rc; 212 212 async_wait_for(data_request, &data_request_rc); 213 213 async_wait_for(opening_request, &opening_request_rc); … … 216 216 /* Prefer the return code of the opening request. */ 217 217 if (opening_request_rc != EOK) { 218 return ( int) opening_request_rc;218 return (errno_t) opening_request_rc; 219 219 } else { 220 return ( int) data_request_rc;220 return (errno_t) data_request_rc; 221 221 } 222 222 } 223 223 if (opening_request_rc != EOK) { 224 return ( int) opening_request_rc;224 return (errno_t) opening_request_rc; 225 225 } 226 226 … … 229 229 } 230 230 231 int usbhc_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup,231 errno_t usbhc_write(async_exch_t *exch, usb_endpoint_t endpoint, uint64_t setup, 232 232 const void *data, size_t size) 233 233 { … … 248 248 /* Send the data if any. */ 249 249 if (size > 0) { 250 const int ret = async_data_write_start(exch, data, size);250 const errno_t ret = async_data_write_start(exch, data, size); 251 251 if (ret != EOK) { 252 252 async_forget(opening_request); … … 256 256 257 257 /* Wait for the answer. */ 258 int opening_request_rc;258 errno_t opening_request_rc; 259 259 async_wait_for(opening_request, &opening_request_rc); 260 260 261 return ( int) opening_request_rc;261 return (errno_t) opening_request_rc; 262 262 } 263 263 … … 433 433 } 434 434 435 static int callback_out(void *arg, int error, size_t transferred_size)435 static errno_t callback_out(void *arg, int error, size_t transferred_size) 436 436 { 437 437 async_transaction_t *trans = arg; 438 438 439 const int err = async_answer_0(trans->caller, error);439 const errno_t err = async_answer_0(trans->caller, error); 440 440 441 441 async_transaction_destroy(trans); … … 444 444 } 445 445 446 static int callback_in(void *arg, int error, size_t transferred_size)446 static errno_t callback_in(void *arg, int error, size_t transferred_size) 447 447 { 448 448 async_transaction_t *trans = arg; … … 457 457 } 458 458 459 const int err = async_answer_0(trans->caller, error);459 const errno_t err = async_answer_0(trans->caller, error); 460 460 async_transaction_destroy(trans); 461 461 return err; … … 507 507 }}; 508 508 509 const int rc = usbhc_iface->read(509 const errno_t rc = usbhc_iface->read( 510 510 fun, target, setup, trans->buffer, size, callback_in, trans); 511 511 … … 545 545 size_t size = 0; 546 546 if (data_buffer_len > 0) { 547 const int rc = async_data_write_accept(&trans->buffer, false,547 const errno_t rc = async_data_write_accept(&trans->buffer, false, 548 548 1, data_buffer_len, 0, &size); 549 549 … … 562 562 }}; 563 563 564 const int rc = usbhc_iface->write(564 const errno_t rc = usbhc_iface->write( 565 565 fun, target, setup, trans->buffer, size, callback_out, trans); 566 566
Note:
See TracChangeset
for help on using the changeset viewer.