Changes in uspace/drv/uhci-hcd/pci.c [b375bb8:fb78ae72] in mainline

File:

• uspace/drv/uhci-hcd/pci.c (modified) (5 diffs)

uspace/drv/uhci-hcd/pci.c

@@ -39 +39 @@
 #include <device/hw_res.h>
 
-#include <usb/debug.h>
-#include <pci_dev_iface.h>
-
 #include "pci.h"
 
@@ -52 +49 @@
  * @return Error code.
  */
-int pci_get_my_registers(ddf_dev_t *dev,
+int pci_get_my_registers(device_t *dev,
     uintptr_t *io_reg_address, size_t *io_reg_size,
     int *irq_no)
@@ -86 +83 @@
                                 irq = res->res.interrupt.irq;
                                 irq_found = true;
-                                usb_log_debug2("Found interrupt: %d.\n", irq);
                                 break;
                         case IO_RANGE:
-                                io_address = res->res.io_range.address;
+                                io_address = (uintptr_t)
+                                    res->res.io_range.address;
                                 io_size = res->res.io_range.size;
-                                usb_log_debug2("Found io: %llx %zu.\n",
-                                    res->res.io_range.address, res->res.io_range.size);
                                 io_found = true;
                                 break;
@@ -110 +105 @@
         }
 
-        *io_reg_address = io_address;
-        *io_reg_size = io_size;
-        *irq_no = irq;
+        if (io_reg_address != NULL) {
+                *io_reg_address = io_address;
+        }
+        if (io_reg_size != NULL) {
+                *io_reg_size = io_size;
+        }
+        if (irq_no != NULL) {
+                *irq_no = irq;
+        }
 
         rc = EOK;
@@ -121 +122 @@
 }
 /*----------------------------------------------------------------------------*/
-int pci_enable_interrupts(ddf_dev_t *device)
+int pci_enable_interrupts(device_t *device)
 {
         int parent_phone = devman_parent_device_connect(device->handle,
             IPC_FLAG_BLOCKING);
         bool enabled = hw_res_enable_interrupt(parent_phone);
-        async_hangup(parent_phone);
         return enabled ? EOK : EIO;
 }
-/*----------------------------------------------------------------------------*/
-int pci_disable_legacy(ddf_dev_t *device)
-{
-        assert(device);
-        int parent_phone = devman_parent_device_connect(device->handle,
-                IPC_FLAG_BLOCKING);
-        if (parent_phone < 0) {
-                return parent_phone;
-        }
-
-        /* See UHCI design guide for these values,
-         * write all WC bits in USB legacy register */
-        sysarg_t address = 0xc0;
-        sysarg_t value = 0x8f00;
-
-  int rc = async_req_3_0(parent_phone, DEV_IFACE_ID(PCI_DEV_IFACE),
-            IPC_M_CONFIG_SPACE_WRITE_16, address, value);
-        async_hangup(parent_phone);
-
-  return rc;
-}
-/*----------------------------------------------------------------------------*/
 /**
  * @}