Changeset b4b534ac in mainline for uspace/drv/bus/usb/ehci/ehci_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/ehci/ehci_rh.h (moved) (moved from uspace/drv/bus/usb/uhci/root_hub.c ) (2 diffs)

uspace/drv/bus/usb/ehci/ehci_rh.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Jan Vesely
+ * Copyright (c) 2013 Jan Vesely
  * All rights reserved.
  *
@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhci
+/** @addtogroup drvusbehci
  * @{
  */
 /** @file
- * @brief UHCI driver
+ * @brief EHCI driver
  */
+#ifndef DRV_EHCI_EHCI_RH_H
+#define DRV_EHCI_EHCI_RH_H
+
 #include <assert.h>
-#include <errno.h>
-#include <str_error.h>
-#include <stdio.h>
-#include <device/hw_res_parsed.h>
+#include <sys/types.h>
 
-#include <usb/debug.h>
+#include <usb/usb.h>
+#include <usb/classes/hub.h>
+#include <usb/host/usb_transfer_batch.h>
+#include <usbvirt/virthub_base.h>
 
-#include "root_hub.h"
+#include "ehci_regs.h"
 
-/** Root hub initialization
- * @param[in] instance RH structure to initialize
- * @param[in] fun DDF function representing UHCI root hub
- * @param[in] reg_addr Address of root hub status and control registers.
- * @param[in] reg_size Size of accessible address space.
- * @return Error code.
+enum {
+        EHCI_MAX_PORTS = 15,
+};
+
+typedef struct {
+        /** Virtual hub instance */
+        virthub_base_t base;
+        /** EHCI device registers */
+        ehci_regs_t *registers;
+        /** Number of downstream ports, EHCI limits this to 15 */
+        unsigned port_count;
+        /** USB hub descriptor describing the EHCI root hub */
+        struct {
+                usb_hub_descriptor_header_t header;
+                uint8_t rempow[STATUS_BYTES(EHCI_MAX_PORTS) * 2];
+        } __attribute__((packed)) hub_descriptor;
+        /** interrupt transfer waiting for an actual interrupt to occur */
+        usb_transfer_batch_t *unfinished_interrupt_transfer;
+        bool reset_flag[EHCI_MAX_PORTS];
+        bool resume_flag[EHCI_MAX_PORTS];
+} ehci_rh_t;
+
+int ehci_rh_init(ehci_rh_t *instance, ehci_caps_regs_t *caps, ehci_regs_t *regs,
+    const char *name);
+int ehci_rh_schedule(ehci_rh_t *instance, usb_transfer_batch_t *batch);
+int ehci_rh_interrupt(ehci_rh_t *instance);
+
+/** Get EHCI rh address.
+ *
+ * @param instance UHCI rh instance.
+ * @return USB address assigned to the hub.
+ * Wrapper for virtual hub address
  */
-int
-rh_init(rh_t *instance, ddf_fun_t *fun, addr_range_t *regs, uintptr_t reg_addr,
-    size_t reg_size)
+static inline usb_address_t ehci_rh_get_address(ehci_rh_t *instance)
 {
         assert(instance);
-        assert(fun);
-
-        /* Crop the PIO window to the absolute address range of UHCI I/O. */
-        instance->pio_window.mem.base = 0;
-        instance->pio_window.mem.size = 0;
-        instance->pio_window.io.base = RNGABS(*regs);
-        instance->pio_window.io.size = RNGSZ(*regs);
-
-        /* Initialize resource structure */
-        instance->resource_list.count = 1;
-        instance->resource_list.resources = &instance->io_regs;
-
-        instance->io_regs.type = IO_RANGE;
-        instance->io_regs.res.io_range.address = reg_addr;
-        instance->io_regs.res.io_range.size = reg_size;
-        instance->io_regs.res.io_range.relative = true;
-        instance->io_regs.res.io_range.endianness = LITTLE_ENDIAN;
-
-        const int ret = ddf_fun_add_match_id(fun, "usb&uhci&root-hub", 100);
-        if (ret != EOK) {
-                usb_log_error("Failed to add root hub match id: %s\n",
-                    str_error(ret));
-        }
-        return ret;
+        return virthub_base_get_address(&instance->base);
 }
+#endif
 /**
  * @}