Changeset d900699 in mainline for uspace/srv/hid/input/port/pl050.c

Timestamp:

2011-06-17T16:48:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/pl050.c (moved) (moved from uspace/srv/hid/kbd/port/pl050.c ) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2009 Vineeth Pillai
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +47 @@
 #include <errno.h>
 
+static int pl050_port_init(kbd_dev_t *);
+static void pl050_port_yield(void);
+static void pl050_port_reclaim(void);
+static void pl050_port_write(uint8_t data);
+
+kbd_port_ops_t pl050_port = {
+        .init = pl050_port_init,
+        .yield = pl050_port_yield,
+        .reclaim = pl050_port_reclaim,
+        .write = pl050_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+
 #define PL050_STAT_RXFULL  (1 << 4)
 
@@ -82 +97 @@
 static void pl050_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
-int kbd_port_init(void)
+static int pl050_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+        
         sysarg_t addr;
         if (sysinfo_get_value("kbd.address.status", &addr) != EOK)
@@ -105 +122 @@
 }
 
-void kbd_port_yield(void)
+static void pl050_port_yield(void)
 {
 }
 
-void kbd_port_reclaim(void)
+static void pl050_port_reclaim(void)
 {
 }
 
-void kbd_port_write(uint8_t data)
+static void pl050_port_write(uint8_t data)
 {
         (void) data;
@@ -122 +139 @@
         int scan_code = IPC_GET_ARG2(*call);
 
-        kbd_push_scancode(scan_code);
+        kbd_push_scancode(kbd_dev, scan_code);
         return;
 }