Changeset 2e85b3c in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2011-02-16T18:22:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f4c87aa9

Parents:

600733e (diff), ec59693 (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.

Message:

Development branch

File:

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

uspace/lib/drv/generic/remote_usbhc.c

@@ -40 +40 @@
 
 #define USB_MAX_PAYLOAD_SIZE 1020
+#define HACK_MAX_PACKET_SIZE 8
+#define HACK_MAX_PACKET_SIZE_INTERRUPT_IN 4
 
 static void remote_usbhc_get_address(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -240 +242 @@
 
 static void callback_out(device_t *device,
-    usb_transaction_outcome_t outcome, void *arg)
+    int outcome, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
@@ -250 +252 @@
 
 static void callback_in(device_t *device,
-    usb_transaction_outcome_t outcome, size_t actual_size, void *arg)
+    int outcome, size_t actual_size, void *arg)
 {
         async_transaction_t *trans = (async_transaction_t *)arg;
 
-        if (outcome != USB_OUTCOME_OK) {
+        if (outcome != EOK) {
                 async_answer_0(trans->caller, outcome);
                 if (trans->data_caller) {
@@ -270 +272 @@
         }
 
-        async_answer_0(trans->caller, USB_OUTCOME_OK);
+        async_answer_0(trans->caller, EOK);
 
         async_transaction_destroy(trans);
@@ -322 +324 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, buffer, len,
+        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE,
+            buffer, len,
             callback_out, trans);
 
@@ -368 +371 @@
         trans->size = len;
 
-        int rc = transfer_func(device, target, trans->buffer, len,
+        int rc = transfer_func(device, target, HACK_MAX_PACKET_SIZE_INTERRUPT_IN,
+            trans->buffer, len,
             callback_in, trans);
 
@@ -540 +544 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
+        size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -546 +551 @@
         void *data_buffer = NULL;
         size_t setup_packet_len = 0;
-        size_t data_buffer_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,
@@ -554 +558 @@
                 return;
         }
-        rc = async_data_write_accept(&data_buffer, false,
-            1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                free(setup_packet);
-                return;
+
+        if (data_buffer_len > 0) {
+                rc = async_data_write_accept(&data_buffer, false,
+                    1, USB_MAX_PAYLOAD_SIZE, 0, &data_buffer_len);
+                if (rc != EOK) {
+                        async_answer_0(callid, rc);
+                        free(setup_packet);
+                        return;
+                }
         }
 
@@ -573 +580 @@
         trans->size = data_buffer_len;
 
-        rc = usb_iface->control_write(device, target,
+        rc = usb_iface->control_write(device, target, HACK_MAX_PACKET_SIZE,
             setup_packet, setup_packet_len,
             data_buffer, data_buffer_len,
@@ -596 +603 @@
         }
 
-        size_t data_len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -606 +612 @@
         void *setup_packet = NULL;
         size_t setup_packet_len = 0;
+        size_t data_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,
@@ -637 +644 @@
         }
 
-        rc = usb_iface->control_read(device, target,
+        rc = usb_iface->control_read(device, target, HACK_MAX_PACKET_SIZE,
             setup_packet, setup_packet_len,
             trans->buffer, trans->size,