Changeset 154

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

Location:

trunk/hal/x86_64/core

Files:

• hal_apic.c (modified) (2 diffs)
• hal_apic.h (modified) (1 diff)
• hal_init.c (modified) (1 diff)
• hal_interrupt.c (modified) (1 diff)
• x86_printf.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_apic.c

@@ -179 +179 @@
 }
 
-void hal_com_send(char c)
+void hal_com_send(uint8_t chan, char c)
 {
         uint8_t mcr = in8(RS232_COM1_BASE + RS232_MCR);
@@ -185 +185 @@
 
         while (!hal_com_transmit_empty());
+        out8(RS232_COM1_BASE + RS232_DATA, chan | 0x80);
         out8(RS232_COM1_BASE + RS232_DATA, c);
 
         out8(RS232_COM1_BASE + RS232_MCR, mcr);
+}
+
+/*
+ * Called early to provide x86-specific messages. Interrupts disabled.
+ */
+void hal_com_init_early()
+{
+        /* Disable all interrupts */
+        out8(RS232_COM1_BASE + RS232_IER, 0x00);
+
+        /* Set baudrate */
+        out8(RS232_COM1_BASE + RS232_LCR, LCR_DLAB);
+        out8(RS232_COM1_BASE + RS232_DIVLO, BAUDRATE_DIV);
+        out8(RS232_COM1_BASE + RS232_DIVHI, 0);
+
+        /* 8bits, no parity, one stop bit */
+        out8(RS232_COM1_BASE + RS232_LCR, LCR_DATA8);
+
+        /* DTR set, and also DSR */
+        out8(RS232_COM1_BASE + RS232_MCR, MCR_DTR|MCR_IR);
+        out8(RS232_COM1_BASE + RS232_MSR, MSR_DSR);
 }
 

trunk/hal/x86_64/core/hal_apic.h

@@ -22 +22 @@
 #ifndef x86_ASM
 char hal_com_read();
-void hal_com_send(char c);
+void hal_com_send(uint8_t chan, char c);
+void hal_com_init_early();
 
 void hal_ioapic_disable_entry(uint8_t index);

trunk/hal/x86_64/core/hal_init.c

@@ -254 +254 @@
         boot_info_t btinfo;
 
+        /* Initialize the serial port */
+        hal_com_init_early();
+
         x86_printf("[+] init_x86_64 called\n");
 

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;
 }

trunk/hal/x86_64/core/x86_printf.c

@@ -23 +23 @@
 #include <hal_boot.h>
 #include <hal_internal.h>
+#include <hal_apic.h>
 
 #include <memcpy.h>
@@ -75 +76 @@
 void x86_putc(char c)
 {
+        hal_com_send(0, c);
+
         if (c == '\n') {
                 cons_ptr = roundup(cons_ptr, CONS_X_SIZE * 2);