Changeset d900699 in mainline for uspace/srv/hid/input/port/sgcn.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/sgcn.c (moved) (moved from uspace/srv/hid/kbd/port/sgcn.c ) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2008 Pavel Rimsky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +47 @@
 #include <errno.h>
 
+static int sgcn_port_init(kbd_dev_t *);
+static void sgcn_port_yield(void);
+static void sgcn_port_reclaim(void);
+static void sgcn_port_write(uint8_t data);
+
+kbd_port_ops_t sgcn_port = {
+        .init = sgcn_port_init,
+        .yield = sgcn_port_yield,
+        .reclaim = sgcn_port_reclaim,
+        .write = sgcn_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+
 #define POLL_INTERVAL  10000
 
@@ -101 +116 @@
  * Maps the physical memory (SRAM) and creates the polling thread. 
  */
-int kbd_port_init(void)
-{
+static int sgcn_port_init(kbd_dev_t *kdev)
+{
+        kbd_dev = kdev;
+        
         sysarg_t sram_paddr;
         if (sysinfo_get_value("sram.address.physical", &sram_paddr) != EOK)
@@ -130 +147 @@
 }
 
-void kbd_port_yield(void)
+static void sgcn_port_yield(void)
 {
         polling_disabled = true;
 }
 
-void kbd_port_reclaim(void)
+static void sgcn_port_reclaim(void)
 {
         polling_disabled = false;
 }
 
-void kbd_port_write(uint8_t data)
+static void sgcn_port_write(uint8_t data)
 {
         (void) data;
@@ -167 +184 @@
                 buf_ptr = (volatile char *)
                         SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
-                kbd_push_scancode(c);
+                kbd_push_scancode(kbd_dev, c);
         }
 }