Changeset 1cb4f05 in mainline

Timestamp:

2011-07-11T08:52:43Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

aa81adc

Parents:

a00768c

Message:

OHCI: Make error messages consistent and some minor reshuffling.

File:

• uspace/drv/bus/usb/ohci/hc.c (modified) (6 diffs)

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

@@ -56 +56 @@
 };
 
+static void hc_gain_control(hc_t *instance);
 static void hc_start(hc_t *instance);
-static int interrupt_emulator(hc_t *instance);
-static void hc_gain_control(hc_t *instance);
 static int hc_init_transfer_lists(hc_t *instance);
 static int hc_init_memory(hc_t *instance);
+static int interrupt_emulator(hc_t *instance);
+
+/*----------------------------------------------------------------------------*/
+/** Get number of commands used in IRQ code.
+ * @return Number of commands.
+ */
+size_t hc_irq_cmd_count(void)
+{
+        return sizeof(ohci_irq_commands) / sizeof(irq_cmd_t);
+}
+/*----------------------------------------------------------------------------*/
+/** Generate IRQ code commands.
+ * @param[out] cmds Place to store the commands.
+ * @param[in] cmd_size Size of the place (bytes).
+ * @param[in] regs Physical address of device's registers.
+ * @param[in] reg_size Size of the register area (bytes).
+ *
+ * @return Error code.
+ */
+int hc_get_irq_commands(
+    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
+{
+        if (cmd_size < sizeof(ohci_irq_commands)
+            || reg_size < sizeof(ohci_regs_t))
+                return EOVERFLOW;
+
+        /* Create register mapping to use in IRQ handler.
+         * This mapping should be present in kernel only.
+         * Remove it from here when kernel knows how to create mappings
+         * and accepts physical addresses in IRQ code.
+         * TODO: remove */
+        ohci_regs_t *registers;
+        const int ret = pio_enable((void*)regs, reg_size, (void**)&registers);
+
+        /* Some bogus access to force create mapping. DO NOT remove,
+         * unless whole virtual addresses in irq is replaced
+         * NOTE: Compiler won't remove this as ohci_regs_t members
+         * are declared volatile. */
+        registers->revision;
+
+        if (ret != EOK)
+                return ret;
+
+        memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
+
+        void *address = (void*)&registers->interrupt_status;
+        cmds[0].addr = address;
+        cmds[3].addr = address;
+        return EOK;
+}
 /*----------------------------------------------------------------------------*/
 /** Announce OHCI root hub to the DDF
@@ -94 +143 @@
         int ret = hc_add_endpoint(instance, hub_address, 0, USB_SPEED_FULL,
             USB_TRANSFER_CONTROL, USB_DIRECTION_BOTH, 64, 0, 0);
-        CHECK_RET_RELEASE(ret, "Failed(%d) to add OHCI rh endpoint 0.\n", ret);
+        CHECK_RET_RELEASE(ret,
+            "Failed to add OHCI root hub endpoint 0: %s.\n", str_error(ret));
 
         char *match_str = NULL;
-        /* DDF needs heap allocated string */
+        /* DDF needs heap allocated string. */
         ret = asprintf(&match_str, "usb&class=hub");
         ret = ret > 0 ? 0 : ret;
-        CHECK_RET_RELEASE(ret, "Failed(%d) to create match-id string.\n", ret);
+        CHECK_RET_RELEASE(ret,
+            "Failed to create match-id string: %s.\n", str_error(ret));
 
         ret = ddf_fun_add_match_id(hub_fun, match_str, 100);
-        CHECK_RET_RELEASE(ret, "Failed(%d) add root hub match-id.\n", ret);
+        CHECK_RET_RELEASE(ret,
+            "Failed to add root hub match-id: %s.\n", str_error(ret));
 
         ret = ddf_fun_bind(hub_fun);
-        CHECK_RET_RELEASE(ret, "Failed(%d) to bind root hub function.\n", ret);
+        CHECK_RET_RELEASE(ret,
+            "Failed to bind root hub function: %s.\n", str_error(ret));
 
         return EOK;
@@ -123 +176 @@
 {
         assert(instance);
-        int ret = EOK;
+
 #define CHECK_RET_RETURN(ret, message...) \
 if (ret != EOK) { \
@@ -130 +183 @@
 } else (void)0
 
-        ret = pio_enable((void*)regs, reg_size, (void**)&instance->registers);
+        int ret =
+            pio_enable((void*)regs, reg_size, (void**)&instance->registers);
         CHECK_RET_RETURN(ret,
-            "Failed(%d) to gain access to device registers: %s.\n",
-            ret, str_error(ret));
+            "Failed to gain access to device registers: %s.\n", str_error(ret));
 
         list_initialize(&instance->pending_batches);
         usb_device_keeper_init(&instance->manager);
+
         ret = usb_endpoint_manager_init(&instance->ep_manager,
             BANDWIDTH_AVAILABLE_USB11);
@@ -160 +214 @@
         hc_start(instance);
 
-        return EOK;
-}
-/*----------------------------------------------------------------------------*/
-/** Get number of commands used in IRQ code.
- * @return Number of commands.
- */
-size_t hc_irq_cmd_count(void)
-{
-        return sizeof(ohci_irq_commands) / sizeof(irq_cmd_t);
-}
-/*----------------------------------------------------------------------------*/
-/** Generate IRQ code commands.
- * @param[out] cmds Place to store the commands.
- * @param[in] cmd_size Size of the place (bytes).
- * @param[in] regs Physical address of device's registers.
- * @param[in] reg_size Size of the register area (bytes).
- *
- * @return Error code.
- */
-int hc_get_irq_commands(
-    irq_cmd_t cmds[], size_t cmd_size, uintptr_t regs, size_t reg_size)
-{
-        if (cmd_size < sizeof(ohci_irq_commands)
-            || reg_size < sizeof(ohci_regs_t))
-                return EOVERFLOW;
-
-        /* Create register mapping to use in IRQ handler.
-         * This mapping should be present in kernel only.
-         * Remove it from here when kernel knows how to create mappings
-         * and accepts physical addresses in IRQ code.
-         * TODO: remove */
-        ohci_regs_t *registers;
-        const int ret = pio_enable((void*)regs, reg_size, (void**)&registers);
-
-        /* Some bogus access to force create mapping. DO NOT remove,
-         * unless whole virtual addresses in irq is replaced
-         * NOTE: Compiler won't remove this as ohci_regs_t members
-         * are declared volatile. */
-        registers->revision;
-
-        if (ret != EOK)
-                return ret;
-
-        memcpy(cmds, ohci_irq_commands, sizeof(ohci_irq_commands));
-
-        void *address = (void*)&registers->interrupt_status;
-        cmds[0].addr = address;
-        cmds[3].addr = address;
         return EOK;
 }
@@ -606 +612 @@
         int ret = endpoint_list_init(&instance->lists[type], name); \
         if (ret != EOK) { \
-                usb_log_error("Failed(%d) to setup %s endpoint list.\n", \
-                    ret, name); \
+                usb_log_error("Failed to setup %s endpoint list: %s.\n", \
+                    name, str_error(ret)); \
                 endpoint_list_fini(&instance->lists[USB_TRANSFER_ISOCHRONOUS]);\
                 endpoint_list_fini(&instance->lists[USB_TRANSFER_INTERRUPT]); \