Changeset b9d910f in mainline

Timestamp:

2011-02-19T23:02:49Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fb78ae72

Parents:

6edc69a

Message:

Use properly initialized interrupt code

Location:

uspace/drv/uhci-hcd

Files:

• main.c (modified) (5 diffs)
• uhci.c (modified) (2 diffs)
• uhci.h (modified) (3 diffs)

uspace/drv/uhci-hcd/main.c

@@ -80 +80 @@
 };
 /*----------------------------------------------------------------------------*/
-static irq_cmd_t uhci_cmds[] = {
-        {
-                .cmd = CMD_PIO_READ_16,
-                .addr = (void*)0xc022,
-                .dstarg = 1
-        },
-        {
-                .cmd = CMD_PIO_WRITE_16,
-                .addr = (void*)0xc022,
-                .value = 0x1f
-        },
-        {
-                .cmd = CMD_ACCEPT
-        }
-};
-/*----------------------------------------------------------------------------*/
-static irq_code_t uhci_code = {
-        sizeof(uhci_cmds) / sizeof(irq_cmd_t),
-        uhci_cmds
-};
-/*----------------------------------------------------------------------------*/
 static void irq_handler(device_t *device, ipc_callid_t iid, ipc_call_t *call)
 {
@@ -111 +90 @@
 }
 /*----------------------------------------------------------------------------*/
+#define CHECK_RET_RETURN(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        return ret; \
+}
+
 static int uhci_add_device(device_t *device)
 {
@@ -125 +110 @@
             pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
 
-        if (ret != EOK) {
-                usb_log_error(
-                    "Failed(%d) to get I/O registers addresses for device:.\n",
-                    ret, device->handle);
-                return ret;
-        }
-
+        CHECK_RET_RETURN(ret,
+            "Failed(%d) to get I/O registers addresses for device:.\n",
+            ret, device->handle);
         usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
@@ -158 +139 @@
         async_hangup(irc_phone);
 
-        ret = register_interrupt_handler(device, irq, irq_handler, &uhci_code);
-        usb_log_debug("Registered interrupt handler %d.\n", ret);
 
         uhci_t *uhci_hc = malloc(sizeof(uhci_t));
-        if (!uhci_hc) {
-                usb_log_error("Failed to allocate memory for uhci hcd driver.\n");
-                return ENOMEM;
-        }
+        ret = (uhci_hc != NULL) ? EOK : ENOMEM;
+        CHECK_RET_RETURN(ret, "Failed to allocate memory for uhci hcd driver.\n");
 
         ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
         if (ret != EOK) {
                 usb_log_error("Failed to init uhci-hcd.\n");
+                free(uhci_hc);
                 return ret;
         }
+
+        ret = register_interrupt_handler(device, irq, irq_handler,
+            &uhci_hc->interrupt_code);
+        if (ret != EOK) {
+                usb_log_error("Failed to register interrupt handler.\n");
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
+                return ret;
+        }
+
         device_t *rh;
         ret = setup_root_hub(&rh, device);
         if (ret != EOK) {
                 usb_log_error("Failed to setup uhci root hub.\n");
-                /* TODO: destroy uhci here */
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
                 return ret;
         }
@@ -183 +172 @@
         if (ret != EOK) {
                 usb_log_error("Failed to register root hub.\n");
-                /* TODO: destroy uhci here */
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
+                free(rh);
                 return ret;
         }
 
         device->driver_data = uhci_hc;
-
         return EOK;
 }

uspace/drv/uhci-hcd/uhci.c

@@ -39 +39 @@
 
 #include "uhci.h"
+static irq_cmd_t uhci_cmds[] = {
+        {
+                .cmd = CMD_PIO_READ_16,
+                .addr = (void*)0xc022,
+                .dstarg = 1
+        },
+        {
+                .cmd = CMD_PIO_WRITE_16,
+                .addr = (void*)0xc022,
+                .value = 0x1f
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
+};
 
 static int uhci_init_transfer_lists(uhci_t *instance);
@@ -101 +116 @@
 {
         assert(instance);
+
+        /* init interrupt code */
+        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 */
         int ret = uhci_init_transfer_lists(instance);

uspace/drv/uhci-hcd/uhci.h

@@ -93 +93 @@
         transfer_list_t *transfers[2][4];
 
+        irq_code_t interrupt_code;
+
         fid_t cleaner;
         fid_t debug_checker;
@@ -100 +102 @@
 int uhci_init(uhci_t *instance, void *regs, size_t reg_size);
 
-int uhci_fini(uhci_t *device);
+static inline void uhci_fini(uhci_t *instance) {};
 
 int uhci_transfer(
@@ -122 +124 @@
         { return (uhci_t*)dev->driver_data; }
 
+
 #endif
 /**