Changes in uspace/drv/uhci-hcd/uhci.c [4abc304:b9d910f] in mainline

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (14 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -33 +33 @@
  */
 #include <errno.h>
-#include <str_error.h>
 #include <adt/list.h>
-#include <libarch/ddi.h>
 
 #include <usb/debug.h>
 #include <usb/usb.h>
-#include <usb/ddfiface.h>
-#include <usb_iface.h>
 
 #include "uhci.h"
-#include "iface.h"
-
 static irq_cmd_t uhci_cmds[] = {
         {
                 .cmd = CMD_PIO_READ_16,
-                .addr = NULL, /* patched for every instance */
+                .addr = (void*)0xc022,
                 .dstarg = 1
         },
         {
                 .cmd = CMD_PIO_WRITE_16,
-                .addr = NULL, /* pathed for every instance */
+                .addr = (void*)0xc022,
                 .value = 0x1f
         },
@@ -61 +55 @@
 };
 
-static int usb_iface_get_address(ddf_fun_t *fun, devman_handle_t handle,
-    usb_address_t *address)
-{
-        assert(fun);
-        uhci_t *hc = fun_to_uhci(fun);
-        assert(hc);
-
-        usb_address_t addr = device_keeper_find(&hc->device_manager,
-            handle);
-        if (addr < 0) {
-                return addr;
-        }
-
-        if (address != NULL) {
-                *address = addr;
-        }
-
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
-        .get_address = usb_iface_get_address
-};
-/*----------------------------------------------------------------------------*/
-static ddf_dev_ops_t uhci_ops = {
-        .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
-        .interfaces[USBHC_DEV_IFACE] = &uhci_iface,
-};
-
 static int uhci_init_transfer_lists(uhci_t *instance);
 static int uhci_init_mem_structures(uhci_t *instance);
@@ -101 +65 @@
         bool low_speed, usb_transfer_type_t, size_t size);
 
-
-int uhci_init(uhci_t *instance, ddf_dev_t *dev, void *regs, size_t reg_size)
-{
-        assert(reg_size >= sizeof(regs_t));
-        int ret;
-
-#define CHECK_RET_DEST_FUN_RETURN(ret, message...) \
+#define CHECK_RET_RETURN(ret, message...) \
         if (ret != EOK) { \
                 usb_log_error(message); \
-                if (instance->ddf_instance) \
-                        ddf_fun_destroy(instance->ddf_instance); \
                 return ret; \
         } else (void) 0
 
-        /*
-         * Create UHCI function.
-         */
-        instance->ddf_instance = ddf_fun_create(dev, fun_exposed, "uhci");
-        ret = (instance->ddf_instance == NULL) ? ENOMEM : EOK;
-        CHECK_RET_DEST_FUN_RETURN(ret, "Failed to create UHCI device function.\n");
-
-        instance->ddf_instance->ops = &uhci_ops;
-        instance->ddf_instance->driver_data = instance;
-
-        ret = ddf_fun_bind(instance->ddf_instance);
-        CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to bind UHCI device function: %s.\n",
-            ret, str_error(ret));
+int uhci_init(uhci_t *instance, void *regs, size_t reg_size)
+{
+        assert(reg_size >= sizeof(regs_t));
 
         /* allow access to hc control registers */
         regs_t *io;
-        ret = pio_enable(regs, reg_size, (void**)&io);
-        CHECK_RET_DEST_FUN_RETURN(ret, "Failed(%d) to gain access to registers at %p: %s.\n",
-            ret, str_error(ret), io);
+        int ret = pio_enable(regs, reg_size, (void**)&io);
+        CHECK_RET_RETURN(ret, "Failed to gain access to registers at %p.\n", io);
         instance->registers = io;
-        usb_log_debug("Device registers at %p(%u) accessible.\n", io, reg_size);
+        usb_log_debug("Device registers accessible.\n");
 
         ret = uhci_init_mem_structures(instance);
-        CHECK_RET_DEST_FUN_RETURN(ret, "Failed to initialize UHCI memory structures.\n");
+        CHECK_RET_RETURN(ret, "Failed to initialize memory structures.\n");
 
         uhci_init_hw(instance);
 
         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
-        fibril_add_ready(instance->cleaner);
+//      fibril_add_ready(instance->cleaner);
 
         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
         fibril_add_ready(instance->debug_checker);
 
-        usb_log_info("Started UHCI driver.\n");
-        return EOK;
-#undef CHECK_RET_DEST_FUN_RETURN
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
 void uhci_init_hw(uhci_t *instance)
 {
-        /* reset everything, who knows what touched it before us */
-        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
-        async_usleep(10000); /* 10ms according to USB spec */
-        pio_write_16(&instance->registers->usbcmd, 0);
-
-        /* reset hc, all states and counters */
-        pio_write_16(&instance->registers->usbcmd, UHCI_CMD_HCRESET);
-        while ((pio_read_16(&instance->registers->usbcmd) & UHCI_CMD_HCRESET) != 0)
-                { async_usleep(10); }
 
         /* set framelist pointer */
@@ -176 +110 @@
         pio_write_16(&instance->registers->usbcmd,
             UHCI_CMD_RUN_STOP | UHCI_CMD_MAX_PACKET | UHCI_CMD_CONFIGURE);
+        usb_log_debug("Started UHCI HC.\n");
 }
 /*----------------------------------------------------------------------------*/
@@ -181 +116 @@
 {
         assert(instance);
-#define CHECK_RET_DEST_CMDS_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                if (instance->interrupt_code.cmds != NULL) \
-                        free(instance->interrupt_code.cmds); \
-                return ret; \
-        } else (void) 0
 
         /* init interrupt code */
-        instance->interrupt_code.cmds = malloc(sizeof(uhci_cmds));
-        int ret = (instance->interrupt_code.cmds == NULL) ? ENOMEM : EOK;
-        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to allocate interrupt cmds space.\n");
-
-        {
-                irq_cmd_t *interrupt_commands = instance->interrupt_code.cmds;
-                memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
-                interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
-                interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
-                instance->interrupt_code.cmdcount =
-                                sizeof(uhci_cmds) / sizeof(irq_cmd_t);
-        }
+        irq_cmd_t *interrupt_commands = malloc(sizeof(uhci_cmds));
+        if (interrupt_commands == NULL) {
+                return ENOMEM;
+        }
+        memcpy(interrupt_commands, uhci_cmds, sizeof(uhci_cmds));
+        interrupt_commands[0].addr = (void*)&instance->registers->usbsts;
+        interrupt_commands[1].addr = (void*)&instance->registers->usbsts;
+        instance->interrupt_code.cmds = interrupt_commands;
+        instance->interrupt_code.cmdcount =
+            sizeof(uhci_cmds) / sizeof(irq_cmd_t);
 
         /* init transfer lists */
-        ret = uhci_init_transfer_lists(instance);
-        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to initialize transfer lists.\n");
+        int ret = uhci_init_transfer_lists(instance);
+        CHECK_RET_RETURN(ret, "Failed to initialize transfer lists.\n");
         usb_log_debug("Initialized transfer lists.\n");
 
@@ -211 +137 @@
         instance->frame_list = get_page();
         ret = instance ? EOK : ENOMEM;
-        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to get frame list page.\n");
+        CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
         usb_log_debug("Initialized frame list.\n");
 
@@ -218 +144 @@
           instance->transfers_interrupt.queue_head_pa
           | LINK_POINTER_QUEUE_HEAD_FLAG;
-
         unsigned i = 0;
         for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
@@ -225 +150 @@
 
         /* init address keeper(libusb) */
-        device_keeper_init(&instance->device_manager);
-        usb_log_debug("Initialized device manager.\n");
-
-        return EOK;
-#undef CHECK_RET_DEST_CMDS_RETURN
+        usb_address_keeping_init(&instance->address_manager, USB11_ADDRESS_MAX);
+        usb_log_debug("Initialized address manager.\n");
+
+        return EOK;
 }
 /*----------------------------------------------------------------------------*/
@@ -235 +159 @@
 {
         assert(instance);
-#define CHECK_RET_CLEAR_RETURN(ret, message...) \
-        if (ret != EOK) { \
-                usb_log_error(message); \
-                transfer_list_fini(&instance->transfers_bulk_full); \
-                transfer_list_fini(&instance->transfers_control_full); \
-                transfer_list_fini(&instance->transfers_control_slow); \
-                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.");
+        assert(ret == EOK);
         ret = transfer_list_init(&instance->transfers_control_full, "CONTROL_FULL");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL FULL list.");
+        assert(ret == EOK);
         ret = transfer_list_init(&instance->transfers_control_slow, "CONTROL_SLOW");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init CONTROL SLOW list.");
+        assert(ret == EOK);
         ret = transfer_list_init(&instance->transfers_interrupt, "INTERRUPT");
-        CHECK_RET_CLEAR_RETURN(ret, "Failed to init INTERRUPT list.");
+        assert(ret == EOK);
 
         transfer_list_set_next(&instance->transfers_control_full,
@@ -281 +196 @@
 
         return EOK;
-#undef CHECK_RET_CLEAR_RETURN
 }
 /*----------------------------------------------------------------------------*/
@@ -288 +202 @@
         assert(instance);
         assert(batch);
-        const int low_speed = (batch->speed == USB_SPEED_LOW);
+        const int low_speed = (batch->speed == LOW_SPEED);
         if (!allowed_usb_packet(
             low_speed, batch->transfer_type, batch->max_packet_size)) {
@@ -309 +223 @@
 {
         assert(instance);
-//      if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
-//              return;
-//      usb_log_debug2("UHCI interrupt: %X.\n", status);
-        transfer_list_remove_finished(&instance->transfers_interrupt);
-        transfer_list_remove_finished(&instance->transfers_control_slow);
-        transfer_list_remove_finished(&instance->transfers_control_full);
-        transfer_list_remove_finished(&instance->transfers_bulk_full);
+        if ((status & (UHCI_STATUS_INTERRUPT | UHCI_STATUS_ERROR_INTERRUPT)) == 0)
+                return;
+        usb_log_debug("UHCI interrupt: %X.\n", status);
+        transfer_list_check(&instance->transfers_interrupt);
+        transfer_list_check(&instance->transfers_control_slow);
+        transfer_list_check(&instance->transfers_control_full);
+        transfer_list_check(&instance->transfers_bulk_full);
 }
 /*----------------------------------------------------------------------------*/
@@ -324 +238 @@
         assert(instance);
 
-        while (1) {
+        while(1) {
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
-                if (status != 0)
-                        usb_log_debug2("UHCI status: %x.\n", status);
-                status |= 1;
                 uhci_interrupt(instance, status);
-                pio_write_16(&instance->registers->usbsts, 0x1f);
-                async_usleep(UHCI_CLEANER_TIMEOUT * 5);
+                async_usleep(UHCI_CLEANER_TIMEOUT);
         }
         return EOK;
@@ -344 +254 @@
                 const uint16_t sts = pio_read_16(&instance->registers->usbsts);
                 const uint16_t intr = pio_read_16(&instance->registers->usbintr);
-                if (((cmd & UHCI_CMD_RUN_STOP) != 1) || (sts != 0)) {
-                        usb_log_debug2("Command: %X Status: %X Intr: %x\n",
-                            cmd, sts, intr);
-                }
-
-                uintptr_t frame_list =
-                    pio_read_32(&instance->registers->flbaseadd) & ~0xfff;
+                usb_log_debug("Command: %X Status: %X Interrupts: %x\n",
+                    cmd, sts, intr);
+
+                uintptr_t frame_list = pio_read_32(&instance->registers->flbaseadd);
                 if (frame_list != addr_to_phys(instance->frame_list)) {
                         usb_log_debug("Framelist address: %p vs. %p.\n",