os-k-team/os-k
os-k-team
/
os-k
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git
1
0
Fork 0
Code Releases Activity

misc correction

This commit is contained in:
Adrien Bourmault 2020-02-19 22:42:49 +01:00
parent 52aa9107ea
commit aea2f44700
No known key found for this signature in database
GPG Key ID: AFEE5788AEE3F4EC
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -291,21 +291,21 @@ test: all installonimage
run: test run: test
testnokvm: all installonimage testnokvm: all installonimage
@qemu-system-x86_64 -vga std -cpu $(cpu) -soundhw pcspk -s \ @qemu-system-x86_64 -vga std -cpu $(cpu) -machine type=q35 -soundhw pcspk -s \
-rtc base=localtime -m $(ram) -hda $(installdisk) \ -rtc base=localtime -m $(ram) -hda $(installdisk) \
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
testnosnd: all installonimage testnosnd: all installonimage
@qemu-system-x86_64 -vga std -enable-kvm -cpu host -s \ @qemu-system-x86_64 -vga std -enable-kvm -machine type=q35 -cpu host -s \
-rtc base=localtime -m $(ram) -hda $(installdisk) \ -rtc base=localtime -m $(ram) -hda $(installdisk) \
-d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & -d cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
test32: all installonimage test32: all installonimage
@qemu-system-i386 -m $(ram) -hda $(installdisk) -d \ @qemu-system-i386 -m $(ram) -hda $(installdisk) -machine type=q35 -d \
cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int 2> $(BUILDDIR)/qemu.log &
gdb: all installonimage gdb: all installonimage
@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -rtc base=localtime \ @setsid qemu-system-x86_64 -m $(ram) -enable-kvm -machine type=q35 -rtc base=localtime \
-hda $(installdisk) -no-reboot -no-shutdown -d \ -hda $(installdisk) -no-reboot -no-shutdown -d \
cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@gdb \ @gdb \
@ -315,13 +315,13 @@ gdb: all installonimage
-ex "break BtStartKern" \ -ex "break BtStartKern" \
ddd: all installonimage ddd: all installonimage
@setsid qemu-system-x86_64 -m $(ram) -enable-kvm -rtc base=localtime \ @setsid qemu-system-x86_64 -m $(ram) -enable-kvm -machine type=q35 -rtc base=localtime \
-hda $(installdisk) -no-reboot -no-shutdown -d \ -hda $(installdisk) -no-reboot -no-shutdown -d \
cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@ddd -n @ddd -n
gdbnokvm: all installonimage gdbnokvm: all installonimage
@setsid qemu-system-x86_64 -m $(ram) -rtc base=localtime \ @setsid qemu-system-x86_64 -m $(ram) -machine type=q35 -rtc base=localtime \
-hda $(installdisk) -no-reboot -no-shutdown -d \ -hda $(installdisk) -no-reboot -no-shutdown -d \
cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@gdb \ @gdb \
@ -331,7 +331,7 @@ gdbnokvm: all installonimage
-ex "break BtStartKern" \ -ex "break BtStartKern" \
dddnokvm: all installonimage dddnokvm: all installonimage
@setsid qemu-system-x86_64 -m $(ram) -rtc base=localtime \ @setsid qemu-system-x86_64 -m $(ram) -machine type=q35 -rtc base=localtime \
-hda $(installdisk) -no-reboot -no-shutdown -d \ -hda $(installdisk) -no-reboot -no-shutdown -d \
cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log & cpu_reset,guest_errors,pcall,int -s -S 2> $(BUILDDIR)/qemu.log &
@ddd -n @ddd -n

2
kaleid/drivers/ata.c
View File

@ -52,6 +52,6 @@ void IoDetectATA(void)
return; return;
} }
DebugLog("AHCI controller found ! PCI config addr = %p\n", DebugLog("AHCI controller found at PCI config addr = %p\n",
ataDevice->configAddr); ataDevice->configAddr);
} }