Merge pull request #125 from ReturnInfinity/kvm

KVM and serial additions

Author: IanSeyler

src/drivers.asm

@@ -8,10 +8,10 @@
 
 ; Internal
 %include "drivers/apic.asm"
-%include "drivers/hpet.asm"
 %include "drivers/ioapic.asm"
 %include "drivers/ps2.asm"
 %include "drivers/serial.asm"
+%include "drivers/timer.asm"
 %ifndef NO_VIRTIO
 %include "drivers/virtio.asm"
 %endif

src/drivers/hpet.asm

@@ -10,11 +10,17 @@
 serial_init:
 	; Pure64 has already initialized the serial port
 
+	; Check if we booted via BIOS
+	cmp byte [os_boot_mode], 'B'
+	je serial_init_skip_arch	; If so, skip the IAPC_BOOT_ARCH check
+
 	; Check if Serial is present via ACPI IAPC_BOOT_ARCH
 	mov ax, [os_boot_arch]
 	bt ax, 0			; LEGACY_DEVICES
 	jnc serial_init_error
 
+serial_init_skip_arch:
+
 	; Set flag that Serial was enabled
 	or qword [os_SysConfEn], 1 << 2
 
@@ -35,6 +41,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
 ; -----------------------------------------------------------------------------