Changeset e05d6c3 in mainline for uspace/drv

Timestamp:

2011-04-15T07:45:26Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

3a85a2b

Parents:

a39cfb8 (diff), e583fd4 (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 with usb/development

Location:

uspace/drv

Files:

• ohci/batch.c (modified) (2 diffs)
• ohci/hcd_endpoint.c (modified) (2 diffs)
• ohci/hw_struct/endpoint_descriptor.h (modified) (2 diffs)
• ohci/ohci_regs.h (modified) (1 diff)
• ohci/root_hub.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)
• usbhid/main.c (modified) (1 diff)
• usbhub/usbhub.c (modified) (1 diff)
• usbkbd/main.c (modified) (1 diff)
• usbmouse/main.c (modified) (1 diff)

uspace/drv/ohci/batch.c

@@ -161 +161 @@
                         usb_log_debug("Batch(%p) found error TD(%d):%x.\n",
                             instance, i, data->tds[i]->status);
+                        /* Make sure TD queue is empty (one TD),
+                         * ED should be marked as halted */
+                        data->ed->td_tail =
+                            (data->ed->td_head & ED_TDTAIL_PTR_MASK);
+                        ++i;
                         break;
                 }
@@ -169 +174 @@
         assert(hcd_ep);
         hcd_ep->td = data->tds[i];
+        /* Clear possible ED HALT */
+        data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        uint32_t pa = addr_to_phys(hcd_ep->td);
+        assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK));
+        assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK));
 
         return true;

uspace/drv/ohci/hcd_endpoint.c

@@ -35 +35 @@
 #include "hcd_endpoint.h"
 
+static void hcd_ep_toggle_set(void *hcd_ep, int toggle)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        ed_toggle_set(instance->ed, toggle);
+}
+static int hcd_ep_toggle_get(void *hcd_ep)
+{
+        hcd_endpoint_t *instance = hcd_ep;
+        assert(instance);
+        assert(instance->ed);
+        return ed_toggle_get(instance->ed);
+}
+
+
 hcd_endpoint_t * hcd_endpoint_assign(endpoint_t *ep)
 {
@@ -57 +73 @@
         ed_init(hcd_ep->ed, ep);
         ed_set_td(hcd_ep->ed, hcd_ep->td);
-        endpoint_set_hc_data(ep, hcd_ep, NULL, NULL);
+        endpoint_set_hc_data(ep, hcd_ep, hcd_ep_toggle_get, hcd_ep_toggle_set);
 
         return hcd_ep;

uspace/drv/ohci/hw_struct/endpoint_descriptor.h

@@ -73 +73 @@
 #define ED_TDHEAD_ZERO_SHIFT (2)
 #define ED_TDHEAD_TOGGLE_CARRY (0x2)
+#define ED_TDHEAD_HALTED_FLAG (0x1)
 
         volatile uint32_t next;
@@ -106 +107 @@
         instance->next = pa;
 }
+
+static inline int ed_toggle_get(ed_t *instance)
+{
+        assert(instance);
+        return (instance->td_head & ED_TDHEAD_TOGGLE_CARRY) ? 1 : 0;
+}
+
+static inline void ed_toggle_set(ed_t *instance, int toggle)
+{
+        assert(instance);
+        assert(toggle == 0 || toggle == 1);
+        if (toggle == 1) {
+                instance->td_head |= ED_TDHEAD_TOGGLE_CARRY;
+        } else {
+                /* clear halted flag when reseting toggle */
+                instance->td_head &= ~ED_TDHEAD_TOGGLE_CARRY;
+                instance->td_head &= ~ED_TDHEAD_HALTED_FLAG;
+        }
+}
 #endif
 /**

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/ohci/root_hub.h

@@ -54 +54 @@
         /** hubs descriptors */
         usb_device_descriptors_t descriptors;
+        /** interrupt transfer waiting for an actual interrupt to occur */
+        usb_transfer_batch_t * unfinished_interrupt_transfer;
 } rh_t;
 

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);

uspace/drv/usbhid/main.c

@@ -42 +42 @@
 
 #include <usb/devdrv.h>
+#include <usb/devpoll.h>
 
 #include "usbhid.h"

uspace/drv/usbhub/usbhub.c

@@ -45 +45 @@
 #include <usb/request.h>
 #include <usb/classes/hub.h>
+#include <usb/devpoll.h>
 #include <stdio.h>
 

uspace/drv/usbkbd/main.c

@@ -42 +42 @@
 
 #include <usb/devdrv.h>
+#include <usb/devpoll.h>
 
 #include "kbddev.h"

uspace/drv/usbmouse/main.c

@@ -36 +36 @@
 #include "mouse.h"
 #include <usb/debug.h>
+#include <usb/devpoll.h>
 #include <errno.h>
 #include <str_error.h>