Changeset e6b9182 in mainline for uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

Timestamp:

2017-10-13T08:49:29Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

741bcdeb

Parents:

0a5833d7

Message:

WIP usbhost refactoring: ohci completed

Along with that we noticed hcd_t in bus_t is superfluous and it complicates initialization (and breaks isolation), so we removed it. Also, type of the toggle has changed to bool in the functions.

File:

• uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c (modified) (1 diff)

uspace/drv/bus/usb/ohci/hw_struct/endpoint_descriptor.c

@@ -79 +79 @@
         /* Status: address, endpoint nr, direction mask and max packet size. */
         OHCI_MEM32_WR(instance->status,
-            ((ep->address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
-            | ((ep->endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
+            ((ep->target.address & ED_STATUS_FA_MASK) << ED_STATUS_FA_SHIFT)
+            | ((ep->target.endpoint & ED_STATUS_EN_MASK) << ED_STATUS_EN_SHIFT)
             | ((dir[ep->direction] & ED_STATUS_D_MASK) << ED_STATUS_D_SHIFT)
             | ((ep->max_packet_size & ED_STATUS_MPS_MASK)