Changeset e6b9182 in mainline for uspace/drv/bus/usb/ohci/ohci_bus.h

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/ohci_bus.h (moved) (moved from uspace/drv/bus/usb/ohci/ohci_endpoint.h ) (5 diffs)

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;
 }