Changeset c95c00e in mainline

Timestamp:

2013-01-06T02:46:00Z (12 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.

Location:

uspace/drv/bus/usb/uhci

Files:

• Makefile (modified) (3 diffs)
• hc.c (modified) (3 diffs)
• hc.h (modified) (6 diffs)
• uhci.c (modified) (1 diff)
• uhci_rh.c (added)
• uhci_rh.h (added)

uspace/drv/bus/usb/uhci/Makefile

@@ -31 +31 @@
 LIBS = \
         $(LIBUSBHOST_PREFIX)/libusbhost.a \
+        $(LIBUSBVIRT_PREFIX)/libusbvirt.a \
         $(LIBUSB_PREFIX)/libusb.a \
         $(LIBDRV_PREFIX)/libdrv.a
@@ -36 +37 @@
 EXTRA_CFLAGS += \
         -I$(LIBUSB_PREFIX)/include \
+        -I$(LIBUSBDEV_PREFIX)/include \
         -I$(LIBUSBHOST_PREFIX)/include \
+        -I$(LIBUSBVIRT_PREFIX)/include \
         -I$(LIBDRV_PREFIX)/include
 
@@ -49 +52 @@
         uhci.c \
         uhci_batch.c \
+        uhci_rh.c \
         hw_struct/transfer_descriptor.c
 

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

@@ -130 +130 @@
         memcpy(cmds, uhci_irq_commands, sizeof(uhci_irq_commands));
         uhci_regs_t *registers = (uhci_regs_t *) regs;
-        cmds[0].addr = &registers->usbsts;
-        cmds[3].addr = &registers->usbsts;
+        cmds[0].addr = (void*)&registers->usbsts;
+        cmds[3].addr = (void*)&registers->usbsts;
 
         return EOK;
@@ -242 +242 @@
         }
         (void)hc_debug_checker;
+
+        uhci_rh_init(&instance->rh, &instance->registers->ports[0]);
 
         return EOK;
@@ -406 +408 @@
         assert(instance);
         assert(batch);
+
+//      if (batch->ep->address == uhci_rh_get_address(&instance->rh))
+//              return uhci_rh_schedule(&instance->rh, batch);
+
         uhci_transfer_batch_t *uhci_batch = uhci_transfer_batch_get(batch);
         if (!uhci_batch) {

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;

uspace/drv/bus/usb/uhci/uhci.c

@@ -161 +161 @@
         ret = rh_init(device, (uintptr_t)hc->registers + 0x10, 4,
             ddf_fun_get_handle(hc_fun));
+//      ret = hcd_ddf_setup_root_hub(device, USB_SPEED_FULL);
         CHECK_RET_FINI_RETURN(ret,
             "Failed to setup UHCI root hub: %s.\n", str_error(ret));