Changeset 063ead6f in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-20T21:37:20Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

41e645c, da7c0a9

Parents:

c20da9f (diff), 423e8c81 (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 development/ changes

File:

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

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
+#include <usb/ddfiface.h>
+#include <device/hw_res.h>
 
 #include <errno.h>
@@ -46 +48 @@
 #define NAME "uhci-hcd"
 
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
-{
-        /* This shall be called only for the UHCI itself. */
-        assert(dev->parent == NULL);
-
-        *handle = dev->handle;
-        return EOK;
-}
+static int uhci_add_device(device_t *device);
 
 static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
@@ -75 +70 @@
 }
 
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle,
+        .get_hc_handle = usb_iface_get_hc_handle_hc_impl,
         .get_address = usb_iface_get_address
 };
-
+/*----------------------------------------------------------------------------*/
 static device_ops_t uhci_ops = {
         .interfaces[USB_DEV_IFACE] = &hc_usb_iface,
         .interfaces[USBHC_DEV_IFACE] = &uhci_iface
 };
+/*----------------------------------------------------------------------------*/
+static driver_ops_t uhci_driver_ops = {
+        .add_device = uhci_add_device,
+};
+/*----------------------------------------------------------------------------*/
+static driver_t uhci_driver = {
+        .name = NAME,
+        .driver_ops = &uhci_driver_ops
+};
+/*----------------------------------------------------------------------------*/
+static void irq_handler(device_t *device, ipc_callid_t iid, ipc_call_t *call)
+{
+        assert(device);
+        uhci_t *hc = dev_to_uhci(device);
+        uint16_t status = IPC_GET_ARG1(*call);
+        assert(hc);
+        uhci_interrupt(hc, status);
+}
+/*----------------------------------------------------------------------------*/
+#define CHECK_RET_RETURN(ret, message...) \
+if (ret != EOK) { \
+        usb_log_error(message); \
+        return ret; \
+}
 
 static int uhci_add_device(device_t *device)
@@ -96 +116 @@
         int irq;
 
-        int rc = pci_get_my_registers(device,
-            &io_reg_base, &io_reg_size, &irq);
+        int ret =
+            pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
 
-        if (rc != EOK) {
-                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
-                    rc, device->handle);
-                return rc;
-        }
-
+        CHECK_RET_RETURN(ret,
+            "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
         usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
 
+        ret = pci_enable_interrupts(device);
+        CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
+
         uhci_t *uhci_hc = malloc(sizeof(uhci_t));
-        if (!uhci_hc) {
-                usb_log_error("Failed to allocaete memory for uhci hcd driver.\n");
-                return ENOMEM;
+        ret = (uhci_hc != NULL) ? EOK : ENOMEM;
+        CHECK_RET_RETURN(ret, "Failed to allocate memory for uhci hcd driver.\n");
+
+        ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
+        if (ret != EOK) {
+                usb_log_error("Failed to init uhci-hcd.\n");
+                free(uhci_hc);
+                return ret;
         }
 
-        int ret = uhci_init(uhci_hc, (void*)io_reg_base, io_reg_size);
+        ret = register_interrupt_handler(device, irq, irq_handler,
+            &uhci_hc->interrupt_code);
         if (ret != EOK) {
-                usb_log_error("Failed to init uhci-hcd.\n");
+                usb_log_error("Failed to register interrupt handler.\n");
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
                 return ret;
         }
+
         device_t *rh;
         ret = setup_root_hub(&rh, device);
-
         if (ret != EOK) {
                 usb_log_error("Failed to setup uhci root hub.\n");
-                /* TODO: destroy uhci here */
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
                 return ret;
         }
@@ -131 +159 @@
         if (ret != EOK) {
                 usb_log_error("Failed to register root hub.\n");
-                /* TODO: destroy uhci here */
+                uhci_fini(uhci_hc);
+                free(uhci_hc);
+                free(rh);
                 return ret;
         }
 
         device->driver_data = uhci_hc;
-
         return EOK;
 }
-
-static driver_ops_t uhci_driver_ops = {
-        .add_device = uhci_add_device,
-};
-
-static driver_t uhci_driver = {
-        .name = NAME,
-        .driver_ops = &uhci_driver_ops
-};
-
+/*----------------------------------------------------------------------------*/
 int main(int argc, char *argv[])
 {
-        /*
-         * Do some global initializations.
-         */
-        sleep(5);
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        sleep(3);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         return driver_main(&uhci_driver);