Changeset afc12d0 in mainline

Timestamp:

2006-06-06T17:08:10Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a175a67

Parents:

3dcb108

Message:

basic ppc32 keyboard

Files:

• Makefile (modified) (1 diff)
• arch/ppc32/include/boot/boot.h (modified) (1 diff)
• arch/ppc32/include/drivers/cuda.h (modified) (1 diff)
• arch/ppc32/src/drivers/cuda.c (modified) (4 diffs)
• arch/ppc32/src/ppc32.c (modified) (1 diff)

Makefile

@@ -81 +81 @@
 ifeq ($(CONFIG_VHPT),y)
         DEFS += -DCONFIG_VHPT
+endif
+ifeq ($(CONFIG_POWEROFF),y)
+        DEFS += -DCONFIG_POWEROFF
 endif
 ifeq ($(CONFIG_FB),y)

arch/ppc32/include/boot/boot.h

@@ -72 +72 @@
 
 typedef struct {
+        __address addr;
+        unsigned int size;
+} keyboard_t;
+
+typedef struct {
         taskmap_t taskmap;
         memmap_t memmap;
         screen_t screen;
+        keyboard_t keyboard;
 } bootinfo_t;
 

arch/ppc32/include/drivers/cuda.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <typedefs.h>
 
 #define CUDA_IRQ 10
 
-extern void cuda_init(void);
-extern void cuda_packet(const __u8 data);
+extern void cuda_init(__address base, size_t size);
 
 #endif

arch/ppc32/src/drivers/cuda.c

@@ -33 +33 @@
 #include <arch/drivers/pic.h>
 #include <interrupt.h>
+#include <stdarg.h>
 
-#define CUDA_PACKET 0x01
+#define PACKET_ADB  0x00
+#define PACKET_CUDA 0x01
+#define PACKET_NULL 0xff
+
 #define CUDA_POWERDOWN 0x0a
 
@@ -48 +52 @@
 
 
-static volatile __u8 *cuda = (__u8 *) 0xf2000000;
+static volatile __u8 *cuda = NULL;
+
+
+static char lchars[0x80] = {
+        'a',  's',  'd',  'f',  'h',  'g',  'z',  'x',  'c',  'v',    0,  'b',  'q',  'w',  'e',  'r',
+        'y',  't',  '1',  '2',  '3',  '4',  '6',  '5',  '=',  '9',  '7',  '-',  '8',  '0',  ']',  'o',
+        'u',  '[',  'i',  'p',   13,  'l',  'j', '\'',  'k',  ';', '\\',  ',',  '/',  'n',  'm',  '.',
+          9,   32,  '`',    8,    0,   27,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,  '.',    0,  '*',    0,  '+',    0,    0,    0,    0,    0,  '/',   13,    0,  '-',    0,
+          0,    0,  '0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',    0,  '8',  '9',    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0
+};
+
+
+static void send_packet(const __u8 kind, index_t count, ...)
+{
+        index_t i;
+        va_list va;
+        
+        switch (kind) {
+                case PACKET_NULL:
+                        break;
+                default:
+                        cuda[B] = cuda[B] | TIP;
+                        cuda[ACR] = cuda[ACR] | SR_OUT;
+                        cuda[SR] = kind;
+                        cuda[B] = cuda[B] & ~TIP;
+                        
+                        va_start(va, count);
+                        
+                        for (i = 0; i < count; i++) {
+                                cuda[ACR] = cuda[ACR] | SR_OUT;
+                                cuda[SR] = va_arg(va, int);
+                                cuda[B] = cuda[B] | TACK;
+                        }
+                        
+                        va_end(va);
+                        
+                        cuda[B] = cuda[B] | TIP;
+        }
+}
+
+
+static void receive_packet(__u8 *kind, index_t count, __u8 data[])
+{
+        cuda[B] = cuda[B] & ~TIP;
+        *kind = cuda[SR];
+        
+        index_t i;
+        for (i = 0; i < count; i++)
+                data[i] = cuda[SR];
+        
+        cuda[B] = cuda[B] | TIP;
+}
 
 
@@ -79 +137 @@
 };
 
-#include <print.h>
+
 static void cuda_irq(int n, istate_t *istate)
 {
-        printf("Got cuda msg\n");
+        __u8 kind;
+        __u8 data[4];
+        
+        receive_packet(&kind, 4, data);
+        
+        if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c)) {
+                __u8 key = data[2];
+                
+                if ((key & 0x80) != 0x80)
+                        chardev_push_character(&kbrd, lchars[key & 0x7f]);
+        }
 }
 
-void cuda_init(void)
+
+void cuda_init(__address base, size_t size)
 {
+        cuda = (__u8 *) hw_map(base, size);
+        
         int_register(CUDA_IRQ, "cuda", cuda_irq);
         pic_enable_interrupt(CUDA_IRQ);
@@ -95 +166 @@
 
 
-void cuda_packet(const __u8 data)
-{
-        cuda[B] = cuda[B] | TIP;
-        cuda[ACR] = cuda[ACR] | SR_OUT;
-        cuda[SR] = CUDA_PACKET;
-        cuda[B] = cuda[B] & ~TIP;
-        
-        cuda[ACR] = cuda[ACR] | SR_OUT;
-        cuda[SR] = data;
-        cuda[B] = cuda[B] | TACK;
-        
-        cuda[B] = cuda[B] | TIP;
-}
-
-
 void cpu_halt(void) {
 #ifdef CONFIG_POWEROFF
-        cuda_packet(CUDA_POWERDOWN);
+        send_packet(PACKET_CUDA, 1, CUDA_POWERDOWN);
 #else
+        send_packet(PACKET_NULL, 0);
+#endif
         asm volatile (
                 "b 0\n"
         );
-#endif
-        cpu_sleep();
 }

arch/ppc32/src/ppc32.c

@@ -69 +69 @@
                 /* Initialize PIC */
                 pic_init();
-        
-                cuda_init();
+                
+                cuda_init(bootinfo.keyboard.addr, bootinfo.keyboard.size);
+                
                 /* Merge all zones to 1 big zone */
                 zone_merge_all();