Changeset 56257ba in mainline for uspace/drv/bus/usb/uhci/uhci_batch.c

Timestamp:

2018-01-07T01:01:42Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

63431db2

Parents:

9efad54

git-author:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:41)

git-committer:

Ondřej Hlavatý <aearsis@…> (2018-01-07 01:01:42)

Message:

usbhost: manage endpoints by library + get/set_toggle → reset_toggle

That simplifies things A LOT. Now you can find endpoints for device in
an array inside device. This array is managed automatically in
register/unregister endpoint. HC drivers still needs to write to it when
setting up/tearing down the device.

Sorry for these two changes being in one commit, but splitting them
would be simply more work for no benefit.

File:

• uspace/drv/bus/usb/uhci/uhci_batch.c (modified) (4 diffs)

uspace/drv/bus/usb/uhci/uhci_batch.c

@@ -178 +178 @@
                         td_print_status(&uhci_batch->tds[i]);
 
-                        endpoint_toggle_set(batch->ep,
-                            td_toggle(&uhci_batch->tds[i]));
+                        batch->ep->toggle = td_toggle(&uhci_batch->tds[i]);
                         if (i > 0)
                                 goto substract_ret;
@@ -195 +194 @@
 
         fibril_mutex_lock(&batch->ep->guard);
-        usb_transfer_batch_reset_toggle(batch);
         endpoint_deactivate_locked(batch->ep);
         fibril_mutex_unlock(&batch->ep->guard);
@@ -236 +234 @@
         const size_t mps = uhci_batch->base.ep->max_packet_size;
 
-        int toggle = endpoint_toggle_get(uhci_batch->base.ep);
+        int toggle = uhci_batch->base.ep->toggle;
         assert(toggle == 0 || toggle == 1);
 
@@ -260 +258 @@
         }
         td_set_ioc(&uhci_batch->tds[td - 1]);
-        endpoint_toggle_set(uhci_batch->base.ep, toggle);
+        uhci_batch->base.ep->toggle = toggle;
         usb_log_debug2(
             "Batch %p %s %s " USB_TRANSFER_BATCH_FMT " initialized.\n", \