Changeset 154 for trunk/hal/x86_64/core/hal_interrupt.c

Timestamp:

Jul 7, 2017, 9:16:50 AM (7 years ago)

Author:

max@…

Message:

use a demultiplexer to get the channel on the serial port, and
make x86_printf print both on the VGA and COM1

File:

• trunk/hal/x86_64/core/hal_interrupt.c (modified) (1 diff)

trunk/hal/x86_64/core/hal_interrupt.c

@@ -49 +49 @@
 void hal_com1_intr(struct trapframe *tf)
 {
-        char c = hal_com_read();
+        static char prev;
+        uint8_t chan;
+        char c;
 
-        x86_printf("-> got com '%c'\n", c);
+        if (prev & 0x80) {
+                /* the previous char was the channel number (tty) */
+                c = hal_com_read();
+                chan = prev & 0x7F;
+                x86_printf("-> got com [%z,'%c']\n", (uint64_t)chan, c);
+                prev = 0;
+        } else {
+                prev = hal_com_read();
+        }
+
         return;
 }