Changeset df6ded8 in mainline for uspace/lib/usbvirt/src
- Timestamp:
- 2018-02-28T16:37:50Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 1b20da0
- Parents:
- f5e5f73 (diff), b2dca8de (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - git-author:
- Jakub Jermar <jakub@…> (2018-02-28 16:06:42)
- git-committer:
- Jakub Jermar <jakub@…> (2018-02-28 16:37:50)
- Location:
- uspace/lib/usbvirt/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbvirt/src/ctrltransfer.c
rf5e5f73 rdf6ded8 68 68 } 69 69 70 usb_log_debug("Control transfer: %s(%s) \n", handler->name,70 usb_log_debug("Control transfer: %s(%s)", handler->name, 71 71 usb_debug_str_buffer((uint8_t*) setup, sizeof(*setup), 0)); 72 72 errno_t rc = handler->callback(dev, setup, data, data_sent_size); -
uspace/lib/usbvirt/src/ipc_hc.c
rf5e5f73 rdf6ded8 50 50 * @param data_buffer Data buffer (DATA stage of control transfer). 51 51 * @param data_buffer_size Size of data buffer in bytes. 52 * @param data_transfer ed_size Number of actually transferred bytes.52 * @param data_transferred_size Number of actually transferred bytes. 53 53 * 54 54 * @return Error code. … … 57 57 errno_t usbvirt_ipc_send_control_read(async_sess_t *sess, void *setup_buffer, 58 58 size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size, 59 size_t *data_transfer ed_size)59 size_t *data_transferred_size) 60 60 { 61 61 if (!sess) … … 77 77 } 78 78 79 errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size); 79 errno_t rc = async_data_write_start(exch, setup_buffer, 80 setup_buffer_size); 80 81 if (rc != EOK) { 81 82 async_exchange_end(exch); … … 85 86 86 87 ipc_call_t data_request_call; 87 aid_t data_request = async_data_read(exch, data_buffer, data_buffer_size,88 &data_request_call);88 aid_t data_request = async_data_read(exch, data_buffer, 89 data_buffer_size, &data_request_call); 89 90 90 91 async_exchange_end(exch); … … 111 112 return (errno_t) opening_request_rc; 112 113 113 if (data_transfer ed_size != NULL)114 *data_transfer ed_size = IPC_GET_ARG2(data_request_call);114 if (data_transferred_size != NULL) 115 *data_transferred_size = IPC_GET_ARG2(data_request_call); 115 116 116 117 return EOK; … … 150 151 } 151 152 152 errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size); 153 errno_t rc = async_data_write_start(exch, setup_buffer, 154 setup_buffer_size); 153 155 if (rc != EOK) { 154 156 async_exchange_end(exch); … … 158 160 159 161 if (data_buffer_size > 0) { 160 rc = async_data_write_start(exch, data_buffer, data_buffer_size); 162 rc = async_data_write_start(exch, data_buffer, 163 data_buffer_size); 161 164 if (rc != EOK) { 162 165 async_exchange_end(exch); -
uspace/lib/usbvirt/src/transfer.c
rf5e5f73 rdf6ded8 79 79 80 80 if (rc == EFORWARD) { 81 usb_log_warning("Control transfer {%s (%s)} not handled. \n",81 usb_log_warning("Control transfer {%s (%s)} not handled.", 82 82 usb_debug_str_buffer(setup, setup_size, 10), 83 83 setup_packet->request_type & 0x80 … … 119 119 * @return Error code. 120 120 */ 121 errno_t usbvirt_control_read(usbvirt_device_t *dev, const void *setup, size_t setup_size, 121 errno_t usbvirt_control_read(usbvirt_device_t *dev, 122 const void *setup, size_t setup_size, 122 123 void *data, size_t data_size, size_t *data_size_sent) 123 124 {
Note:
See TracChangeset
for help on using the changeset viewer.