Add serial output

Author: Ian Seyler

src/drivers/serial.asm

@@ -11,9 +11,9 @@ serial_init:
 	; Pure64 has already initialized the serial port
 
 	; Check if Serial is present via ACPI IAPC_BOOT_ARCH
-	mov ax, [os_boot_arch]
-	bt ax, 0			; LEGACY_DEVICES
-	jnc serial_init_error
+;	mov ax, [os_boot_arch]
+;	bt ax, 0			; LEGACY_DEVICES
+;	jnc serial_init_error
 
 	; Set flag that Serial was enabled
 	or qword [os_SysConfEn], 1 << 2
@@ -35,6 +35,9 @@ serial_init:
 	out dx, al
 %endif
 
+	mov rax, b_output_serial
+	mov [0x100018], rax		; Set kernel b_output to the serial port
+
 serial_init_error:
 	ret
 ; -----------------------------------------------------------------------------

src/init/64.asm

@@ -105,12 +105,18 @@ make_interrupt_gate_stubs:
 	mov rax, 0x200000		; Stacks start at 2MiB
 	mov [os_StackBase], rax
 
+	; Configure the serial port (if present)
+	call serial_init
+
+	; Output progress via serial
+	mov rsi, msg_baremetal
+	call os_debug_string
+	mov rsi, msg_64
+	call os_debug_string
+
 	; Initialize text output
 %ifndef NO_LFB
 	call lfb_init			; Initialize LFB for text output
-%else
-	mov rax, b_output_serial
-	mov [0x100018], rax		; Set kernel b_output to the serial port
 %endif
 
 	; Initialize the APIC
@@ -144,13 +150,14 @@ skip_ap:
 	jmp next_ap
 no_more_aps:
 
-	; Configure the serial port
-	call serial_init
-
 	; Output block to screen (2/8)
 	mov ebx, 2
 	call os_debug_block
 
+	; Output progress via serial
+	mov rsi, msg_ok
+	call os_debug_string
+
 	ret
 ; -----------------------------------------------------------------------------
 

src/init/bus.asm

@@ -28,6 +28,10 @@
 
 ; -----------------------------------------------------------------------------
 init_bus:
+	; Output progress via serial
+	mov rsi, msg_bus
+	call os_debug_string
+
 	mov rdi, bus_table		; Address of Bus Table in memory
 	xor edx, edx			; Register 0 for Device ID/Vendor ID
 
@@ -156,6 +160,10 @@ init_bus_usb_not_found:
 	mov ebx, 6
 	call os_debug_block
 
+	; Output progress via serial
+	mov rsi, msg_ok
+	call os_debug_string
+
 	ret
 ; -----------------------------------------------------------------------------
 

src/init/net.asm

@@ -9,6 +9,10 @@
 ; -----------------------------------------------------------------------------
 ; init_net -- Configure the first network device it finds
 init_net:
+	; Output progress via serial
+	mov rsi, msg_net
+	call os_debug_string
+
 	mov ax, [NIC_DeviceVendor_ID]	; Check for NIC driver definitions
 	cmp ax, 0x0000
 	je init_net_end			; If none exist then bail out
@@ -114,6 +118,11 @@ init_net_end:
 	; Output block to screen (6/8)
 	mov ebx, 10
 	call os_debug_block
+
+	; Output progress via serial
+	mov rsi, msg_ok
+	call os_debug_string
+
 	ret
 ; -----------------------------------------------------------------------------
 

src/init/nvs.asm

@@ -9,6 +9,10 @@
 ; -----------------------------------------------------------------------------
 ; init_nvs -- Configure the first non-volatile storage device it finds
 init_nvs:
+	; Output progress via serial
+	mov rsi, msg_nvs
+	call os_debug_string
+
 %ifndef NO_NVME
 	; Check Bus Table for NVMe
 	mov rsi, bus_table		; Load Bus Table address to RSI
@@ -85,6 +89,10 @@ init_nvs_done:
 	mov ebx, 8
 	call os_debug_block
 
+	; Output progress via serial
+	mov rsi, msg_ok
+	call os_debug_string
+
 	ret
 ; -----------------------------------------------------------------------------
 

src/init/sys.asm

@@ -24,6 +24,10 @@ init_sys_done:
 	mov ebx, 14
 	call os_debug_block
 
+	; Output progress via serial
+	mov rsi, msg_ready
+	call os_debug_string
+
 	ret
 ; -----------------------------------------------------------------------------
 

src/syscalls/debug.asm

@@ -155,6 +155,31 @@ os_debug_space:
 ; -----------------------------------------------------------------------------
 
 
+; -----------------------------------------------------------------------------
+; os_debug_string - Dump a string to output
+; IN:	RSI = String Address (null terminated)
+os_debug_string:
+	push rdi
+	push rcx
+	push rax
+
+	xor ecx, ecx
+	xor eax, eax
+	mov rdi, rsi
+	not rcx
+	repne scasb			; compare byte at RDI to value in AL
+	not rcx
+	dec rcx
+
+	call b_output
+
+	pop rax
+	pop rcx
+	pop rdi
+	ret
+; -----------------------------------------------------------------------------
+
+
 ; -----------------------------------------------------------------------------
 ; os_debug_block - Create a block (8x8 pixels) of colour on the screen
 ; IN:	EBX = Index #

src/sysvar.asm

@@ -10,6 +10,13 @@
 newline:		db 13, 10, 0
 space:			db ' ', 0
 system_status_header:	db 'BareMetal v1.0.0', 0
+msg_baremetal:		db 13, 10, '[ BareMetal ]', 0
+msg_64:			db 13, 10, '64', 0
+msg_bus:		db 13, 10, 'bus', 0
+msg_nvs:		db 13, 10, 'nvs', 0
+msg_net:		db 13, 10, 'net', 0
+msg_ok:			db ' ok', 0
+msg_ready:		db 13, 10, 'system ready', 13, 10, 13, 10, 0
 
 ; Memory addresses