Changeset 26858040 in mainline

Timestamp:

2011-07-12T18:53:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

408d3c9

Parents:

dfe4955

Message:

UHCI: Remove old way of generating irq code. Reshuffle initialization.

Location:

uspace/drv/bus/usb/uhci

Files:

• hc.c (modified) (6 diffs)
• hc.h (modified) (1 diff)

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

@@ -126 +126 @@
         uhci_regs_t *io;
         ret = pio_enable(regs, reg_size, (void **)&io);
-        CHECK_RET_RETURN(ret,
-            "Failed(%d) to gain access to registers at %p: %s.\n",
-            ret, io, str_error(ret));
+        CHECK_RET_RETURN(ret, "Failed to gain access to registers at %p: %s.\n",
+            io, str_error(ret));
         instance->registers = io;
-        usb_log_debug("Device registers at %p (%zuB) accessible.\n",
-            io, reg_size);
+        usb_log_debug(
+            "Device registers at %p (%zuB) accessible.\n", io, reg_size);
 
         ret = hc_init_mem_structures(instance);
         CHECK_RET_RETURN(ret,
-            "Failed(%d) to initialize UHCI memory structures: %s.\n",
-            ret, str_error(ret));
+            "Failed to initialize UHCI memory structures: %s.\n",
+            str_error(ret));
 
         hc_init_hw(instance);
@@ -162 +161 @@
         /* Reset everything, who knows what touched it before us */
         pio_write_16(&registers->usbcmd, UHCI_CMD_GLOBAL_RESET);
-        async_usleep(10000); /* 10ms according to USB spec */
+        async_usleep(50000); /* 50ms according to USB spec(root hub reset) */
         pio_write_16(&registers->usbcmd, 0);
 
-        /* Reset hc, all states and counters */
+        /* Reset hc, all states and counters. Hope that hw is not broken */
         pio_write_16(&registers->usbcmd, UHCI_CMD_HCRESET);
         do { async_usleep(10); }
@@ -183 +182 @@
         }
 
-        const uint16_t status = pio_read_16(&registers->usbcmd);
-        if (status != 0)
-                usb_log_warning("Previous command value: %x.\n", status);
+        const uint16_t cmd = pio_read_16(&registers->usbcmd);
+        if (cmd != 0)
+                usb_log_warning("Previous command value: %x.\n", cmd);
 
         /* Start the hc with large(64B) packet FSBR */
@@ -212 +211 @@
         } else (void) 0
 
-        /* Init interrupt code */
-        instance->interrupt_code.cmds = instance->interrupt_commands;
-        {
-                /* Read status register */
-                instance->interrupt_commands[0].cmd = CMD_PIO_READ_16;
-                instance->interrupt_commands[0].dstarg = 1;
-                instance->interrupt_commands[0].addr =
-                    &instance->registers->usbsts;
-
-                /* Test whether we are the interrupt cause */
-                instance->interrupt_commands[1].cmd = CMD_BTEST;
-                instance->interrupt_commands[1].value =
-                    UHCI_STATUS_USED_INTERRUPTS | UHCI_STATUS_NM_INTERRUPTS;
-                instance->interrupt_commands[1].srcarg = 1;
-                instance->interrupt_commands[1].dstarg = 2;
-
-                /* Predicate cleaning and accepting */
-                instance->interrupt_commands[2].cmd = CMD_PREDICATE;
-                instance->interrupt_commands[2].value = 2;
-                instance->interrupt_commands[2].srcarg = 2;
-
-                /* Write clean status register */
-                instance->interrupt_commands[3].cmd = CMD_PIO_WRITE_A_16;
-                instance->interrupt_commands[3].srcarg = 1;
-                instance->interrupt_commands[3].addr =
-                    &instance->registers->usbsts;
-
-                /* Accept interrupt */
-                instance->interrupt_commands[4].cmd = CMD_ACCEPT;
-
-                instance->interrupt_code.cmdcount = UHCI_NEEDED_IRQ_COMMANDS;
-        }
-
         /* Init transfer lists */
         int ret = hc_init_transfer_lists(instance);
-        CHECK_RET_RETURN(ret, "Failed to init transfer lists.\n");
+        CHECK_RET_RETURN(ret, "Failed to initialize transfer lists.\n");
         usb_log_debug("Initialized transfer lists.\n");
-
-        /* Init USB frame list page*/
-        instance->frame_list = get_page();
-        ret = instance->frame_list ? EOK : ENOMEM;
-        CHECK_RET_RETURN(ret, "Failed to get frame list page.\n");
-        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
-
-        /* Set all frames to point to the first queue head */
-        const uint32_t queue = LINK_POINTER_QH(
-                addr_to_phys(instance->transfers_interrupt.queue_head));
-
-        unsigned i = 0;
-        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
-                instance->frame_list[i] = queue;
-        }
 
         /* Init device keeper */
         usb_device_keeper_init(&instance->manager);
-        usb_log_debug("Initialized device manager.\n");
+        usb_log_debug("Initialized device keeper.\n");
 
         ret = usb_endpoint_manager_init(&instance->ep_manager,
@@ -274 +225 @@
             str_error(ret));
 
+        /* Init USB frame list page*/
+        instance->frame_list = get_page();
+        if (!instance->frame_list) {
+                usb_log_error("Failed to get frame list page.\n");
+                usb_endpoint_manager_destroy(&instance->ep_manager);
+                return ENOMEM;
+        }
+        usb_log_debug("Initialized frame list at %p.\n", instance->frame_list);
+
+        /* Set all frames to point to the first queue head */
+        const uint32_t queue = LINK_POINTER_QH(
+                addr_to_phys(instance->transfers_interrupt.queue_head));
+        unsigned i = 0;
+        for(; i < UHCI_FRAME_LIST_COUNT; ++i) {
+                instance->frame_list[i] = queue;
+        }
+
         return EOK;
 #undef CHECK_RET_RETURN
@@ -294 +262 @@
         int ret = transfer_list_init(&instance->transfers_##type, name); \
         if (ret != EOK) { \
-                usb_log_error("Failed(%d) to setup %s transfer list: %s.\n", \
-                    ret, name, str_error(ret)); \
+                usb_log_error("Failed to setup %s transfer list: %s.\n", \
+                    name, str_error(ret)); \
                 transfer_list_fini(&instance->transfers_bulk_full); \
                 transfer_list_fini(&instance->transfers_control_full); \

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

@@ -116 +116 @@
         /** Pointer table to the above lists, helps during scheduling */
         transfer_list_t *transfers[2][4];
-
-        /** Code to be executed in kernel interrupt handler */
-        irq_code_t interrupt_code;
-
-        /** Commands that form interrupt code */
-        irq_cmd_t interrupt_commands[UHCI_NEEDED_IRQ_COMMANDS];
-
         /** Fibril periodically checking status register*/
         fid_t interrupt_emulator;
-
         /** Indicator of hw interrupts availability */
         bool hw_interrupts;