Changeset ae971b3e in mainline

Timestamp:

2006-06-06T23:26:46Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d667767

Parents:

9ceaef4

Message:

fixes

Files:

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

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);
+extern __u8 cuda_get_scancode(void);
 
 #endif

arch/ppc32/src/drivers/cuda.c

@@ -30 +30 @@
 #include <arch/asm.h>
 #include <console/console.h>
+#include <console/chardev.h>
 #include <arch/drivers/pic.h>
 #include <sysinfo/sysinfo.h>
@@ -37 +38 @@
 #define PACKET_ADB  0x00
 #define PACKET_CUDA 0x01
-#define PACKET_NULL 0xff
 
 #define CUDA_POWERDOWN 0x0a
@@ -67 +67 @@
 
 
-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;
-        }
-}
+void send_packet(const __u8 kind, index_t count, ...);
 
 
@@ -130 +104 @@
 
 
-chardev_t kbrd;
+static chardev_t kbrd;
 static chardev_operations_t ops = {
         .suspend = cuda_suspend,
@@ -138 +112 @@
 
 
-static void cuda_irq(int n, istate_t *istate)
+__u8 cuda_get_scancode(void)
 {
         __u8 kind;
@@ -145 +119 @@
         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]);
-        }
+        if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c))
+                return data[2];
+        
+        return 0;
+}
+
+
+static void cuda_irq(int n, istate_t *istate)
+{
+        __u8 scancode = cuda_get_scancode();
+        
+        if ((scancode != 0) && ((scancode & 0x80) != 0x80))
+                chardev_push_character(&kbrd, lchars[scancode & 0x7f]);
 }
 
@@ -169 +150 @@
 
 
+void send_packet(const __u8 kind, index_t count, ...)
+{
+        index_t i;
+        va_list va;
+        
+        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;
+}
+
+
 void cpu_halt(void) {
 #ifdef CONFIG_POWEROFF
         send_packet(PACKET_CUDA, 1, CUDA_POWERDOWN);
-#else
-        send_packet(PACKET_NULL, 0);
 #endif
         asm volatile (

generic/src/ipc/irq.c

@@ -67 +67 @@
 {
         int i;
-
+        
         if (!code)
                 return;
@@ -110 +110 @@
                         break;
 #endif
-#if defined(ppc32) 
+#if defined(ppc32)
                 case CMD_PPC32_GETCHAR:
-                        IPC_SET_ARG2(call->data, _getc(&kbrd));
+                        IPC_SET_ARG2(call->data, cuda_get_scancode());
                         break;
 #endif