Changeset db51a6a6 in mainline for uspace/lib/usbdev/src
- Timestamp:
- 2018-01-22T12:20:14Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 998773d
- Parents:
- b3c39690
- git-author:
- Ondřej Hlavatý <aearsis@…> (2018-01-22 12:18:02)
- git-committer:
- Ondřej Hlavatý <aearsis@…> (2018-01-22 12:20:14)
- Location:
- uspace/lib/usbdev/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/lib/usbdev/src/pipes.c
rb3c39690 rdb51a6a6 69 69 * @param[out] data_buffer Buffer for incoming data. 70 70 * @param[in] data_buffer_size Size of the buffer for incoming data (in bytes). 71 * @param[out] data_transfer ed_size Number of bytes that were actually72 * transfer ed during the DATA stage.71 * @param[out] data_transferred_size Number of bytes that were actually 72 * transferred during the DATA stage. 73 73 * @return Error code. 74 74 */ 75 75 int usb_pipe_control_read(usb_pipe_t *pipe, 76 76 const void *setup_buffer, size_t setup_buffer_size, 77 void *buffer, size_t buffer_size, size_t *transfer ed_size)77 void *buffer, size_t buffer_size, size_t *transferred_size) 78 78 { 79 79 assert(pipe); … … 105 105 } 106 106 107 if (rc == EOK && transfer ed_size != NULL) {108 *transfer ed_size = act_size;107 if (rc == EOK && transferred_size != NULL) { 108 *transferred_size = act_size; 109 109 } 110 110 … … 166 166 * @param[out] buffer Buffer where to store the data. 167 167 * @param[in] size Size of the buffer (in bytes). 168 * @param[out] size_transfer ed Number of bytes that were actually transfered.168 * @param[out] size_transferred Number of bytes that were actually transferred. 169 169 * @return Error code. 170 170 */ 171 171 int usb_pipe_read(usb_pipe_t *pipe, 172 void *buffer, size_t size, size_t *size_transfer ed)172 void *buffer, size_t size, size_t *size_transferred) 173 173 { 174 174 assert(pipe); … … 200 200 async_exchange_end(exch); 201 201 202 if (rc == EOK && size_transfer ed != NULL) {203 *size_transfer ed = act_size;202 if (rc == EOK && size_transferred != NULL) { 203 *size_transferred = act_size; 204 204 } 205 205 -
uspace/lib/usbdev/src/request.c
rb3c39690 rdb51a6a6 118 118 * @param data_size Size of the @p data buffer 119 119 * (in native endianness). 120 * @param actual_data_size Actual size of transfer ed data120 * @param actual_data_size Actual size of transferred data 121 121 * (in native endianness). 122 122 * … … 183 183 184 184 uint16_t status_usb_endianess; 185 size_t data_transfer ed_size;185 size_t data_transferred_size; 186 186 int rc = usb_control_request_get(pipe, USB_REQUEST_TYPE_STANDARD, 187 187 recipient, USB_DEVREQ_GET_STATUS, 0, uint16_host2usb(index), 188 &status_usb_endianess, 2, &data_transfer ed_size);189 if (rc != EOK) { 190 return rc; 191 } 192 if (data_transfer ed_size != 2) {188 &status_usb_endianess, 2, &data_transferred_size); 189 if (rc != EOK) { 190 return rc; 191 } 192 if (data_transferred_size != 2) { 193 193 return ELIMIT; 194 194 } … … 314 314 */ 315 315 uint8_t tmp_buffer; 316 size_t bytes_transfer ed;316 size_t bytes_transferred; 317 317 rc = usb_request_get_descriptor(pipe, request_type, recipient, 318 318 descriptor_type, descriptor_index, language, 319 &tmp_buffer, sizeof(tmp_buffer), &bytes_transfer ed);320 if (rc != EOK) { 321 return rc; 322 } 323 if (bytes_transfer ed != 1) {319 &tmp_buffer, sizeof(tmp_buffer), &bytes_transferred); 320 if (rc != EOK) { 321 return rc; 322 } 323 if (bytes_transferred != 1) { 324 324 return ELIMIT; 325 325 } … … 340 340 rc = usb_request_get_descriptor(pipe, request_type, recipient, 341 341 descriptor_type, descriptor_index, language, 342 buffer, size, &bytes_transfer ed);342 buffer, size, &bytes_transferred); 343 343 if (rc != EOK) { 344 344 free(buffer); 345 345 return rc; 346 346 } 347 if (bytes_transfer ed != size) {347 if (bytes_transferred != size) { 348 348 free(buffer); 349 349 return ELIMIT;
Note:
See TracChangeset
for help on using the changeset viewer.