Changeset 732fd3c in mainline

Timestamp:

2006-06-06T23:03:42Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9ceaef4

Parents:

a175a67

Message:

ppc32 uspace keyboard support

Files:

• arch/ppc32/include/arch.h (modified) (1 diff)
• arch/ppc32/include/drivers/cuda.h (modified) (1 diff)
• arch/ppc32/src/drivers/cuda.c (modified) (3 diffs)
• arch/ppc32/src/drivers/pic.c (modified) (3 diffs)
• generic/include/ipc/irq.h (modified) (1 diff)
• generic/src/ipc/irq.c (modified) (1 diff)

arch/ppc32/include/arch.h

@@ -30 +30 @@
 #define __ppc32_ARCH_H__
 
+#include <arch/drivers/cuda.h>
+
 #endif

arch/ppc32/include/drivers/cuda.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <console/chardev.h>
 #include <typedefs.h>
 
 #define CUDA_IRQ 10
 
+chardev_t kbrd;
+
 extern void cuda_init(__address base, size_t size);
 

arch/ppc32/src/drivers/cuda.c

@@ -29 +29 @@
 #include <arch/drivers/cuda.h>
 #include <arch/asm.h>
-#include <console/chardev.h>
 #include <console/console.h>
 #include <arch/drivers/pic.h>
+#include <sysinfo/sysinfo.h>
 #include <interrupt.h>
 #include <stdarg.h>
@@ -130 +130 @@
 
 
-static chardev_t kbrd;
+chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = cuda_suspend,
@@ -163 +163 @@
         chardev_initialize("cuda_kbd", &kbrd, &ops);
         stdin = &kbrd;
+        
+        sysinfo_set_item_val("cuda", NULL, true);
+        sysinfo_set_item_val("cuda.irq", NULL, CUDA_IRQ);
 }
 

arch/ppc32/src/drivers/pic.c

@@ -47 +47 @@
                 pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
         } else {
-                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum-32));
+                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
         }
         
@@ -57 +57 @@
                 pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
         } else {
-                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum-32)));
+                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
         }
 }
@@ -66 +66 @@
                 pic[PIC_ACK_LOW] = 1 << intnum;
         else 
-                pic[PIC_ACK_HIGH] = 1 << (intnum-32);
+                pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
 }
 

generic/include/ipc/irq.h

@@ -50 +50 @@
         CMD_PORT_WRITE_1,
         CMD_IA64_GETCHAR,
+        CMD_PPC32_GETCHAR,
         CMD_LAST
 } irq_cmd_type;

generic/src/ipc/irq.c

@@ -108 +108 @@
                 case CMD_IA64_GETCHAR:
                         IPC_SET_ARG2(call->data, _getc(&ski_uconsole));
+                        break;
+#endif
+#if defined(ppc32) 
+                case CMD_PPC32_GETCHAR:
+                        IPC_SET_ARG2(call->data, _getc(&kbrd));
                         break;
 #endif