Changeset b1bdc7a4 in mainline for uspace/srv/hid/kbd/port/ski.c

Timestamp:

2011-06-11T19:48:15Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

56ad818

Parents:

774fc85

Message:

Control keyboard port modules through ops structures. Allows compiling in
all modules at the same time.

File:

• uspace/srv/hid/kbd/port/ski.c (modified) (5 diffs)

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

@@ -45 +45 @@
 #include <bool.h>
 
+static int ski_port_init(void);
+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
+};
+
 #define SKI_GETCHAR             21
 
@@ -55 +67 @@
 
 /** Initialize Ski port driver. */
-int kbd_port_init(void)
+static int ski_port_init(void)
 {
         thread_id_t tid;
@@ -68 +80 @@
 }
 
-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;
@@ -112 +124 @@
         uint64_t ch;
         
+#ifdef UARCH_ia64
         asm volatile (
                 "mov r15 = %1\n"
@@ -121 +134 @@
                 : "r15", "r8"
         );
-
+#else
+        ch = 0;
+#endif
         return (int32_t) ch;
 }