Changes in uspace/drv/uhci-hcd/main.c [fb78ae72:357a302] in mainline

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 <device/hw_res.h>
 
 #include <errno.h>
@@ -47 +46 @@
 #define NAME "uhci-hcd"
 
-static int uhci_add_device(device_t *device);
-static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle);
-/*----------------------------------------------------------------------------*/
 static int usb_iface_get_hc_handle(device_t *dev, devman_handle_t *handle)
 {
@@ -58 +54 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
+static int usb_iface_get_address(device_t *dev, devman_handle_t handle,
+    usb_address_t *address)
+{
+        assert(dev);
+        uhci_t *hc = dev_to_uhci(dev);
+        assert(hc);
+
+        usb_address_t addr = usb_address_keeping_find(&hc->address_manager,
+            handle);
+        if (addr < 0) {
+                return addr;
+        }
+
+        if (address != NULL) {
+                *address = addr;
+        }
+
+        return EOK;
+}
+
 static usb_iface_t hc_usb_iface = {
-        .get_hc_handle = usb_iface_get_hc_handle
+        .get_hc_handle = usb_iface_get_hc_handle,
+        .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)
@@ -103 +96 @@
         int irq;
 
-        int ret =
-            pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
+        int rc = pci_get_my_registers(device,
+            &io_reg_base, &io_reg_size, &irq);
 
-        CHECK_RET_RETURN(ret,
-            "Failed(%d) to get I/O addresses:.\n", ret, device->handle);
+        if (rc != EOK) {
+                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                    rc, device->handle);
+                return rc;
+        }
+
         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;
+        }
 
-        uhci_t *uhci_hc = malloc(sizeof(uhci_t));
-        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);
+        int 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;
         }
-
-        ret = register_interrupt_handler(device, irq, irq_handler,
-            &uhci_hc->interrupt_code);
-        if (ret != EOK) {
-                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");
-                uhci_fini(uhci_hc);
-                free(uhci_hc);
+                /* TODO: destroy uhci here */
                 return ret;
         }
@@ -146 +131 @@
         if (ret != EOK) {
                 usb_log_error("Failed to register root hub.\n");
-                uhci_fini(uhci_hc);
-                free(uhci_hc);
-                free(rh);
+                /* TODO: destroy uhci here */
                 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[])
 {
-        sleep(3);
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        /*
+         * Do some global initializations.
+         */
+        sleep(5);
+        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
 
         return driver_main(&uhci_driver);