Changeset 0c33687a in mainline

Timestamp:

2009-02-21T20:51:30Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e78136a

Parents:

21df2e5

Message:

Unbreak mips32 candidate.

Files:

• kernel/arch/mips32/src/drivers/msim.c (modified) (2 diffs)
• kernel/arch/mips32/src/drivers/serial.c (modified) (2 diffs)
• uspace/srv/kbd/port/msim.c (modified) (1 diff)

kernel/arch/mips32/src/drivers/msim.c

@@ -34 +34 @@
 
 #include <interrupt.h>
-#include <ipc/irq.h>
 #include <console/chardev.h>
 #include <arch/drivers/msim.h>
@@ -96 +95 @@
 static void msim_irq_handler(irq_t *irq)
 {
-        if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-                ipc_irq_send_notif(irq);
-        else {
-                char ch = 0;
+        char ch = 0;
                 
-                ch = *((char *) MSIM_KBD_ADDRESS);
-                if (ch =='\r')
-                        ch = '\n';
-                if (ch == 0x7f)
-                        ch = '\b';
-                chardev_push_character(&console, ch);
-        }
+        ch = *((char *) MSIM_KBD_ADDRESS);
+        if (ch =='\r')
+                ch = '\n';
+        if (ch == 0x7f)
+                ch = '\b';
+        chardev_push_character(&console, ch);
 }
 

kernel/arch/mips32/src/drivers/serial.c

@@ -35 +35 @@
 #include <interrupt.h>
 #include <arch/cp0.h>
-#include <ipc/irq.h>
 #include <arch/drivers/serial.h>
 #include <console/chardev.h>
@@ -115 +114 @@
 static void serial_irq_handler(irq_t *irq)
 {
-        if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-                ipc_irq_send_notif(irq);
-        else
-                serial_handler();
+        serial_handler();
 }
 

uspace/srv/kbd/port/msim.c

@@ -41 +41 @@
 #include <kbd.h>
 
-irq_cmd_t msim_cmds[1] = {
-        { CMD_MEM_READ_1, (void *) 0, 0, 2 }
+irq_cmd_t msim_cmds[] = {
+        {
+                .cmd = CMD_PIO_READ_8,
+                .addr = (void *) 0,     /* will be patched in run-time */
+                .dstarg = 2
+        },
+        {
+                .cmd = CMD_ACCEPT
+        }
+        
 };
 
 irq_code_t msim_kbd = {
-        1,
+        sizeof(msim_cmds) / sizeof(irq_cmd_t),
         msim_cmds
 };