Changeset 0b5644c in mainline for uspace/drv/uhci-hcd/main.c

Timestamp:

2011-03-01T14:02:16Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

27270db

Parents:

5d4d98b (diff), cc44f7e (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:

Merged development changes.

File:

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

uspace/drv/uhci-hcd/main.c

@@ -82 +82 @@
         usb_log_info("uhci_add_device() called\n");
 
-
-        uintptr_t io_reg_base;
-        size_t io_reg_size;
-        int irq;
+        uintptr_t io_reg_base = 0;
+        size_t io_reg_size = 0;
+        int irq = 0;
 
         int ret =
@@ -95 +94 @@
             io_reg_base, io_reg_size, irq);
 
-        ret = pci_enable_interrupts(device);
-        CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
+//      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));
@@ -114 +113 @@
          */
         device->driver_data = uhci_hc;
-
         ret = register_interrupt_handler(device, irq, irq_handler,
             &uhci_hc->interrupt_code);
@@ -149 +147 @@
 {
         sleep(3);
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         return ddf_driver_main(&uhci_driver);