Changeset ab414a6 in mainline

Timestamp:

2011-02-28T20:07:06Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9ef0d6d

Parents:

99e6bfb

Message:

Use aaccess routines to disable USB Legacy

Location:

uspace/drv/uhci-hcd

Files:

• main.c (modified) (2 diffs)
• pci.c (modified) (2 diffs)
• pci.h (modified) (1 diff)

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <ddf/driver.h>
 #include <ddf/interrupt.h>
+#include <device/hw_res.h>
+#include <errno.h>
+#include <str_error.h>
+
 #include <usb_iface.h>
 #include <usb/ddfiface.h>
-#include <device/hw_res.h>
-
-#include <errno.h>
-
 #include <usb/debug.h>
 
@@ -94 +94 @@
         usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
+
+        ret = pci_disable_legacy(device);
+        CHECK_RET_FREE_HC_RETURN(ret,
+            "Failed(%d) disable legacy USB: %s.\n", ret, str_error(ret));
 
 //      ret = pci_enable_interrupts(device);

uspace/drv/uhci-hcd/pci.c

@@ -40 +40 @@
 
 #include <usb/debug.h>
+#include <pci_dev_iface.h>
 
 #include "pci.h"
@@ -128 +129 @@
         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;
+        }
+
+  sysarg_t address = 0xc0;
+        sysarg_t value = 0xb0;
+
+        usb_log_warning("phone %d, iface %d(%d), method %d, address %#x, value %#x.\n",
+            parent_phone,DEV_IFACE_ID(PCI_DEV_IFACE), PCI_DEV_IFACE, IPC_M_CONFIG_SPACE_WRITE_16, address, value);
+
+  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;
+}
+/*----------------------------------------------------------------------------*/
 /**
  * @}

uspace/drv/uhci-hcd/pci.h

@@ -40 +40 @@
 int pci_get_my_registers(ddf_dev_t *, uintptr_t *, size_t *, int *);
 int pci_enable_interrupts(ddf_dev_t *);
+int pci_disable_legacy(ddf_dev_t *);
 
 #endif