Changeset e6b9182 in mainline for uspace/drv/bus/usb/ohci

Timestamp:

2017-10-13T08:49:29Z (8 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.

Location:

uspace/drv/bus/usb/ohci

Files:

• Makefile (modified) (1 diff)
• endpoint_list.h (modified) (1 diff)
• hc.c (modified) (2 diffs)
• hc.h (modified) (2 diffs)
• hw_struct/endpoint_descriptor.c (modified) (1 diff)
• main.c (modified) (6 diffs)
• ohci_batch.c (modified) (1 diff)
• ohci_bus.c (moved) (moved from uspace/drv/bus/usb/ohci/ohci_endpoint.c ) (6 diffs)
• ohci_bus.h (moved) (moved from uspace/drv/bus/usb/ohci/ohci_endpoint.h ) (5 diffs)
• ohci_rh.c (modified) (2 diffs)

uspace/drv/bus/usb/ohci/Makefile

@@ -49 +49 @@
         main.c \
         ohci_batch.c \
-        ohci_endpoint.c \
+        ohci_bus.c \
         ohci_rh.c \
         hw_struct/endpoint_descriptor.c \

uspace/drv/bus/usb/ohci/endpoint_list.h

@@ -41 +41 @@
 #include <usb/host/utils/malloc32.h>
 
-#include "ohci_endpoint.h"
+#include "ohci_bus.h"
 #include "hw_struct/endpoint_descriptor.h"
 

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

@@ -47 +47 @@
 #include <usb/usb.h>
 
-#include "ohci_endpoint.h"
+#include "ohci_bus.h"
 #include "ohci_batch.h"
 
@@ -287 +287 @@
 
         /* Check for root hub communication */
-        if (batch->ep->address == ohci_rh_get_address(&instance->rh)) {
+        if (batch->ep->target.address == ohci_rh_get_address(&instance->rh)) {
                 usb_log_debug("OHCI root hub request.\n");
                 return ohci_rh_schedule(&instance->rh, batch);

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

@@ -52 +52 @@
 #include "ohci_regs.h"
 #include "ohci_rh.h"
+#include "ohci_bus.h"
 #include "endpoint_list.h"
 #include "hw_struct/hcca.h"
@@ -80 +81 @@
         /** USB hub emulation structure */
         ohci_rh_t rh;
+
+        /** USB bookkeeping */
+        ohci_bus_t bus;
 } hc_t;
 

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)

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

@@ -45 +45 @@
 
 #include "hc.h"
+#include "ohci_bus.h"
 
 #define NAME "ohci"
@@ -53 +54 @@
 
 static const ddf_hc_driver_t ohci_hc_driver = {
-        .hc_speed = USB_SPEED_FULL,
         .irq_code_gen = ohci_hc_gen_irq_code,
         .init = ohci_driver_init,
@@ -62 +62 @@
         .ops = {
                 .schedule       = ohci_hc_schedule,
-                .ep_add_hook    = ohci_endpoint_init,
-                .ep_remove_hook = ohci_endpoint_fini,
                 .irq_hook       = ohci_hc_interrupt,
                 .status_hook    = ohci_hc_status,
@@ -72 +70 @@
 static int ohci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res)
 {
+        int err;
+
         assert(hcd);
         assert(hcd_get_driver_data(hcd) == NULL);
@@ -79 +79 @@
                 return ENOMEM;
 
-        const int ret = hc_init(instance, res);
-        if (ret == EOK) {
-                hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops);
-        } else {
-                free(instance);
-        }
-        return ret;
+        if ((err = hc_init(instance, res)) != EOK)
+                goto err;
+
+        if ((err = ohci_bus_init(&instance->bus, instance)))
+                goto err;
+
+        hcd_set_implementation(hcd, instance, &ohci_hc_driver.ops, &instance->bus.base.base);
+
+        return EOK;
+
+err:
+        free(instance);
+        return err;
 }
 
@@ -115 +121 @@
                 hc_fini(hc);
 
-        hcd_set_implementation(hcd, NULL, NULL);
+        hcd_set_implementation(hcd, NULL, NULL, NULL);
         free(hc);
 }

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

@@ -45 +45 @@
 
 #include "ohci_batch.h"
-#include "ohci_endpoint.h"
+#include "ohci_bus.h"
 
 static void (*const batch_setup[])(ohci_transfer_batch_t*, usb_direction_t);

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

@@ -37 +37 @@
 #include <stdlib.h>
 #include <usb/host/utils/malloc32.h>
+#include <usb/host/bandwidth.h>
 
-#include "ohci_endpoint.h"
+#include "ohci_bus.h"
 #include "hc.h"
 
@@ -46 +47 @@
  * @param[in] toggle new value of toggle bit
  */
-static void ohci_ep_toggle_set(void *ohci_ep, int toggle)
+static void ohci_ep_toggle_set(endpoint_t *ep, bool toggle)
 {
-        ohci_endpoint_t *instance = ohci_ep;
+        ohci_endpoint_t *instance = ohci_endpoint_get(ep);
         assert(instance);
         assert(instance->ed);
+        ep->toggle = toggle;
         ed_toggle_set(instance->ed, toggle);
 }
@@ -59 +61 @@
  * @return Current value of toggle bit.
  */
-static int ohci_ep_toggle_get(void *ohci_ep)
+static bool ohci_ep_toggle_get(endpoint_t *ep)
 {
-        ohci_endpoint_t *instance = ohci_ep;
+        ohci_endpoint_t *instance = ohci_endpoint_get(ep);
         assert(instance);
         assert(instance->ed);
@@ -68 +70 @@
 
 /** Creates new hcd endpoint representation.
- *
- * @param[in] ep USBD endpoint structure
- * @return Error code.
  */
-int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep)
+static endpoint_t *ohci_endpoint_create(bus_t *bus)
 {
-        assert(ep);
+        assert(bus);
+
         ohci_endpoint_t *ohci_ep = malloc(sizeof(ohci_endpoint_t));
         if (ohci_ep == NULL)
-                return ENOMEM;
+                return NULL;
 
         ohci_ep->ed = malloc32(sizeof(ed_t));
         if (ohci_ep->ed == NULL) {
                 free(ohci_ep);
-                return ENOMEM;
+                return NULL;
         }
 
@@ -89 +89 @@
                 free32(ohci_ep->ed);
                 free(ohci_ep);
-                return ENOMEM;
+                return NULL;
         }
 
         link_initialize(&ohci_ep->link);
-        ed_init(ohci_ep->ed, ep, ohci_ep->td);
-        endpoint_set_hc_data(
-            ep, ohci_ep, ohci_ep_toggle_get, ohci_ep_toggle_set);
-        hc_enqueue_endpoint(hcd_get_driver_data(hcd), ep);
         return EOK;
 }
@@ -105 +101 @@
  * @param[in] ep endpoint structure.
  */
-void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep)
+static void ohci_endpoint_destroy(endpoint_t *ep)
 {
-        assert(hcd);
         assert(ep);
         ohci_endpoint_t *instance = ohci_endpoint_get(ep);
-        hc_dequeue_endpoint(hcd_get_driver_data(hcd), ep);
-        endpoint_clear_hc_data(ep);
-        if (instance) {
-                free32(instance->ed);
-                free32(instance->td);
-                free(instance);
-        }
+
+        free32(instance->ed);
+        free32(instance->td);
+        free(instance);
+}
+
+
+static int ohci_register_ep(bus_t *bus_base, endpoint_t *ep)
+{
+        ohci_bus_t *bus = (ohci_bus_t *) bus_base;
+        ohci_endpoint_t *ohci_ep = ohci_endpoint_get(ep);
+
+        const int err = bus->parent_ops.register_endpoint(bus_base, ep);
+        if (err)
+                return err;
+
+        ed_init(ohci_ep->ed, ep, ohci_ep->td);
+        hc_enqueue_endpoint(bus->hc, ep);
+
+        return EOK;
+}
+
+static int ohci_release_ep(bus_t *bus_base, endpoint_t *ep)
+{
+        ohci_bus_t *bus = (ohci_bus_t *) bus_base;
+        assert(bus);
+        assert(ep);
+
+        const int err = bus->parent_ops.release_endpoint(bus_base, ep);
+        if (err)
+                return err;
+
+        hc_dequeue_endpoint(bus->hc, ep);
+        return EOK;
+
+}
+
+int ohci_bus_init(ohci_bus_t *bus, hc_t *hc)
+{
+        assert(hc);
+        assert(bus);
+
+        usb2_bus_init(&bus->base, BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11);
+
+        bus_ops_t *ops = &bus->base.base.ops;
+        bus->parent_ops = *ops;
+        ops->create_endpoint = ohci_endpoint_create;
+        ops->destroy_endpoint = ohci_endpoint_destroy;
+        ops->endpoint_set_toggle = ohci_ep_toggle_set;
+        ops->endpoint_get_toggle = ohci_ep_toggle_get;
+
+        ops->register_endpoint = ohci_register_ep;
+        ops->release_endpoint = ohci_release_ep;
+
+        return EOK;
 }
 

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2017 Ondrej Hlavaty <aearsis@eideo.cz>
  * All rights reserved.
  *
@@ -32 +33 @@
  * @brief OHCI driver
  */
-#ifndef DRV_OHCI_HCD_ENDPOINT_H
-#define DRV_OHCI_HCD_ENDPOINT_H
+#ifndef DRV_OHCI_HCD_BUS_H
+#define DRV_OHCI_HCD_BUS_H
 
 #include <assert.h>
 #include <adt/list.h>
-#include <usb/host/endpoint.h>
-#include <usb/host/hcd.h>
+#include <usb/host/usb2_bus.h>
 
 #include "hw_struct/endpoint_descriptor.h"
@@ -45 +45 @@
 /** Connector structure linking ED to to prepared TD. */
 typedef struct ohci_endpoint {
+        endpoint_t base;
+
         /** OHCI endpoint descriptor */
         ed_t *ed;
@@ -53 +55 @@
 } ohci_endpoint_t;
 
-int ohci_endpoint_init(hcd_t *hcd, endpoint_t *ep);
-void ohci_endpoint_fini(hcd_t *hcd, endpoint_t *ep);
+typedef struct hc hc_t;
+
+typedef struct {
+        usb2_bus_t base;
+        hc_t *hc;
+
+        /* Stored original ops from base, they are called in our handlers */
+        bus_ops_t parent_ops;
+} ohci_bus_t;
+
+int ohci_bus_init(ohci_bus_t *, hc_t *);
 
 /** Get and convert assigned ohci_endpoint_t structure
@@ -63 +74 @@
 {
         assert(ep);
-        return ep->hc_data.data;
+        return (ohci_endpoint_t *) ep;
 }
 

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

@@ -178 +178 @@
         assert(instance);
         assert(batch);
-        const usb_target_t target = {{
-                .address = batch->ep->address,
-                .endpoint = batch->ep->endpoint,
-        }};
+        const usb_target_t target = batch->ep->target;
         batch->error = virthub_base_request(&instance->base, target,
             usb_transfer_batch_direction(batch), (void*)batch->setup_buffer,
@@ -211 +208 @@
         instance->unfinished_interrupt_transfer = NULL;
         if (batch) {
-                const usb_target_t target = {{
-                        .address = batch->ep->address,
-                        .endpoint = batch->ep->endpoint,
-                }};
+                const usb_target_t target = batch->ep->target;
                 batch->error = virthub_base_request(&instance->base, target,
                     usb_transfer_batch_direction(batch),