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

Timestamp:

2011-02-25T20:48:30Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0fde1d5

Parents:

2d33eb5

Message:

Minor fixes

initialize stack variables
use fixed size 32B address space
get rid of USE_INTERRUPTS macro
comment interrupt enabling code
reset hc before taking control

File:

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

uspace/drv/uhci-hcd/main.c

@@ -61 +61 @@
 };
 /*----------------------------------------------------------------------------*/
-#ifdef USE_INTERRUPTS
 static void irq_handler(ddf_dev_t *dev, ipc_callid_t iid, ipc_call_t *call)
 {
@@ -70 +69 @@
         uhci_interrupt(hc, status);
 }
-#endif
 /*----------------------------------------------------------------------------*/
 #define CHECK_RET_RETURN(ret, message...) \
@@ -85 +83 @@
 
 
-        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 =
             pci_get_my_registers(device, &io_reg_base, &io_reg_size, &irq);
-        io_reg_size = sizeof(regs_t);
 
         CHECK_RET_RETURN(ret,
@@ -97 +94 @@
         usb_log_info("I/O regs at 0x%X (size %zu), IRQ %d.\n",
             io_reg_base, io_reg_size, irq);
+        io_reg_size = 32;
 
-#ifdef USE_INTERRUPTS
-        ret = pci_enable_interrupts(device);
-        CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
-#endif
+//      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));
@@ -119 +115 @@
          */
         device->driver_data = uhci_hc;
-#ifdef USE_INTERRUPTS
         ret = register_interrupt_handler(device, irq, irq_handler,
             &uhci_hc->interrupt_code);
@@ -128 +123 @@
                 return ret;
         }
-#endif
 
         ddf_fun_t *rh;
@@ -155 +149 @@
 {
         sleep(3);
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
 
         return ddf_driver_main(&uhci_driver);