tunis/HhhOS
2
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

disable ahci cause broken

Browse source
This commit is contained in:
hippoz 2020-12-14 21:40:06 +02:00
parent eec6b437ad
commit 7e41a179db
Signed by untrusted user who does not match committer: hippoz
GPG key ID: 7C52899193467641
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -16,7 +16,7 @@ ISO = build/HhhOS.iso
DIRS = build build/boot build/std build/drivers build/drivers/terminal build/drivers/idt build/drivers/device build/drivers/keyboard build/drivers/pic build/drivers/ahci
OBJS = build/boot/boot.o build/boot/kernel.o build/std/string.o build/drivers/terminal/terminal.o build/drivers/idt/idt.o \
build/drivers/idt/isr.o build/std/util.o build/drivers/device/device.o build/drivers/keyboard/keyboard.o build/drivers/pic/pic.o build/drivers/ahci/ahci.o
build/drivers/idt/isr.o build/std/util.o build/drivers/device/device.o build/drivers/keyboard/keyboard.o build/drivers/pic/pic.o
ARCHDIR = arch/$(ARCH)/

8
arch/i386/boot/kernel.c
View file

@ -4,7 +4,6 @@
#include <drivers/keyboard/keyboard.h>
#include <drivers/pic/pic.h>
#include <drivers/device/device.h>
#include <drivers/ahci/ahci.h>
/* Check if the compiler thinks you are targeting the wrong operating system. */
#if defined(__linux__)
@ -29,9 +28,6 @@ void kmain() {
int keyboard_descriptor = keyboard_init();
terminal_writestring("done, descriptor: ");
terminal_writeline(itoa(keyboard_descriptor));
terminal_writestring("Preparing AHCI... ");
ahci_init();
terminal_writestring("Are interrupts enabled? ");
if (are_interrupts_enabled() == 1) {
@ -46,8 +42,8 @@ void kmain() {
terminal_writeline("no");
}
//terminal_writestring("kmain memory address: ");
//terminal_writeline(itoa(kmain));
terminal_writestring("kmain memory address: ");
terminal_writeline(itoa(kmain));
terminal_writeline("----------");