Changeset 77d10f0 in mainline

Timestamp:

2011-04-22T21:29:57Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

af81980

Parents:

6f122df

Message:

Do not use static irq_commnd structure, there is no enough shared data.

One less malloc

Location:

uspace/drv/uhci-hcd

Files:

• hc.c (modified) (4 diffs)
• hc.h (modified) (2 diffs)

uspace/drv/uhci-hcd/hc.c

@@ -44 +44 @@
 #include "hc.h"
 
-static irq_cmd_t uhci_cmds[] = {
-        {
-                .cmd = CMD_PIO_READ_16,
-                .addr = NULL, /* patched for every instance */
-                .dstarg = 1
-        },
-        {
-                .cmd = CMD_PIO_WRITE_16,
-                .addr = NULL, /* pathed for every instance */
-                .value = 0x1f
-        },
-        {
-                .cmd = CMD_ACCEPT
-        }
-};
-/*----------------------------------------------------------------------------*/
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_mem_structures(hc_t *instance);
@@ -177 +161 @@
 {
         assert(instance);
-#define CHECK_RET_DEST_CMDS_RETURN(ret, message...) \
+#define CHECK_RET_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");
-
+        instance->interrupt_code.cmds = instance->interrupt_commands;
         {
-                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);
+                instance->interrupt_commands[0].cmd = CMD_PIO_READ_16;
+                instance->interrupt_commands[0].dstarg = 1;
+                instance->interrupt_commands[0].addr =
+                    &instance->registers->usbsts;
+
+                instance->interrupt_commands[1].cmd = CMD_PIO_WRITE_16;
+                instance->interrupt_commands[1].value = 0x1f;
+                instance->interrupt_commands[1].addr =
+                    &instance->registers->usbsts;
+
+                instance->interrupt_commands[2].cmd = CMD_ACCEPT;
+                instance->interrupt_code.cmdcount = UHCI_NEEDED_IRQ_COMMANDS;
         }
 
         /* Init transfer lists */
-        ret = hc_init_transfer_lists(instance);
-        CHECK_RET_DEST_CMDS_RETURN(ret, "Failed to init transfer lists.\n");
+        int ret = hc_init_transfer_lists(instance);
+        CHECK_RET_RETURN(ret, "Failed to init transfer lists.\n");
         usb_log_debug("Initialized transfer lists.\n");
 
@@ -210 +192 @@
         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 at %p.\n", instance->frame_list);
 
@@ -229 +211 @@
         ret = usb_endpoint_manager_init(&instance->ep_manager,
             BANDWIDTH_AVAILABLE_USB11);
-        assert(ret == EOK);
-
-        return EOK;
-#undef CHECK_RET_DEST_CMDS_RETURN
+        CHECK_RET_RETURN(ret, "Failed to initialize endpoint manager: %s.\n",
+            str_error(ret));
+
+        return EOK;
+#undef CHECK_RET_RETURN
 }
 /*----------------------------------------------------------------------------*/

uspace/drv/uhci-hcd/hc.h

@@ -91 +91 @@
 #define UHCI_DEBUGER_TIMEOUT 5000000
 #define UHCI_ALLOWED_HW_FAIL 5
+#define UHCI_NEEDED_IRQ_COMMANDS 3
 
 /* Main HC driver structure */
@@ -119 +120 @@
         /** 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*/