Changeset 15d0046 in mainline for uspace/srv/hid/input/port/msim.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

File:

• uspace/srv/hid/input/port/msim.c (modified) (4 diffs)

uspace/srv/hid/input/port/msim.c

@@ -44 +44 @@
 
 static int msim_port_init(kbd_dev_t *);
-static void msim_port_yield(void);
-static void msim_port_reclaim(void);
 static void msim_port_write(uint8_t data);
 
 kbd_port_ops_t msim_port = {
         .init = msim_port_init,
-        .yield = msim_port_yield,
-        .reclaim = msim_port_reclaim,
         .write = msim_port_write
 };
@@ -82 +78 @@
 };
 
-static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call, void *arg)
+{
+        kbd_push_data(kbd_dev, IPC_GET_ARG2(*call));
+}
 
 static int msim_port_init(kbd_dev_t *kdev)
@@ -98 +97 @@
         msim_ranges[0].base = paddr;
         msim_cmds[0].addr = (void *) paddr;
-        async_set_interrupt_received(msim_irq_handler);
-        irq_register(inr, device_assign_devno(), 0, &msim_kbd);
+        async_irq_subscribe(inr, device_assign_devno(), msim_irq_handler, NULL,
+            &msim_kbd);
         
         return 0;
-}
-
-static void msim_port_yield(void)
-{
-}
-
-static void msim_port_reclaim(void)
-{
 }
 
@@ -117 +108 @@
 }
 
-static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call)
-{
-        kbd_push_data(kbd_dev, IPC_GET_ARG2(*call));
-}
-
 /** @}
  */