Changeset 6495e71 in mainline

Timestamp:

2011-02-25T16:04:33Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

b4875e6

Parents:

6cbe7dad

Message:

Make interrupts compiletime option

Location:

uspace/drv/uhci-hcd

Files:

• main.c (modified) (5 diffs)
• uhci.c (modified) (2 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)
 {
@@ -69 +70 @@
         uhci_interrupt(hc, status);
 }
+#endif
 /*----------------------------------------------------------------------------*/
 #define CHECK_RET_RETURN(ret, message...) \
@@ -95 +97 @@
             io_reg_base, io_reg_size, irq);
 
+#ifdef USE_INTERRUPTS
         ret = pci_enable_interrupts(device);
         CHECK_RET_RETURN(ret, "Failed(%d) to get enable interrupts:\n", ret);
+#endif
 
         uhci_t *uhci_hc = malloc(sizeof(uhci_t));
@@ -114 +118 @@
          */
         device->driver_data = uhci_hc;
-
+#ifdef USE_INTERRUPTS
         ret = register_interrupt_handler(device, irq, irq_handler,
             &uhci_hc->interrupt_code);
@@ -123 +127 @@
                 return ret;
         }
+#endif
 
         ddf_fun_t *rh;

uspace/drv/uhci-hcd/uhci.c

@@ -141 +141 @@
 
         instance->cleaner = fibril_create(uhci_interrupt_emulator, instance);
-//      fibril_add_ready(instance->cleaner);
+#ifndef USE_INTERRUTPS
+        fibril_add_ready(instance->cleaner);
+#endif
 
         instance->debug_checker = fibril_create(uhci_debug_checker, instance);
@@ -294 +296 @@
                 uint16_t status = pio_read_16(&instance->registers->usbsts);
                 uhci_interrupt(instance, status);
+                pio_write_16(&instance->registers->usbsts, 0x1f);
                 async_usleep(UHCI_CLEANER_TIMEOUT);
         }