Changeset e3a07bba in mainline

Timestamp:

2013-12-31T22:31:21Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

ba4a03a5

Parents:

1bb9833

Message:

uhci: move legacy disabling to main

Location:

uspace/drv/bus/usb/uhci

Files:

• main.c (modified) (4 diffs)
• uhci.c (modified) (4 diffs)

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

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup drvusbuhcihc
+/** @addtogroup drvusbuhci
  * @{
  */
@@ -35 +35 @@
 #include <assert.h>
 #include <ddf/driver.h>
+#include <devman.h>
 #include <errno.h>
 #include <io/log.h>
+#include <pci_dev_iface.h>
 #include <stdio.h>
 #include <str_error.h>
@@ -56 +58 @@
 };
 
+/** Call the PCI driver with a request to clear legacy support register
+ *
+ * @param[in] device Device asking to disable interrupts
+ * @return Error code.
+ */
+static int disable_legacy(ddf_dev_t *device)
+{
+        assert(device);
+
+        async_sess_t *parent_sess = devman_parent_device_connect(
+            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
+        if (!parent_sess)
+                return ENOMEM;
+
+        /* 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_hangup(parent_sess);
+        return rc;
+}
+
 /** Initialize a new ddf driver instance for uhci hc and hub.
  *
@@ -66 +90 @@
         assert(device);
 
-        const int ret = device_setup_uhci(device);
+        int ret = disable_legacy(device);
+        if (ret != EOK) {
+                usb_log_error("Failed to disable legacy USB: %s.\n",
+                    str_error(ret));
+                return ret;
+        }
+
+
+        ret = device_setup_uhci(device);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize UHCI driver: %s.\n",

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

@@ -38 +38 @@
 #include <ddf/interrupt.h>
 #include <device/hw_res_parsed.h>
-#include <pci_dev_iface.h>
 #include <devman.h>
 #include <errno.h>
@@ -75 +74 @@
 }
 
-/** Call the PCI driver with a request to clear legacy support register
- *
- * @param[in] device Device asking to disable interrupts
- * @return Error code.
- */
-static int disable_legacy(ddf_dev_t *device)
-{
-        assert(device);
-
-        async_sess_t *parent_sess = devman_parent_device_connect(
-            EXCHANGE_SERIALIZE, ddf_dev_get_handle(device), IPC_FLAG_BLOCKING);
-        if (!parent_sess)
-                return ENOMEM;
-
-        /* 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_hangup(parent_sess);
-        return rc;
-}
-
 /** Initialize hc and rh DDF structures and their respective drivers.
  *
@@ -103 +80 @@
  * This function does all the preparatory work for hc and rh drivers:
  *  - gets device's hw resources
- *  - disables UHCI legacy support (PCI config space)
  *  - attempts to enable interrupts
  *  - registers interrupt handler
@@ -152 +128 @@
         }
 
-        ret = disable_legacy(device);
-        if (ret != EOK) {
-                usb_log_error("Failed to disable legacy USB: %s.\n",
-                    str_error(ret));
-                goto irq_unregister;
-        }
-
         ret = hc_init(hc, &regs, interrupts);
         if (ret != EOK) {