Changeset b4b534ac in mainline for uspace/drv/bus/usb/uhci/uhci_rh.h

Timestamp:

2016-07-22T08:24:47Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f76d2c2

Parents:

5b18137 (diff), 8351f9a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jan.vesely/helenos/usb

File:

• uspace/drv/bus/usb/uhci/uhci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.h ) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -31 +31 @@
  */
 /** @file
- * @brief UHCI driver
+ * @brief UHCI host controller driver structure
  */
-#ifndef DRV_UHCI_RH_H
-#define DRV_UHCI_RH_H
+#ifndef DRV_UHCI_UHCI_RH_H
+#define DRV_UHCI_UHCI_RH_H
 
-#include <ddf/driver.h>
-#include <ops/hw_res.h>
-#include <ops/pio_window.h>
+#include <usbvirt/virthub_base.h>
+#include <usb/host/usb_transfer_batch.h>
+#include <usb/usb.h>
 
-/** DDF support structure for uhci_rhd driver, provides I/O resources */
-typedef struct rh {
-        /** List of resources available to the root hub. */
-        hw_resource_list_t resource_list;
-        /** The only resource in the RH resource list */
-        hw_resource_t io_regs;
-        /** PIO window in which the RH will operate. */
-        pio_window_t pio_window;        
-} rh_t;
+#include <stdbool.h>
+#include <sys/types.h>
 
-extern int rh_init(rh_t *, ddf_fun_t *, addr_range_t *, uintptr_t, size_t);
+/** Endpoint number for status change pipe. */
+#define HUB_STATUS_CHANGE_PIPE   1
+
+/** Virtual to UHCI hub connector */
+typedef struct {
+        /** Virtual hub software implementation */
+        virthub_base_t base;
+        /** UHCI root hub port io registers */
+        ioport16_t *ports[2];
+        /** Reset change indicator, it is not reported by regs */
+        bool reset_changed[2];
+} uhci_rh_t;
+
+int uhci_rh_init(uhci_rh_t *instance, ioport16_t *ports, const char *name);
+int uhci_rh_schedule(uhci_rh_t *instance, usb_transfer_batch_t *batch);
+
+/** Get UHCI rh address.
+ *
+ * @param instance UHCI rh instance.
+ * @return USB address assigned to the hub.
+ * Wrapper for virtual hub address
+ */
+static inline usb_address_t uhci_rh_get_address(uhci_rh_t *instance)
+{
+        return virthub_base_get_address(&instance->base);
+}
 
 #endif