summaryrefslogtreecommitdiff
path: root/kernel/boot.s
diff options
context:
space:
mode:
authorJake Mannens <jake72360@gmail.com>2018-07-25 17:18:18 +1000
committerJake Mannens <jake72360@gmail.com>2018-07-25 17:18:18 +1000
commit9400716f56057d9f2fcd7f7ad033dfcb131105a2 (patch)
treeaf0e8a7fecf0231e8bd77e7470ad0d934b519778 /kernel/boot.s
parent45819c035d0b92275de68e559f066cbe50996926 (diff)
Added missing prototype for puts() in stdio.h.
Implemented a basic serial interface using COM0 which can be accessed with the system call sys_puts as well as the library functions rsputs() and rsprintf(). Renamed puts() in con.c to con_puts() and made the function static to avoid interference with the library function puts().
Diffstat (limited to 'kernel/boot.s')
-rw-r--r--kernel/boot.s4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/boot.s b/kernel/boot.s
index 21b248c..db846c9 100644
--- a/kernel/boot.s
+++ b/kernel/boot.s
@@ -7,6 +7,7 @@ extern hd_init
extern kmain
extern paging_init
extern printk
+extern serial_init
extern syscall_init
extern timer_init
extern traps_init
@@ -39,7 +40,8 @@ kboot:
push .msg
call printk
add esp, 4
- ; initialize the disk interface
+ ; initialize secondary subsystems
+ call serial_init
call hd_init
; last minute setup, then transfer to kmain
call timer_init