Changeset 890af992 in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-02-16T23:00:41Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

acce4fc

Parents:

2736b13e

Message:

Refactoring

File:

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

uspace/drv/uhci-hcd/main.c

@@ -80 +80 @@
         assert(device);
         uhci_t *hc = dev_to_uhci(device);
-//      usb_log_info("LOL HARDWARE INTERRUPT: %p.\n", hc);
+        usb_log_info("LOL HARDWARE INTERRUPT: %p.\n", hc);
         assert(hc);
         uhci_interrupt(hc);
@@ -96 +96 @@
         int irq;
 
-        int ret = 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 (ret != EOK) {
-                usb_log_error("Failed(%d) to get I/O registers addresses for device:.\n",
+                usb_log_error(
+                    "Failed(%d) to get I/O registers addresses for device:.\n",
                     ret, device->handle);
                 return ret;
         }
+
+        ret = register_interrupt_handler(device, irq, irq_handler, NULL);
+        usb_log_error("registered interrupt handler %d.\n", ret);
 
         usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
@@ -136 +140 @@
         device->driver_data = uhci_hc;
 
-        ret = register_interrupt_handler(device, irq, irq_handler, NULL);
-        usb_log_error("registered interrupt handler %d.\n", ret);
-
         return EOK;
 }