Changeset 50ba203 in mainline for uspace/lib/drv/generic/remote_usbhc.c

Timestamp:

2011-02-20T15:46:48Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

6bb83c7

Parents:

d81ef61c (diff), 0c00dac (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:

merge with usb/development

File:

• uspace/lib/drv/generic/remote_usbhc.c (modified) (22 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 *);
-static void remote_usbhc_get_buffer(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_out(device_t *, void *, ipc_callid_t, ipc_call_t *);
 static void remote_usbhc_interrupt_in(device_t *, void *, ipc_callid_t, ipc_call_t *);
@@ -64 +65 @@
         remote_usbhc_get_address,
 
-        remote_usbhc_get_buffer,
-
         remote_usbhc_reserve_default_address,
         remote_usbhc_release_default_address,
@@ -98 +97 @@
 typedef struct {
         ipc_callid_t caller;
+        ipc_callid_t data_caller;
         void *buffer;
         void *setup_packet;
@@ -127 +127 @@
 
         trans->caller = caller;
+        trans->data_caller = 0;
         trans->buffer = NULL;
         trans->setup_packet = NULL;
@@ -155 +156 @@
 }
 
-void remote_usbhc_get_buffer(device_t *device, void *iface,
-    ipc_callid_t callid, ipc_call_t *call)
-{
-        sysarg_t buffer_hash = DEV_IPC_GET_ARG1(*call);
-        async_transaction_t * trans = (async_transaction_t *)buffer_hash;
-        if (trans == NULL) {
-                async_answer_0(callid, ENOENT);
-                return;
-        }
-        if (trans->buffer == NULL) {
-                async_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
-                return;
-        }
-
-        ipc_callid_t cid;
-        size_t accepted_size;
-        if (!async_data_read_receive(&cid, &accepted_size)) {
-                async_answer_0(callid, EINVAL);
-                async_transaction_destroy(trans);
-                return;
-        }
-
-        if (accepted_size > trans->size) {
-                accepted_size = trans->size;
-        }
-        async_data_read_finalize(cid, trans->buffer, accepted_size);
-
-        async_answer_1(callid, EOK, accepted_size);
-
-        async_transaction_destroy(trans);
-}
-
 void remote_usbhc_reserve_default_address(device_t *device, void *iface,
     ipc_callid_t callid, ipc_call_t *call)
@@ -197 +165 @@
                 return;
         }
-
-        int rc = usb_iface->reserve_default_address(device);
+        
+        bool full_speed = DEV_IPC_GET_ARG1(*call);
+        
+        int rc = usb_iface->reserve_default_address(device, full_speed);
 
         async_answer_0(callid, rc);
@@ -227 +197 @@
                 return;
         }
+        
+        bool full_speed = DEV_IPC_GET_ARG1(*call);
 
         usb_address_t address;
-        int rc = usb_iface->request_address(device, &address);
+        int rc = usb_iface->request_address(device, full_speed, &address);
         if (rc != EOK) {
                 async_answer_0(callid, rc);
@@ -274 +246 @@
 
 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;
@@ -284 +256 @@
 
 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) {
+                        async_answer_0(trans->data_caller, EINTR);
+                }
                 async_transaction_destroy(trans);
                 return;
@@ -295 +270 @@
 
         trans->size = actual_size;
-        async_answer_1(trans->caller, USB_OUTCOME_OK, (sysarg_t)trans);
+
+        if (trans->data_caller) {
+                async_data_read_finalize(trans->data_caller,
+                    trans->buffer, actual_size);
+        }
+
+        async_answer_0(trans->caller, EOK);
+
+        async_transaction_destroy(trans);
 }
 
@@ -345 +328 @@
         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);
 
@@ -376 +360 @@
         };
 
+        ipc_callid_t data_callid;
+        if (!async_data_read_receive(&data_callid, &len)) {
+                async_answer_0(callid, EPARTY);
+                return;
+        }
+
         async_transaction_t *trans = async_transaction_create(callid);
         if (trans == NULL) {
@@ -381 +371 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->buffer = malloc(len);
         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);
 
@@ -556 +548 @@
                 .endpoint = DEV_IPC_GET_ARG2(*call)
         };
+        size_t data_buffer_len = DEV_IPC_GET_ARG3(*call);
 
         int rc;
@@ -562 +555 @@
         void *data_buffer = NULL;
         size_t setup_packet_len = 0;
-        size_t data_buffer_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,
@@ -570 +562 @@
                 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;
+                }
         }
 
@@ -589 +584 @@
         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,
@@ -612 +607 @@
         }
 
-        size_t data_len = DEV_IPC_GET_ARG3(*call);
         usb_target_t target = {
                 .address = DEV_IPC_GET_ARG1(*call),
@@ -622 +616 @@
         void *setup_packet = NULL;
         size_t setup_packet_len = 0;
+        size_t data_len = 0;
 
         rc = async_data_write_accept(&setup_packet, false,
@@ -627 +622 @@
         if (rc != EOK) {
                 async_answer_0(callid, rc);
+                return;
+        }
+
+        ipc_callid_t data_callid;
+        if (!async_data_read_receive(&data_callid, &data_len)) {
+                async_answer_0(callid, EPARTY);
+                free(setup_packet);
                 return;
         }
@@ -636 +638 @@
                 return;
         }
+        trans->data_caller = data_callid;
         trans->setup_packet = setup_packet;
         trans->size = data_len;
@@ -645 +648 @@
         }
 
-        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,