Changeset d0688a3 in mainline

Timestamp:

2009-03-13T10:08:39Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

afdce6eb

Parents:

449d4ecc

Message:

bring back kernel HID on ppc32
this concludes the transition from chardev_t to indev_t and outdev_t

Files:

• HelenOS.config (modified) (2 diffs)
• defaults/ppc32/Makefile.config (modified) (1 diff)
• kernel/arch/ppc32/src/drivers/cuda.c (modified) (4 diffs)
• kernel/arch/ppc32/src/ppc32.c (modified) (3 diffs)

HelenOS.config

@@ -342 +342 @@
 @ "generic" Monitor or serial line
 @ "none" No output device
-! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)] CONFIG_HID_OUT (choice)
+! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ppc32|(PLATFORM=ia64&MACHINE=i460GX)|(PLATFORM=mips32&MACHINE=msim)] CONFIG_HID_OUT (choice)
 
 % Output device class
@@ -410 +410 @@
 
 % Framebuffer support
-! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64)] CONFIG_FB (y/n)
+! [CONFIG_HID_OUT=generic&(PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ppc32)] CONFIG_FB (y/n)
 
 % Framebuffer support

defaults/ppc32/Makefile.config

@@ -23 +23 @@
 CONFIG_TEST = y
 
-# Input device class
-CONFIG_HID_IN = keyboard
-
 # Output device class
-CONFIG_HID_OUT = monitor
+CONFIG_HID_OUT = generic
 
 # Framebuffer support

kernel/arch/ppc32/src/drivers/cuda.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ppc32   
+/** @addtogroup ppc32
  * @{
  */
@@ -205 +205 @@
 
 
-/* Called from getc(). */
-static void cuda_resume(chardev_t *d)
-{
-}
-
-
-/* Called from getc(). */
-static void cuda_suspend(chardev_t *d)
-{
-}
-
-
-static char key_read(chardev_t *d)
-{
-        char ch;
-        
-        ch = 0;
-        return ch;
-}
-
-
-static chardev_t kbrd;
-static chardev_operations_t ops = {
-        .suspend = cuda_suspend,
-        .resume = cuda_resume,
-        .read = key_read
+static indev_t kbrd;
+static indev_operations_t ops = {
+        .poll = NULL
 };
 
@@ -252 +229 @@
 {
         int scan_code = cuda_get_scancode();
-                
+        
         if (scan_code != -1) {
                 uint8_t scancode = (uint8_t) scan_code;
                 if ((scancode & 0x80) != 0x80)
-                        chardev_push_character(&kbrd, lchars[scancode & 0x7f]);
+                        indev_push_character(&kbrd, lchars[scancode & 0x7f]);
         }
 }
@@ -269 +246 @@
         cuda = (uint8_t *) hw_map(base, size);
         
-        chardev_initialize("cuda_kbd", &kbrd, &ops);
+        indev_initialize("cuda_kbd", &kbrd, &ops);
         stdin = &kbrd;
         

kernel/arch/ppc32/src/ppc32.c

@@ -80 +80 @@
 {
         if (config.cpu_active == 1) {
+
+#ifdef CONFIG_FB
                 /* Initialize framebuffer */
                 if (bootinfo.screen.addr) {
@@ -110 +112 @@
                         fb_init(&prop);
                 }
+#endif
                 
                 /* Initialize IRQ routing */
@@ -160 +163 @@
 void arch_grab_console(void)
 {
+#ifdef CONFIG_FB
         fb_redraw();
+#endif
 }