Changeset 12b8e03 in mainline

Timestamp:

2011-04-14T13:59:04Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0146d41, 8fb3981

Parents:

fa0f53b (diff), 8d517c3 (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 development/ changes

Location:

uspace/drv

Files:

• ohci/ohci_regs.h (modified) (1 diff)
• uhci-hcd/hc.c (modified) (5 diffs)
• uhci-hcd/hc.h (modified) (1 diff)
• uhci-hcd/main.c (modified) (1 diff)
• uhci-rhd/port.c (modified) (5 diffs)
• uhci-rhd/port.h (modified) (1 diff)
• uhci-rhd/root_hub.c (modified) (4 diffs)
• uhci-rhd/root_hub.h (modified) (1 diff)

uspace/drv/ohci/ohci_regs.h

@@ -55 +55 @@
 #define C_HCFS_MASK        (0x3) /* Host controller functional state */
 #define C_HCFS_RESET       (0x0)
-#define C_HCFS_OPERATIONAL (0x1)
-#define C_HCFS_RESUME      (0x2)
+#define C_HCFS_RESUME      (0x1)
+#define C_HCFS_OPERATIONAL (0x2)
 #define C_HCFS_SUSPEND     (0x3)
 #define C_HCFS_SHIFT       (6)

uspace/drv/uhci-hcd/hc.c

@@ -247 +247 @@
 {
         assert(instance);
-#define CHECK_RET_CLEAR_RETURN(ret, message...) \
+#define SETUP_TRANSFER_LIST(type, name) \
+do { \
+        int ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
-                usb_log_error(message); \
+                usb_log_error("Failed(%d) to setup %s transfer list: %s.\n", \
+                    ret, name, str_error(ret)); \
                 transfer_list_fini(&instance->transfers_bulk_full); \
                 transfer_list_fini(&instance->transfers_control_full); \
@@ -255 +258 @@
                 transfer_list_fini(&instance->transfers_interrupt); \
                 return ret; \
-        } else (void) 0
-
-        /* initialize TODO: check errors */
-        int ret;
-        ret = transfer_list_init(&instance->transfers_bulk_full, "BULK_FULL");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init BULK list.");
-
-        ret = transfer_list_init(
-            &instance->transfers_control_full, "CONTROL_FULL");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
-
-        ret = transfer_list_init(
-            &instance->transfers_control_slow, "CONTROL_SLOW");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
-
-        ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
-
+        } \
+} while (0)
+
+        SETUP_TRANSFER_LIST(bulk_full, "BULK FULL");
+        SETUP_TRANSFER_LIST(control_full, "CONTROL FULL");
+        SETUP_TRANSFER_LIST(control_slow, "CONTROL LOW");
+        SETUP_TRANSFER_LIST(interrupt, "INTERRUPT");
+#undef SETUP_TRANSFER_LIST
+        /* Connect lists into one schedule */
         transfer_list_set_next(&instance->transfers_control_full,
                 &instance->transfers_bulk_full);
@@ -337 +331 @@
         assert(instance);
 //      status |= 1; //Uncomment to work around qemu hang
-        /* TODO: Resume interrupts are not supported */
         /* Lower 2 bits are transaction error and transaction complete */
-        if (status & 0x3) {
+        if (status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) {
                 LIST_INITIALIZE(done);
                 transfer_list_remove_finished(
@@ -358 +351 @@
                 }
         }
-        /* bits 4 and 5 indicate hc error */
-        if (status & 0x18) {
+        /* Resume interrupts are not supported */
+
+        /* Bits 4 and 5 indicate hc error */
+        if (status & (UHCI_STATUS_PROCESS_ERROR | UHCI_STATUS_SYSTEM_ERROR)) {
                 usb_log_error("UHCI hardware failure!.\n");
                 ++instance->hw_failures;
@@ -389 +384 @@
 
         while (1) {
-                /* read and ack interrupts */
+                /* Readd and clear status register */
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                pio_write_16(&instance->registers->usbsts, 0x1f);
+                pio_write_16(&instance->registers->usbsts, status);
                 if (status != 0)
                         usb_log_debug2("UHCI status: %x.\n", status);
                 hc_interrupt(instance, status);
-                async_usleep(UHCI_CLEANER_TIMEOUT);
+                async_usleep(UHCI_INT_EMULATOR_TIMEOUT);
         }
         return EOK;

uspace/drv/uhci-hcd/hc.h

@@ -88 +88 @@
 
 #define UHCI_FRAME_LIST_COUNT 1024
-#define UHCI_CLEANER_TIMEOUT 10000
+#define UHCI_INT_EMULATOR_TIMEOUT 10000
 #define UHCI_DEBUGER_TIMEOUT 5000000
 #define UHCI_ALLOWED_HW_FAIL 5

uspace/drv/uhci-hcd/main.c

@@ -78 +78 @@
         device->driver_data = uhci;
 
-        usb_log_info("Controlling new UHCI device `%s'.\n", device->name);
+        usb_log_info("Controlling new UHCI device '%s'.\n", device->name);
 
         return EOK;

uspace/drv/uhci-rhd/port.c

@@ -68 +68 @@
  * @return Error code. (Always EOK)
  */
-static inline void uhci_port_write_status(
-    uhci_port_t *port, port_status_t value)
-{
-        assert(port);
-        pio_write_16(port->address, value);
+static inline void uhci_port_write_status(uhci_port_t *port, port_status_t val)
+{
+        assert(port);
+        pio_write_16(port->address, val);
 }
 /*----------------------------------------------------------------------------*/
@@ -101 +100 @@
         port->rh = rh;
 
-        int rc = usb_hc_connection_initialize_from_device(
-            &port->hc_connection, rh);
-        if (rc != EOK) {
+        int ret =
+            usb_hc_connection_initialize_from_device(&port->hc_connection, rh);
+        if (ret != EOK) {
                 usb_log_error("Failed to initialize connection to HC.");
-                return rc;
+                return ret;
         }
 
@@ -238 +237 @@
         /* Enable the port. */
         uhci_port_set_enabled(port, true);
-
         return EOK;
 }
@@ -271 +269 @@
         usb_log_info("New device at port %u, address %d (handle %llu).\n",
             port->number, dev_addr, port->attached_device);
-
         return EOK;
 }
@@ -313 +310 @@
         /* Write new value. */
         uhci_port_write_status(port, port_status);
+
+        /* Wait for port to become enabled */
+        do {
+                async_usleep(1000);
+                port_status = uhci_port_read_status(port);
+        } while ((port_status & STATUS_CONNECTED) &&
+            !(port_status & STATUS_ENABLED));
 
         usb_log_debug("%s: %sabled port.\n",

uspace/drv/uhci-rhd/port.h

@@ -54 +54 @@
 #define STATUS_SUSPEND   (1 << 12)
 
+/** UHCI port structure */
 typedef struct uhci_port
 {

uspace/drv/uhci-rhd/root_hub.c

@@ -33 +33 @@
  */
 #include <errno.h>
+#include <str_error.h>
 #include <ddi.h>
 #include <usb/debug.h>
@@ -43 +44 @@
  * @param[in] addr Address of I/O registers.
  * @param[in] size Size of available I/O space.
- * @param[in] rh Pointer to ddf instance of the root hub driver.
+ * @param[in] rh Pointer to DDF instance of the root hub driver.
  * @return Error code.
  */
@@ -58 +59 @@
         if (ret < 0) {
                 usb_log_error(
-                    "Failed(%d) to gain access to port registers at %p\n",
-                    ret, regs);
+                    "Failed(%d) to gain access to port registers at %p: %s.\n",
+                    ret, regs, str_error(ret));
                 return ret;
         }
@@ -66 +67 @@
         unsigned i = 0;
         for (; i < UHCI_ROOT_HUB_PORT_COUNT; ++i) {
-                /* NOTE: mind pointer arithmetics here */
                 ret = uhci_port_init(
-                    &instance->ports[i], regs + i, i, ROOT_HUB_WAIT_USEC, rh);
+                    &instance->ports[i], &regs[i], i, ROOT_HUB_WAIT_USEC, rh);
                 if (ret != EOK) {
                         unsigned j = 0;

uspace/drv/uhci-rhd/root_hub.h

@@ -42 +42 @@
 #define ROOT_HUB_WAIT_USEC 250000 /* 250 miliseconds */
 
+/** UHCI root hub drvier structure */
 typedef struct root_hub {
+        /** Ports provided by the hub */
         uhci_port_t ports[UHCI_ROOT_HUB_PORT_COUNT];
-        devman_handle_t hc_handle;
 } uhci_root_hub_t;
 
 int uhci_root_hub_init(
-  uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh);
+    uhci_root_hub_t *instance, void *addr, size_t size, ddf_dev_t *rh);
 
 void uhci_root_hub_fini(uhci_root_hub_t *instance);