Changeset ccd1a14 in mainline for uspace/srv/kbd/port

Timestamp:

2009-04-25T11:54:17Z (17 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

9701d49

Parents:

ebfabf6

Message:

Stop userspace kbd driver from polling when switching to kcon. Also, fix swapped reversed enabling/disabling of polling in kernel sgcn and ski drivers.

Location:

uspace/srv/kbd/port

Files:

• dummy.c (modified) (1 diff)
• gxemul.c (modified) (1 diff)
• i8042.c (modified) (1 diff)
• msim.c (modified) (1 diff)
• ns16550.c (modified) (1 diff)
• sgcn.c (modified) (1 diff)
• ski.c (modified) (4 diffs)
• sun.c (modified) (1 diff)
• z8530.c (modified) (1 diff)

uspace/srv/kbd/port/dummy.c

@@ -43 +43 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 /** @}
 */

uspace/srv/kbd/port/gxemul.c

@@ -70 +70 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 /** Process data sent when a key is pressed.
  *  

uspace/srv/kbd/port/i8042.c

@@ -152 +152 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 static void i8042_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {

uspace/srv/kbd/port/msim.c

@@ -70 +70 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
         int scan_code = IPC_GET_ARG2(*call);
-//      static int esc_count=0;
-
-//      if (scan_code == 0x1b) {
-//              esc_count++;
-//              if (esc_count == 3)
-//                      __SYSCALL0(SYS_DEBUG_ENABLE_CONSOLE);
-//      } else {
-//              esc_count=0;
-//      }
-
-//      if (fb_fb)
-//              return kbd_arch_process_fb(keybuffer, scan_code);
-
         kbd_push_scancode(scan_code);
 }

uspace/srv/kbd/port/ns16550.c

@@ -107 +107 @@
 }
 
+void ns16550_port_yield(void)
+{
+}
+
+void ns16550_port_reclaim(void)
+{
+}
+
 static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {

uspace/srv/kbd/port/sgcn.c

@@ -121 +121 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 /**
  * Handler of the "key pressed" event. Reads codes of all the pressed keys from

uspace/srv/kbd/port/ski.c

@@ -43 +43 @@
 #include <sys/types.h>
 #include <thread.h>
+#include <bool.h>
 
 #define SKI_GETCHAR             21
@@ -50 +51 @@
 static void *ski_thread_impl(void *arg);
 static int32_t ski_getchar(void);
+
+static volatile bool polling_disabled = false;
 
 /** Initialize Ski port driver. */
@@ -65 +68 @@
 }
 
+void kbd_port_yield(void)
+{
+        polling_disabled = true;
+}
+
+void kbd_port_reclaim(void)
+{
+        polling_disabled = false;
+}
+
 /** Thread to poll Ski for keypresses. */
 static void *ski_thread_impl(void *arg)
@@ -72 +85 @@
 
         while (1) {
-                while (1) {
+                while (polling_disabled == false) {
                         c = ski_getchar();
                         if (c == 0)

uspace/srv/kbd/port/sun.c

@@ -63 +63 @@
 }
 
+void kbd_port_yield(void)
+{
+}
+
+void kbd_port_reclaim(void)
+{
+}
+
 /** @}
 */

uspace/srv/kbd/port/z8530.c

@@ -96 +96 @@
 }
 
+void z8530_port_yield(void)
+{
+}
+
+void z8530_port_reclaim(void)
+{
+}
+
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {