Changeset 8e7c9fe in mainline for uspace/srv/hw/bus/cuda_adb/cuda_adb.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (3 diffs)

uspace/srv/hw/bus/cuda_adb/cuda_adb.c

@@ -55 +55 @@
 static void cuda_connection(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 static int cuda_init(void);
-static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg);
 
 static void cuda_irq_listen(void);
@@ -282 +282 @@
         cuda_irq_code.ranges[0].base = (uintptr_t) instance->cuda_physical;
         cuda_irq_code.cmds[0].addr = (void *) &((cuda_t *) instance->cuda_physical)->ifr;
-        async_set_interrupt_received(cuda_irq_handler);
-        irq_register(10, device_assign_devno(), 0, &cuda_irq_code);
+        async_irq_subscribe(10, device_assign_devno(), cuda_irq_handler, NULL,
+            &cuda_irq_code);
 
         /* Enable SR interrupt. */
@@ -295 +295 @@
 }
 
-static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+static void cuda_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
 {
         uint8_t rbuf[CUDA_RCV_BUF_SIZE];