Changeset 7919cd5 in mainline

Timestamp:

2009-02-21T21:15:33Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d063365

Parents:

e78136a

Message:

Unbreak ppc32 candidate.

Location:

kernel/arch/ppc32

Files:

• include/drivers/cuda.h (modified) (1 diff)
• src/drivers/cuda.c (modified) (3 diffs)
• src/ppc32.c (modified) (2 diffs)

kernel/arch/ppc32/include/drivers/cuda.h

@@ -41 +41 @@
 extern void cuda_init(devno_t devno, uintptr_t base, size_t size);
 extern int cuda_get_scancode(void);
-extern void cuda_grab(void);
-extern void cuda_release(void);
 
 #endif

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

@@ -34 +34 @@
 
 #include <arch/drivers/cuda.h>
-#include <ipc/irq.h>
 #include <arch/asm.h>
 #include <console/console.h>
@@ -252 +251 @@
 static void cuda_irq_handler(irq_t *irq)
 {
-        if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-                ipc_irq_send_notif(irq);
-        else {
-                int scan_code = cuda_get_scancode();
+        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]);
-                }
+        if (scan_code != -1) {
+                uint8_t scancode = (uint8_t) scan_code;
+                if ((scancode & 0x80) != 0x80)
+                        chardev_push_character(&kbrd, lchars[scancode & 0x7f]);
         }
 }
@@ -269 +264 @@
         return IRQ_ACCEPT;
 }
-
-
-/** Initialize keyboard and service interrupts using kernel routine */
-void cuda_grab(void)
-{
-        if (cuda) {
-                ipl_t ipl = interrupts_disable();
-                spinlock_lock(&cuda_irq.lock);
-                cuda_irq.notif_cfg.notify = false;
-                spinlock_unlock(&cuda_irq.lock);
-                interrupts_restore(ipl);
-        }
-}
-
-
-/** Resume the former interrupt vector */
-void cuda_release(void)
-{
-        if (cuda) {
-                ipl_t ipl = interrupts_disable();
-                spinlock_lock(&cuda_irq.lock);
-                if (cuda_irq.notif_cfg.answerbox)
-                        cuda_irq.notif_cfg.notify = true;
-                spinlock_unlock(&cuda_irq.unlock);
-                interrupts_restore(ipl);
-        }
-}
-
 
 void cuda_init(devno_t devno, uintptr_t base, size_t size)

kernel/arch/ppc32/src/ppc32.c

@@ -157 +157 @@
 {
         fb_redraw();
-        cuda_grab();
 }
 
@@ -165 +164 @@
 void arch_release_console(void)
 {
-        cuda_release();
 }