Changeset f0450658 in mainline

Timestamp:

2006-10-19T18:07:18Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8cee705

Parents:

3dea17f

Message:

ia64 work.
Move keyboard polling to a dedicated kernel thread.
Console initialization and console related sysinfo setup
can be now done in a single function.

Location:

kernel/arch/ia64

Files:

• include/ski/ski.h (modified) (1 diff)
• src/drivers/it.c (modified) (2 diffs)
• src/ia64.c (modified) (2 diffs)
• src/ski/ski.c (modified) (4 diffs)

kernel/arch/ia64/include/ski/ski.h

@@ -46 +46 @@
 
 extern void ski_init_console(void);
-extern void ski_set_console_sysinfo(void);
-extern void poll_keyboard(void);
 
 extern void ski_kbd_grab(void);
 extern void ski_kbd_release(void);
+
+extern void kkbdpoll(void *arg);
 
 #endif

kernel/arch/ia64/src/drivers/it.c

@@ -36 +36 @@
  
 #include <arch/drivers/it.h>
-#include <arch/ski/ski.h>
 #include <arch/interrupt.h>
 #include <arch/register.h>
@@ -117 +116 @@
         
         clock();
-        
-        /*
-         * This one is a good candidate for moving to a separate
-         * kernel thread private to ski.c
-         */
-        poll_keyboard();
 }
 

kernel/arch/ia64/src/ia64.c

@@ -87 +87 @@
         ski_init_console();
         it_init();      
-        ski_set_console_sysinfo();
 }
 
@@ -100 +99 @@
 void arch_post_smp_init(void)
 {
+        thread_t *t;
+
+        if (config.cpu_active == 1) {
+                /*
+                 * Create thread that polls keyboard.
+                 */
+                t = thread_create(kkbdpoll, NULL, TASK, 0, "kkbdpoll");
+                if (!t)
+                        panic("cannot create kkbdpoll\n");
+                thread_ready(t);
+        }
 }
 

kernel/arch/ia64/src/ski/ski.c

@@ -43 +43 @@
 #include <ddi/irq.h>
 #include <ipc/irq.h>
+#include <proc/thread.h>
 #include <synch/spinlock.h>
 #include <arch/asm.h>
@@ -124 +125 @@
 
 /** Ask keyboard if a key was pressed. */
-void poll_keyboard(void)
+static void poll_keyboard(void)
 {
         char ch;
@@ -225 +226 @@
         irq_register(&ski_kbd_irq);
 
-}
-
-/** Setup console sysinfo (i.e. Keyboard IRQ)
- *
- * Because sysinfo neads memory allocation/dealocation
- * this functions should be called separetely from init.
- *
- */
-void ski_set_console_sysinfo(void)
-{
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, SKI_KBD_INR);
@@ -259 +250 @@
 }
 
+
+#define POLL_INTERVAL           50000           /* 50 ms */
+
+/** Kernel thread for polling keyboard. */
+void kkbdpoll(void *arg)
+{
+        while (1) {
+                poll_keyboard();
+                thread_usleep(POLL_INTERVAL);
+        }
+}
+
 /** @}
  */