Changeset 32fb6bce in mainline for uspace/drv/bus/usb/ohci/ohci_bus.c

Timestamp:

2017-12-18T22:50:21Z (6 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

7f70d1c

Parents:

1ea0bbf

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:04:50)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-18 22:50:21)

Message:

usbhost: refactoring

This commit moves interrupt, status and schedule to bus
operations. Then the purpose of hcd_t is better defined, and split into
hc_driver_t and hc_device_t. hc_driver_t is used to wrap driver
implementation by the library (similar to how usb_driver_t is used to
wrap usb device drivers). hc_device_t is used as a parent for hc_t
inside drivers, and is allocated inside the DDF device node.

To support these changes, some local identifiers were renamed, some
functions were moved and/or renamed and their arguments changed. The
most notable one being hcd_send_batch → bus_device_send_batch.

File:

• uspace/drv/bus/usb/ohci/ohci_bus.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/ohci_bus.c

@@ -158 +158 @@
         .parent = &usb2_bus_ops,
 
+        .interrupt = ohci_hc_interrupt,
+        .status = ohci_hc_status,
+
         .endpoint_destroy = ohci_endpoint_destroy,
         .endpoint_create = ohci_endpoint_create,
@@ -167 +170 @@
         .batch_create = ohci_create_batch,
         .batch_destroy = ohci_destroy_batch,
+        .batch_schedule = ohci_hc_schedule,
 };
 
 
-int ohci_bus_init(ohci_bus_t *bus, hcd_t *hcd, hc_t *hc)
+int ohci_bus_init(ohci_bus_t *bus, hc_t *hc)
 {
         assert(hc);
         assert(bus);
 
-
         usb2_bus_t *usb2_bus = (usb2_bus_t *) bus;
         bus_t *bus_base = (bus_t *) bus;
 
-        usb2_bus_init(usb2_bus, hcd, BANDWIDTH_AVAILABLE_USB11);
+        usb2_bus_init(usb2_bus, BANDWIDTH_AVAILABLE_USB11);
         bus_base->ops = &ohci_bus_ops;