Changeset 154 for trunk/hal/x86_64/core/hal_apic.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_apic.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);
 }