Changeset 32fb6bce in mainline for uspace/drv/bus/usb/uhci/hc.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/uhci/hc.c (modified) (12 diffs)

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

@@ -95 +95 @@
 
 static void hc_init_hw(const hc_t *instance);
-static int hc_init_mem_structures(hc_t *instance, hcd_t *);
+static int hc_init_mem_structures(hc_t *instance, hc_device_t *);
 static int hc_init_transfer_lists(hc_t *instance);
 
@@ -107 +107 @@
  * @return Error code.
  */
-int uhci_hc_gen_irq_code(irq_code_t *code, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
+int hc_gen_irq_code(irq_code_t *code, hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(code);
@@ -156 +156 @@
  * - resume from suspend state (not implemented)
  */
-void uhci_hc_interrupt(hcd_t *hcd, uint32_t status)
-{
-        assert(hcd);
-        hc_t *instance = hcd_get_driver_data(hcd);
-        assert(instance);
+static void hc_interrupt(bus_t *bus, uint32_t status)
+{
+        hc_t *instance = bus_to_hc(bus);
+
         /* Lower 2 bits are transaction error and transaction complete */
         if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
@@ -199 +198 @@
                 } else {
                         usb_log_fatal("Too many UHCI hardware failures!.\n");
-                        hc_fini(instance);
+                        hc_gone(&instance->base);
                 }
         }
@@ -215 +214 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
-{
-        assert(instance);
+int hc_add(hc_device_t *hcd, const hw_res_list_parsed_t *hw_res)
+{
+        hc_t *instance = hcd_to_hc(hcd);
         assert(hw_res);
         if (hw_res->io_ranges.count != 1 ||
@@ -249 +248 @@
 }
 
-void hc_start(hc_t *instance)
-{
+int hc_start(hc_device_t *hcd)
+{
+        hc_t *instance = hcd_to_hc(hcd);
         hc_init_hw(instance);
         (void)hc_debug_checker;
 
-        uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");
+        return uhci_rh_init(&instance->rh, instance->registers->ports, "uhci");
 }
 
@@ -261 +261 @@
  * @param[in] instance Host controller structure to use.
  */
-void hc_fini(hc_t *instance)
+int hc_gone(hc_device_t *instance)
 {
         assert(instance);
         //TODO Implement
+        return ENOTSUP;
 }
 
@@ -294 +295 @@
         pio_write_32(&registers->flbaseadd, pa);
 
-        if (instance->hw_interrupts) {
+        if (instance->base.irq_cap >= 0) {
                 /* Enable all interrupts, but resume interrupt */
                 pio_write_16(&instance->registers->usbintr,
@@ -320 +321 @@
 }
 
+static int hc_status(bus_t *, uint32_t *);
+static int hc_schedule(usb_transfer_batch_t *);
+
 static const bus_ops_t uhci_bus_ops = {
         .parent = &usb2_bus_ops,
 
+        .interrupt = hc_interrupt,
+        .status = hc_status,
+
         .endpoint_count_bw = bandwidth_count_usb11,
         .batch_create = create_transfer_batch,
+        .batch_schedule = hc_schedule,
         .batch_destroy = destroy_transfer_batch,
 };
@@ -338 +346 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int hc_init_mem_structures(hc_t *instance, hcd_t *hcd)
+int hc_init_mem_structures(hc_t *instance, hc_device_t *hcd)
 {
         int err;
         assert(instance);
 
-        if ((err = usb2_bus_init(&instance->bus, hcd, BANDWIDTH_AVAILABLE_USB11)))
+        if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11)))
                 return err;
 
         bus_t *bus = (bus_t *) &instance->bus;
         bus->ops = &uhci_bus_ops;
+
+        hc_device_setup(&instance->base, bus);
 
         /* Init USB frame list page */
@@ -438 +448 @@
 }
 
-int uhci_hc_status(hcd_t *hcd, uint32_t *status)
-{
-        assert(hcd);
+static int hc_status(bus_t *bus, uint32_t *status)
+{
+        hc_t *instance = bus_to_hc(bus);
         assert(status);
-        hc_t *instance = hcd_get_driver_data(hcd);
-        assert(instance);
 
         *status = 0;
@@ -462 +470 @@
  * Checks for bandwidth availability and appends the batch to the proper queue.
  */
-int uhci_hc_schedule(hcd_t *hcd, usb_transfer_batch_t *batch)
-{
-        assert(hcd);
-        hc_t *instance = hcd_get_driver_data(hcd);
-        assert(instance);
+static int hc_schedule(usb_transfer_batch_t *batch)
+{
+        hc_t *instance = bus_to_hc(endpoint_get_bus(batch->ep));
         assert(batch);