Changeset 3a8370c in mainline

Timestamp:

2011-09-13T13:30:28Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7eb32a8

Parents:

4cbb6e4

Message:

libdrv: usbhc: use generic read/write for control transfers

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (5 diffs)

uspace/lib/drv/generic/remote_usbhc.c

@@ -393 +393 @@
         assert(usb_iface != NULL);
 
-        if (!usb_iface->control_write) {
+        if (!usb_iface->write) {
                 async_answer_0(callid, ENOTSUP);
                 return;
@@ -434 +434 @@
                 return;
         }
-        trans->setup_packet = setup_packet;
         trans->buffer = data_buffer;
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(fun, target,
-            setup_packet, setup_packet_len,
-            data_buffer, data_buffer_len,
-            callback_out, trans);
+        assert(setup_packet_len == 8);
+        uint64_t setup_buffer;
+        memcpy(&setup_buffer, setup_packet, 8);
+        free(setup_packet);
+        rc = usb_iface->write(fun, target, setup_buffer, trans->buffer,
+            trans->size, callback_out, trans);
 
         if (rc != EOK) {
@@ -456 +457 @@
         assert(usb_iface != NULL);
 
-        if (!usb_iface->control_read) {
+        if (!usb_iface->read) {
                 async_answer_0(callid, ENOTSUP);
                 return;
@@ -494 +495 @@
         }
         trans->data_caller = data_callid;
-        trans->setup_packet = setup_packet;
         trans->size = data_len;
         trans->buffer = malloc(data_len);
@@ -504 +504 @@
         }
 
-        rc = usb_iface->control_read(fun, target,
-            setup_packet, setup_packet_len,
-            trans->buffer, trans->size,
-            callback_in, trans);
-
+        assert(setup_packet_len == 8);
+        uint64_t setup_buffer;
+        memcpy(&setup_buffer, setup_packet, 8);
+        free(setup_packet);
+        rc = usb_iface->read(fun, target, setup_buffer, trans->buffer,
+            trans->size, callback_in, trans);
         if (rc != EOK) {
                 async_answer_0(data_callid, rc);