Changes in uspace/lib/drv/generic/remote_usbhc.c [ec59693:5842493] in mainline

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