Changeset 6832245 in mainline for uspace/drv/bus/usb/uhci

Timestamp:

2017-12-14T23:01:57Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

837d53d

Parents:

bd05140

git-author:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:54)

git-committer:

Ondřej Hlavatý <aearsis@…> (2017-12-14 23:01:57)

Message:

usbhost bus: refactor the bus ops

This way, method names better represent the entity it is working with.
Their semantics was shifted a bit.

Regarding the tree of structures:

bus ← device ← endpoint ← batch

Previously, devices were kept in DDF function nodes, and endpoints had
pointer to the bus and device. Now, devices have pointer to bus,
endpoints don't.

Pointer to hcd_t in bus is WIP, and will be removed.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (6 diffs)
• hc.h (modified) (1 diff)
• main.c (modified) (1 diff)

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);
+static int hc_init_mem_structures(hc_t *instance, hcd_t *);
 static int hc_init_transfer_lists(hc_t *instance);
 
@@ -215 +215 @@
  * interrupt fibrils.
  */
-int hc_init(hc_t *instance, const hw_res_list_parsed_t *hw_res)
+int hc_init(hc_t *instance, hcd_t *hcd, const hw_res_list_parsed_t *hw_res)
 {
         assert(instance);
@@ -238 +238 @@
             hw_res->io_ranges.ranges[0].size);
 
-        ret = hc_init_mem_structures(instance);
+        ret = hc_init_mem_structures(instance, hcd);
         if (ret != EOK) {
                 usb_log_error("Failed to init UHCI memory structures: %s.\n",
@@ -309 +309 @@
 }
 
-static usb_transfer_batch_t *create_transfer_batch(bus_t *bus, endpoint_t *ep)
+static usb_transfer_batch_t *create_transfer_batch(endpoint_t *ep)
 {
         uhci_transfer_batch_t *batch = uhci_transfer_batch_create(ep);
@@ -319 +319 @@
         uhci_transfer_batch_destroy(uhci_transfer_batch_get(batch));
 }
+
+static const bus_ops_t uhci_bus_ops = {
+        .parent = &usb2_bus_ops,
+
+        .endpoint_count_bw = bandwidth_count_usb11,
+        .batch_create = create_transfer_batch,
+        .batch_destroy = destroy_transfer_batch,
+};
 
 /** Initialize UHCI hc memory structures.
@@ -330 +338 @@
  *  - frame list page (needs to be one UHCI hw accessible 4K page)
  */
-int hc_init_mem_structures(hc_t *instance)
+int hc_init_mem_structures(hc_t *instance, hcd_t *hcd)
 {
         int err;
         assert(instance);
 
-        if ((err = usb2_bus_init(&instance->bus, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11)))
+        if ((err = usb2_bus_init(&instance->bus, hcd, BANDWIDTH_AVAILABLE_USB11)))
                 return err;
 
-        instance->bus.base.ops.create_batch = create_transfer_batch;
-        instance->bus.base.ops.destroy_batch = destroy_transfer_batch;
+        bus_t *bus = (bus_t *) &instance->bus;
+        bus->ops = &uhci_bus_ops;
 
         /* Init USB frame list page */

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

@@ -126 +126 @@
 } hc_t;
 
-extern int hc_init(hc_t *, const hw_res_list_parsed_t *);
+extern int hc_init(hc_t *, hcd_t *, const hw_res_list_parsed_t *);
 extern void hc_start(hc_t *);
 extern void hc_fini(hc_t *);

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

@@ -80 +80 @@
                 return ENOMEM;
 
-        if ((err = hc_init(instance, res)) != EOK)
+        if ((err = hc_init(instance, hcd, res)) != EOK)
                 goto err;