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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 #include <bool.h>
 
+static int ski_port_init(kbd_dev_t *);
+static void ski_port_yield(void);
+static void ski_port_reclaim(void);
+static void ski_port_write(uint8_t data);
+
+kbd_port_ops_t ski_port = {
+        .init = ski_port_init,
+        .yield = ski_port_yield,
+        .reclaim = ski_port_reclaim,
+        .write = ski_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+
 #define SKI_GETCHAR             21
 
@@ -55 +69 @@
 
 /** Initialize Ski port driver. */
-int kbd_port_init(void)
+static int ski_port_init(kbd_dev_t *kdev)
 {
         thread_id_t tid;
         int rc;
+
+        kbd_dev = kdev;
 
         rc = thread_create(ski_thread_impl, NULL, "kbd_poll", &tid);
@@ -68 +84 @@
 }
 
-void kbd_port_yield(void)
+static void ski_port_yield(void)
 {
         polling_disabled = true;
 }
 
-void kbd_port_reclaim(void)
+static void ski_port_reclaim(void)
 {
         polling_disabled = false;
 }
 
-void kbd_port_write(uint8_t data)
+static void ski_port_write(uint8_t data)
 {
         (void) data;
@@ -94 +110 @@
                         if (c == 0)
                                 break;
-                        kbd_push_scancode(c);
+                        kbd_push_scancode(kbd_dev, c);
                 }
 
@@ -112 +128 @@
         uint64_t ch;
         
+#ifdef UARCH_ia64
         asm volatile (
                 "mov r15 = %1\n"
@@ -121 +138 @@
                 : "r15", "r8"
         );
-
+#else
+        ch = 0;
+#endif
         return (int32_t) ch;
 }