Changes in uspace/drv/bus/usb/uhci/main.c [920d0fc:2ef8023] in mainline

File:

• uspace/drv/bus/usb/uhci/main.c (modified) (3 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
  * @{
  */
@@ -32 +32 @@
  * @brief UHCI driver initialization
  */
+
+#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>
+#include <usb/debug.h>
+#include <usb/host/ddf_helpers.h>
 
-#include <usb/ddfiface.h>
-#include <usb/debug.h>
-
-#include "uhci.h"
+#include "hc.h"
 
 #define NAME "uhci"
 
+// TODO: This should be merged to hc_interrupt
+static void uhci_interrupt(hcd_t *hcd, uint32_t status)
+{
+        assert(hcd);
+        if (hcd->driver.data)
+                hc_interrupt(hcd->driver.data, status);
+}
+
+static int uhci_driver_init(hcd_t *hcd, const hw_res_list_parsed_t *res, bool irq)
+{
+        assert(hcd);
+        assert(hcd->driver.data == NULL);
+
+        hc_t *instance = malloc(sizeof(hc_t));
+        if (!instance)
+                return ENOMEM;
+
+        const int ret =  hc_init(instance, res, irq);
+        if (ret == EOK)
+                hcd_set_implementation(hcd, instance, hc_schedule, NULL, NULL,
+                    uhci_interrupt);
+        return ret;
+}
+
+static void uhci_driver_fini(hcd_t *hcd)
+{
+        assert(hcd);
+        if (hcd->driver.data)
+                hc_fini(hcd->driver.data);
+
+        free(hcd->driver.data);
+        hcd_set_implementation(hcd, NULL, NULL, NULL, NULL, NULL);
+}
+
 static int uhci_dev_add(ddf_dev_t *device);
 
-static driver_ops_t uhci_driver_ops = {
+static const driver_ops_t uhci_driver_ops = {
         .dev_add = uhci_dev_add,
 };
 
-static driver_t uhci_driver = {
+static const driver_t uhci_driver = {
         .name = NAME,
         .driver_ops = &uhci_driver_ops
 };
+
+/** 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.
@@ -64 +125 @@
         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 = ddf_hcd_device_setup_all(device, USB_SPEED_FULL,
+            BANDWIDTH_AVAILABLE_USB11, bandwidth_count_usb11,
+            ddf_hcd_gen_irq_handler, hc_gen_irq_code,
+            uhci_driver_init, uhci_driver_fini);
         if (ret != EOK) {
                 usb_log_error("Failed to initialize UHCI driver: %s.\n",