Changeset 3b5c119 in mainline for uspace/drv/bus/usb/uhci/res.c

Timestamp:

2012-04-08T08:07:21Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

1196df6

Parents:

ce6de59 (diff), f3378ba (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

File:

• uspace/drv/bus/usb/uhci/res.c (moved) (moved from uspace/drv/bus/usb/uhci/pci.c ) (4 diffs)

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;
 }