Changeset 0b20937 in mainline

Timestamp:

2012-03-15T14:30:10Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fd36d39

Parents:

5f6d34b

Message:

uhci: cleanup and rename pci_* helper functions.

The functions are not pci specific.
Use libc provided pci interface instead of reimplementing it.
Remove redundant asserts.

Location:

uspace/drv/bus/usb/uhci

Files:

• Makefile (modified) (1 diff)
• res.c (moved) (moved from uspace/drv/bus/usb/uhci/pci.c ) (4 diffs)
• res.h (moved) (moved from uspace/drv/bus/usb/uhci/pci.h ) (1 diff)
• uhci.c (modified) (5 diffs)

uspace/drv/bus/usb/uhci/Makefile

@@ -44 +44 @@
         hc.c \
         main.c \
-        pci.c \
+        res.c \
         root_hub.c \
         transfer_list.c \

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

@@ -39 +39 @@
 #include <devman.h>
 #include <device/hw_res_parsed.h>
+#include <device/pci.h>
 
-#include <usb/debug.h>
-#include <pci_dev_iface.h>
-
-#include "pci.h"
+#include "res.h"
 
 /** Get I/O address of registers and IRQ for given device.
@@ -53 +51 @@
  * @return Error code.
  */
-int pci_get_my_registers(const ddf_dev_t *dev,
+int get_my_registers(const ddf_dev_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size, int *irq_no)
 {
         assert(dev);
-        assert(io_reg_address);
-        assert(io_reg_size);
-        assert(irq_no);
 
         async_sess_t *parent_sess =
@@ -97 +92 @@
  * @return Error code.
  */
-int pci_enable_interrupts(const ddf_dev_t *device)
+int enable_interrupts(const ddf_dev_t *device)
 {
         async_sess_t *parent_sess =
@@ -116 +111 @@
  * @return Error code.
  */
-int pci_disable_legacy(const ddf_dev_t *device)
+int disable_legacy(const ddf_dev_t *device)
 {
         assert(device);
 
-        async_sess_t *parent_sess =
-            devman_parent_device_connect(EXCHANGE_SERIALIZE, device->handle,
-            IPC_FLAG_BLOCKING);
+        async_sess_t *parent_sess = devman_parent_device_connect(
+            EXCHANGE_SERIALIZE, device->handle, IPC_FLAG_BLOCKING);
         if (!parent_sess)
                 return ENOMEM;
 
-        /* See UHCI design guide for these values p.45,
-         * write all WC bits in USB legacy register */
-        const sysarg_t address = 0xc0;
-        const sysarg_t value = 0xaf00;
+        /* See UHCI design guide page 45 for these values.
+         * Write all WC bits in USB legacy register */
+        const int rc = pci_config_space_write_16(parent_sess, 0xc0, 0xaf00);
 
-        async_exch_t *exch = async_exchange_begin(parent_sess);
-
-        const int rc = async_req_3_0(exch, DEV_IFACE_ID(PCI_DEV_IFACE),
-            IPC_M_CONFIG_SPACE_WRITE_16, address, value);
-
-        async_exchange_end(exch);
         async_hangup(parent_sess);
-
         return rc;
 }

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

@@ -38 +38 @@
 #include <ddf/driver.h>
 
-int pci_get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
-int pci_enable_interrupts(const ddf_dev_t *);
-int pci_disable_legacy(const ddf_dev_t *);
+int get_my_registers(const ddf_dev_t *, uintptr_t *, size_t *, int *);
+int enable_interrupts(const ddf_dev_t *);
+int disable_legacy(const ddf_dev_t *);
 
 #endif

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

@@ -41 +41 @@
 
 #include "uhci.h"
-#include "pci.h"
-
+
+#include "res.h"
 #include "hc.h"
 #include "root_hub.h"
@@ -49 +49 @@
  * and USB root hub */
 typedef struct uhci {
-        /** Pointer to DDF represenation of UHCI host controller */
+        /** Pointer to DDF representation of UHCI host controller */
         ddf_fun_t *hc_fun;
-        /** Pointer to DDF represenation of UHCI root hub */
+        /** Pointer to DDF representation of UHCI root hub */
         ddf_fun_t *rh_fun;
 
-        /** Internal driver's represenation of UHCI host controller */
+        /** Internal driver's representation of UHCI host controller */
         hc_t hc;
-        /** Internal driver's represenation of UHCI root hub */
+        /** Internal driver's representation of UHCI root hub */
         rh_t rh;
 } uhci_t;
@@ -187 +187 @@
         int irq = 0;
 
-        ret = pci_get_my_registers(device, &reg_base, &reg_size, &irq);
+        ret = get_my_registers(device, &reg_base, &reg_size, &irq);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to get I/O addresses for %" PRIun ": %s.\n",
@@ -194 +194 @@
             (void *) reg_base, reg_size, irq);
 
-        ret = pci_disable_legacy(device);
+        ret = disable_legacy(device);
         CHECK_RET_DEST_FREE_RETURN(ret,
             "Failed to disable legacy USB: %s.\n", str_error(ret));
@@ -220 +220 @@
 
         bool interrupts = false;
-        ret = pci_enable_interrupts(device);
+        ret = enable_interrupts(device);
         if (ret != EOK) {
                 usb_log_warning("Failed to enable interrupts: %s."