Changeset c95c00e in mainline for uspace/drv/bus/usb/uhci/hc.h

Timestamp:

2013-01-06T02:46:00Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3848fec

Parents:

ea30cc1

Message:

uhci: Add root hub emulation.

This device uses libusbvirt and si controlled by standard usbhub driver.

File:

• uspace/drv/bus/usb/uhci/hc.h (modified) (6 diffs)

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

@@ -37 +37 @@
 
 #include <fibril.h>
+#include <macros.h>
 #include <usb/host/hcd.h>
+#include "uhci_rh.h"
 
 #include "transfer_list.h"
@@ -44 +46 @@
 typedef struct uhci_regs {
         /** Command register, controls HC behaviour */
-        uint16_t usbcmd;
+        ioport16_t usbcmd;
 #define UHCI_CMD_MAX_PACKET (1 << 7)
 #define UHCI_CMD_CONFIGURE  (1 << 6)
@@ -55 +57 @@
 
         /** Status register, 1 means interrupt is asserted (if enabled) */
-        uint16_t usbsts;
+        ioport16_t usbsts;
 #define UHCI_STATUS_HALTED (1 << 5)
 #define UHCI_STATUS_PROCESS_ERROR (1 << 4)
@@ -66 +68 @@
 
         /** Interrupt enabled registers */
-        uint16_t usbintr;
+        ioport16_t usbintr;
 #define UHCI_INTR_SHORT_PACKET (1 << 3)
 #define UHCI_INTR_COMPLETE (1 << 2)
@@ -73 +75 @@
 
         /** Register stores frame number used in SOF packet */
-        uint16_t frnum;
+        ioport16_t frnum;
 
         /** Pointer(physical) to the Frame List */
-        uint32_t flbaseadd;
+        ioport32_t flbaseadd;
 
         /** SOF modification to match external timers */
-        uint8_t sofmod;
+        ioport8_t sofmod;
+
+        PADD8[3];
+        ioport16_t ports[];
 } uhci_regs_t;
 
@@ -90 +95 @@
 /** Main UHCI driver structure */
 typedef struct hc {
+        uhci_rh_t rh;
         /** Addresses of I/O registers */
         uhci_regs_t *registers;