Changeset df6ded8 in mainline for uspace/lib/usbvirt/src

Timestamp:

2018-02-28T16:37:50Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

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)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

Location:

uspace/lib/usbvirt/src

Files:

• ctrltransfer.c (modified) (1 diff)
• ipc_hc.c (modified) (7 diffs)
• transfer.c (modified) (2 diffs)

uspace/lib/usbvirt/src/ctrltransfer.c

@@ -68 +68 @@
                 }
 
-                usb_log_debug("Control transfer: %s(%s)\n", handler->name,
+                usb_log_debug("Control transfer: %s(%s)", handler->name,
                     usb_debug_str_buffer((uint8_t*) setup, sizeof(*setup), 0));
                 errno_t rc = handler->callback(dev, setup, data, data_sent_size);

uspace/lib/usbvirt/src/ipc_hc.c

@@ -50 +50 @@
  * @param data_buffer Data buffer (DATA stage of control transfer).
  * @param data_buffer_size Size of data buffer in bytes.
- * @param data_transfered_size Number of actually transferred bytes.
+ * @param data_transferred_size Number of actually transferred bytes.
  *
  * @return Error code.
@@ -57 +57 @@
 errno_t usbvirt_ipc_send_control_read(async_sess_t *sess, void *setup_buffer,
     size_t setup_buffer_size, void *data_buffer, size_t data_buffer_size,
-    size_t *data_transfered_size)
+    size_t *data_transferred_size)
 {
         if (!sess)
@@ -77 +77 @@
         }
         
-        errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
+        errno_t rc = async_data_write_start(exch, setup_buffer,
+            setup_buffer_size);
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -85 +86 @@
         
         ipc_call_t data_request_call;
-        aid_t data_request = async_data_read(exch, data_buffer, data_buffer_size,
-            &data_request_call);
+        aid_t data_request = async_data_read(exch, data_buffer,
+            data_buffer_size, &data_request_call);
         
         async_exchange_end(exch);
@@ -111 +112 @@
                 return (errno_t) opening_request_rc;
         
-        if (data_transfered_size != NULL)
-                *data_transfered_size = IPC_GET_ARG2(data_request_call);
+        if (data_transferred_size != NULL)
+                *data_transferred_size = IPC_GET_ARG2(data_request_call);
         
         return EOK;
@@ -150 +151 @@
         }
         
-        errno_t rc = async_data_write_start(exch, setup_buffer, setup_buffer_size);
+        errno_t rc = async_data_write_start(exch, setup_buffer,
+            setup_buffer_size);
         if (rc != EOK) {
                 async_exchange_end(exch);
@@ -158 +160 @@
         
         if (data_buffer_size > 0) {
-                rc = async_data_write_start(exch, data_buffer, data_buffer_size);
+                rc = async_data_write_start(exch, data_buffer,
+                    data_buffer_size);
                 if (rc != EOK) {
                         async_exchange_end(exch);

uspace/lib/usbvirt/src/transfer.c

@@ -79 +79 @@
 
         if (rc == EFORWARD) {
-                usb_log_warning("Control transfer {%s (%s)} not handled.\n",
+                usb_log_warning("Control transfer {%s (%s)} not handled.",
                     usb_debug_str_buffer(setup, setup_size, 10),
                     setup_packet->request_type & 0x80
@@ -119 +119 @@
  * @return Error code.
  */
-errno_t usbvirt_control_read(usbvirt_device_t *dev, const void *setup, size_t setup_size,
+errno_t usbvirt_control_read(usbvirt_device_t *dev,
+    const void *setup, size_t setup_size,
     void *data, size_t data_size, size_t *data_size_sent)
 {