diff options
author | Benji Dial <benji6283@gmail.com> | 2021-02-19 22:24:08 -0500 |
---|---|---|
committer | Benji Dial <benji6283@gmail.com> | 2021-02-19 22:24:08 -0500 |
commit | eae7442610215e55ea350c65aab4ab3869111014 (patch) | |
tree | 601aa476e52a5e3bb3b352df7e781d3aa11c090b /src/kernel/main.c | |
parent | cba9eec34b205c760f16f7171b58bfc906723b72 (diff) | |
download | portland-os-eae7442610215e55ea350c65aab4ab3869111014.tar.gz |
kernel settings file
Diffstat (limited to 'src/kernel/main.c')
-rw-r--r-- | src/kernel/main.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/kernel/main.c b/src/kernel/main.c index 43778d4..7e49049 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -1,4 +1,4 @@ -#include <stdint.h> +#include "settings.h" #include "paging.h" #include "serial.h" #include "window.h" @@ -17,6 +17,8 @@ #include "pci.h" #include "vbe.h" +#include <stdint.h> + void _start_user_mode() __attribute__ ((noreturn)); __attribute__ ((noreturn)) @@ -25,7 +27,6 @@ void main() { init_paging(); init_tasks(); init_serial(); - pci_init(); init_fat(); @@ -37,10 +38,10 @@ void main() { //other drive drivers init_log(); + init_settings(); init_kbd(); init_idt(); - init_win(); logf(LOG_INFO, "Kernel initialization done."); |