Changeset 5fd9c30 in mainline for uspace/drv/bus/usb/vhc/transfer.c

Timestamp:

2017-10-21T20:52:56Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

766043c

Parents:

74b852b

Message:

usbhost refactoring: let transfer_batch be initialized by bus

Currently makes older HCs fail, work in progress.

File:

• uspace/drv/bus/usb/vhc/transfer.c (modified) (7 diffs)

uspace/drv/bus/usb/vhc/transfer.c

@@ -44 +44 @@
                 return false;
         }
-        if (usb_transfer_batch_direction(transfer->batch) != USB_DIRECTION_OUT) {
-                return false;
-        }
-        const usb_device_request_setup_packet_t *setup =
-            (void*)transfer->batch->setup_buffer;
+        if (transfer->batch->dir != USB_DIRECTION_OUT) {
+                return false;
+        }
+        const usb_device_request_setup_packet_t *setup
+                = &transfer->batch->setup.packet;
         if (setup->request_type != 0) {
                 return false;
@@ -63 +63 @@
 {
         int rc;
-        
-        const usb_direction_t dir = usb_transfer_batch_direction(batch);
+
+        const usb_direction_t dir = batch->dir;
 
         if (batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_control_read(dev,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -75 +75 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_control_write(dev,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size);
                 }
@@ -100 +100 @@
         int rc;
 
-        const usb_direction_t dir = usb_transfer_batch_direction(batch);
+        const usb_direction_t dir = batch->dir;
 
         if (batch->ep->transfer_type == USB_TRANSFER_CONTROL) {
                 if (dir == USB_DIRECTION_IN) {
                         rc = usbvirt_ipc_send_control_read(sess,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size,
                             actual_data_size);
@@ -111 +111 @@
                         assert(dir == USB_DIRECTION_OUT);
                         rc = usbvirt_ipc_send_control_write(sess,
-                            batch->setup_buffer, batch->setup_size,
+                            batch->setup.buffer, USB_SETUP_PACKET_SIZE,
                             batch->buffer, batch->buffer_size);
                 }
@@ -149 +149 @@
         assert(transfer);
         assert(transfer->batch);
-        usb_transfer_batch_finish_error(transfer->batch, NULL,
-            data_transfer_size, outcome);
-        usb_transfer_batch_destroy(transfer->batch);
+        transfer->batch->error = outcome;
+        transfer->batch->transfered_size = data_transfer_size;
+        usb_transfer_batch_finish(transfer->batch);
         free(transfer);
 }
@@ -236 +236 @@
                         if (is_set_address_transfer(transfer)) {
                                 usb_device_request_setup_packet_t *setup =
-                                    (void*) transfer->batch->setup_buffer;
+                                    (void*) transfer->batch->setup.buffer;
                                 dev->address = setup->value;
                                 usb_log_debug2("Address changed to %d\n",