Changes in uspace/drv/uhci-hcd/main.c [7e7f0f5:e0df6c2] in mainline

File:

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

uspace/drv/uhci-hcd/main.c

@@ -34 +34 @@
 #include <driver.h>
 #include <usb_iface.h>
-#include <ipc/irc.h>
-#include <ipc/ns.h>
-#include <ipc/services.h>
-#include <sysinfo.h>
 
 #include <errno.h>
@@ -50 +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)
 {
@@ -61 +54 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 static usb_iface_t hc_usb_iface = {
         .get_hc_handle = usb_iface_get_hc_handle
 };
-/*----------------------------------------------------------------------------*/
+
 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 irq_cmd_t uhci_cmds[] = {
-        {
-                .cmd = CMD_PIO_READ_16,
-                .addr = (void*)0xc022,
-                .dstarg = 1
-        },
-        {
-                .cmd = CMD_PIO_WRITE_16,
-                .addr = (void*)0xc022,
-                .value = 0x1f
-        },
-        {
-                .cmd = CMD_ACCEPT
-        }
-};
-/*----------------------------------------------------------------------------*/
-static irq_code_t uhci_code = {
-        sizeof(uhci_cmds) / sizeof(irq_cmd_t),
-        uhci_cmds
-};
-/*----------------------------------------------------------------------------*/
-static void irq_handler(device_t *device, ipc_callid_t iid, ipc_call_t *call)
-{
-        assert(device);
-        uhci_t *hc = dev_to_uhci(device);
-        usb_log_info("LOL HARDWARE INTERRUPT: %p.\n", hc);
-        uint16_t status = IPC_GET_ARG1(*call);
-        assert(hc);
-        uhci_interrupt(hc, status);
-}
-/*----------------------------------------------------------------------------*/
+
 static int uhci_add_device(device_t *device)
 {
@@ -122 +75 @@
         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);
 
-        if (ret != EOK) {
-                usb_log_error(
-                    "Failed(%d) to get I/O registers addresses for device:.\n",
-                    ret, device->handle);
-                return ret;
+        if (rc != EOK) {
+                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                    rc, device->handle);
+                return rc;
         }
 
@@ -135 +87 @@
             io_reg_base, io_reg_size, irq);
 
-
-  sysarg_t apic;
-  sysarg_t i8259;
-        int irc_phone = -1;
-        int irc_service = 0;
-
-  if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) {
-    irc_service = SERVICE_APIC;
-                usb_log_debug("SERVICE_APIC\n");
-        } else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) {
-    irc_service = SERVICE_I8259;
-                usb_log_debug("SERVICE_I8259\n");
-        }
-
-  if (irc_service) {
-    while (irc_phone < 0)
-      irc_phone = service_connect_blocking(irc_service, 0, 0);
-  }
-        usb_log_debug("Interrupt conttroller phone: %d\n", irc_phone);
-
-        async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, irq);
-        async_hangup(irc_phone);
-
-        ret = register_interrupt_handler(device, irq, irq_handler, &uhci_code);
-        usb_log_debug("Registered interrupt handler %d.\n", ret);
-
         uhci_t *uhci_hc = malloc(sizeof(uhci_t));
         if (!uhci_hc) {
-                usb_log_error("Failed to allocate memory for uhci hcd driver.\n");
+                usb_log_error("Failed to allocaete memory for uhci hcd driver.\n");
                 return ENOMEM;
         }
 
-        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");
@@ -174 +100 @@
         device_t *rh;
         ret = setup_root_hub(&rh, device);
+
         if (ret != EOK) {
                 usb_log_error("Failed to setup uhci root hub.\n");
@@ -191 +118 @@
         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);