Changeset 8d40181 in mainline

Timestamp:

2013-09-21T03:25:31Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ea69749f

Parents:

c898236

Message:

ohci,uhci,ehci: Use library provided 'get_registers' function

Location:

uspace/drv/bus/usb

Files:

• ehci/main.c (modified) (1 diff)
• ehci/res.c (modified) (1 diff)
• ehci/res.h (modified) (1 diff)
• ohci/Makefile (modified) (1 diff)
• ohci/ohci.c (modified) (3 diffs)
• ohci/res.c (deleted)
• ohci/res.h (deleted)
• uhci/res.c (modified) (1 diff)
• uhci/res.h (modified) (1 diff)
• uhci/uhci.c (modified) (1 diff)

uspace/drv/bus/usb/ehci/main.c

@@ -67 +67 @@
 {
         assert(device);
-
-        addr_range_t reg_range;
-        int irq = 0;
-
-        int ret = get_my_registers(device, &reg_range, &irq);
-        if (ret != EOK) {
-                usb_log_error("Failed to get memory addresses for %" PRIun
-                    ": %s.\n", ddf_dev_get_handle(device), str_error(ret));
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
+                usb_log_error("Failed to get register memory addresses "
+                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
+                    str_error(ret));
                 return ret;
         }
+        addr_range_t regs = hw_res.mem_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
 
         usb_log_info("Memory mapped regs at %p (size %zu), IRQ %d.\n",
-            RNGABSPTR(reg_range), RNGSZ(reg_range), irq);
+            RNGABSPTR(regs), RNGSZ(regs), irq);
 
-        ret = disable_legacy(device, &reg_range);
+        ret = disable_legacy(device, &regs);
         if (ret != EOK) {
                 usb_log_error("Failed to disable legacy USB: %s.\n",

uspace/drv/bus/usb/ehci/res.c

@@ -66 +66 @@
 #define DEFAULT_WAIT 1000
 #define WAIT_STEP 10
-
-
-/** Get address of registers and IRQ for given device.
- *
- * @param[in] dev Device asking for the addresses.
- * @param[out] mem_regs_p Pointer to the register range.
- * @param[out] irq_no IRQ assigned to the device.
- * @return Error code.
- */
-int get_my_registers(ddf_dev_t *dev,
-    addr_range_t *mem_regs_p, int *irq_no)
-{
-        assert(dev);
-        
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-        
-        hw_res_list_parsed_t hw_res;
-        hw_res_list_parsed_init(&hw_res);
-        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
-        async_hangup(parent_sess);
-        if (ret != EOK) {
-                return ret;
-        }
-
-        if (hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
-                hw_res_list_parsed_clean(&hw_res);
-                return ENOENT;
-        }
-
-        if (mem_regs_p)
-                *mem_regs_p = hw_res.mem_ranges.ranges[0];
-        if (irq_no)
-                *irq_no = hw_res.irqs.irqs[0];
-
-        hw_res_list_parsed_clean(&hw_res);
-        return EOK;
-}
 
 /** Implements BIOS hands-off routine as described in EHCI spec

uspace/drv/bus/usb/ehci/res.h

@@ -39 +39 @@
 #include <device/hw_res_parsed.h>
 
-int get_my_registers(ddf_dev_t *, addr_range_t *, int *);
-int enable_interrupts(ddf_dev_t *);
 int disable_legacy(ddf_dev_t *, addr_range_t *);
 

uspace/drv/bus/usb/ohci/Makefile

@@ -52 +52 @@
         ohci_endpoint.c \
         ohci_rh.c \
-        res.c \
         hw_struct/endpoint_descriptor.c \
         hw_struct/transfer_descriptor.c

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

@@ -43 +43 @@
 
 #include "ohci.h"
-#include "res.h"
 #include "hc.h"
-
 
 
@@ -80 +78 @@
 int device_setup_ohci(ddf_dev_t *device)
 {
-
-        addr_range_t regs;
-        int irq = 0;
-
-        int ret = get_my_registers(device, &regs, &irq);
-        if (ret != EOK) {
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.mem_ranges.count != 1) {
                 usb_log_error("Failed to get register memory addresses "
                     "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
@@ -91 +87 @@
                 return ret;
         }
+        addr_range_t regs = hw_res.mem_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
+
 
         usb_log_debug("Memory mapped regs at %p (size %zu), IRQ %d.\n",

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

@@ -43 +43 @@
 #include "res.h"
 
-/** Get I/O address of registers and IRQ for given device.
- *
- * @param[in] dev Device asking for the addresses.
- * @param[out] io_regs_p Pointer to register I/O range.
- * @param[out] irq_no IRQ assigned to the device.
- * @return Error code.
- */
-int get_my_registers(ddf_dev_t *dev, addr_range_t *io_regs_p, int *irq_no)
-{
-        assert(dev);
-
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE,
-            ddf_dev_get_handle(dev), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        hw_res_list_parsed_t hw_res;
-        hw_res_list_parsed_init(&hw_res);
-        const int ret = hw_res_get_list_parsed(parent_sess, &hw_res, 0);
-        async_hangup(parent_sess);
-        if (ret != EOK) {
-                return ret;
-        }
-
-        /* We want one irq and one io range. */
-        if (hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) {
-                hw_res_list_parsed_clean(&hw_res);
-                return EINVAL;
-        }
-
-        if (io_regs_p)
-                *io_regs_p = hw_res.io_ranges.ranges[0];
-        if (irq_no)
-                *irq_no = hw_res.irqs.irqs[0];
-
-        hw_res_list_parsed_clean(&hw_res);
-        return EOK;
-}
-
 /** Call the PCI driver with a request to clear legacy support register
  *

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

@@ -39 +39 @@
 #include <device/hw_res_parsed.h>
 
-int get_my_registers(ddf_dev_t *, addr_range_t *, int *);
-int enable_interrupts(ddf_dev_t *);
 int disable_legacy(ddf_dev_t *);
 

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

@@ -77 +77 @@
 int device_setup_uhci(ddf_dev_t *device)
 {
-        if (!device)
-                return EBADMEM;
+        assert(device);
 
-        addr_range_t regs;
-        int irq = 0;
-
-        int ret = get_my_registers(device, &regs, &irq);
-        if (ret != EOK) {
-                usb_log_error("Failed to get I/O addresses for %" PRIun ": %s.\n",
-                    ddf_dev_get_handle(device), str_error(ret));
+        hw_res_list_parsed_t hw_res;
+        int ret = hcd_ddf_get_registers(device, &hw_res);
+        if (ret != EOK ||
+            hw_res.irqs.count != 1 || hw_res.io_ranges.count != 1) {
+                usb_log_error("Failed to get register memory addresses "
+                    "for %" PRIun ": %s.\n", ddf_dev_get_handle(device),
+                    str_error(ret));
                 return ret;
         }
+        addr_range_t regs = hw_res.io_ranges.ranges[0];
+        const int irq = hw_res.irqs.irqs[0];
+        hw_res_list_parsed_clean(&hw_res);
+
         usb_log_debug("I/O regs at %p (size %zu), IRQ %d.\n",
             RNGABSPTR(regs), RNGSZ(regs), irq);