Changeset 8e7c9fe in mainline for uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.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/hid/s3c24xx_ts/s3c24xx_ts.c (modified) (3 diffs)

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -72 +72 @@
 static void s3c24xx_ts_connection(ipc_callid_t iid, ipc_call_t *icall,
     void *arg);
-static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *);
 static void s3c24xx_ts_pen_down(s3c24xx_ts_t *ts);
 static void s3c24xx_ts_pen_up(s3c24xx_ts_t *ts);
@@ -138 +138 @@
             (void *) ts->paddr, inr);
 
-        async_set_interrupt_received(s3c24xx_ts_irq_handler);
-        irq_register(inr, device_assign_devno(), 0, &ts_irq_code);
+        async_irq_subscribe(inr, device_assign_devno(), s3c24xx_ts_irq_handler,
+            NULL, &ts_irq_code);
 
         s3c24xx_ts_wait_for_int_mode(ts, updn_down);
@@ -204 +204 @@
 
 /** Handle touchscreen interrupt */
-static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call)
+static void s3c24xx_ts_irq_handler(ipc_callid_t iid, ipc_call_t *call,
+    void *arg)
 {
         ts_updn_t updn;