Changeset 9446f39 in mainline

Timestamp:

2009-02-21T19:22:54Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

bffa876e

Parents:

00eace3

Message:

Unreak arm32 (as far as breakage introduced by 3947 goes) and
adapt the uspace GXemul kbd IRQ driver to use the new pseudo code.

Files:

• kernel/arch/arm32/src/drivers/gxemul.c (modified) (1 diff)
• uspace/srv/kbd/port/gxemul.c (modified) (1 diff)

kernel/arch/arm32/src/drivers/gxemul.c

@@ -188 +188 @@
 static void gxemul_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 *) gxemul_hw_map.kbd);
-                if (ch == '\r') {
-                        ch = '\n';
-                }
-                if (ch == 0x7f) {
-                        ch = '\b';
-                }
-                chardev_push_character(&console, ch);
-        }
+        ch = *((char *) gxemul_hw_map.kbd);
+        if (ch == '\r') {
+                ch = '\n';
+        }
+        if (ch == 0x7f) {
+                ch = '\b';
+        }
+        chardev_push_character(&console, ch);
 }
 

uspace/srv/kbd/port/gxemul.c

@@ -43 +43 @@
 static irq_cmd_t gxemul_cmds[] = {
         { 
-                CMD_MEM_READ_1, 
-                (void *) 0, 
-                0, 
-                2
+                .cmd = CMD_PIO_READ_8, 
+                .addr = (void *) 0,     /* will be patched in run-time */
+                .dstarg = 2,
+        },
+        {
+                .cmd = CMD_ACCEPT
         }
 };
 
 static irq_code_t gxemul_kbd = {
-        1,
+        sizeof(gxemul_cmds) / sizeof(irq_cmd_t),
         gxemul_cmds
 };