From 44a080365293be62538b056dcd135ca673ebc5db Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 31 Jan 2025 12:10:05 +0100 Subject: ADD: Disk Driver has been reverted, working on that version now. Signed-off-by: Amlal El Mahrouss --- dev/Boot/amd64-desktop.make | 4 ++-- dev/Boot/src/HEL/AMD64/BootATA.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'dev/Boot') diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make index c257243c..73d5a0cc 100644 --- a/dev/Boot/amd64-desktop.make +++ b/dev/Boot/amd64-desktop.make @@ -83,13 +83,13 @@ compile-amd64: .PHONY: run-efi-amd64-ahci run-efi-amd64-ahci: $(EMU) $(EMU_FLAGS) -M q35 -drive file=$(IMG),format=raw,if=none,id=disk \ - -device ich9-ahci,id=ahci \ + -device ahci,id=ahci \ -device ide-hd,drive=disk,bus=ahci.0 \ -s -S .PHONY: run-efi-amd64-ata run-efi-amd64-ata: - $(EMU) $(EMU_FLAGS) -M q35 -enable-kvm -device piix4-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -s -S + $(EMU) $(EMU_FLAGS) -M q35 -device piix4-ide,id=ide -drive id=disk,file=$(IMG),format=raw,if=none -device ide-hd,drive=disk,bus=ide.0 -s -S # img_2 is the rescue disk. img is the bootable disk, as provided by the Zeta specs. .PHONY: epm-img diff --git a/dev/Boot/src/HEL/AMD64/BootATA.cc b/dev/Boot/src/HEL/AMD64/BootATA.cc index ca0f79e6..9b649b36 100644 --- a/dev/Boot/src/HEL/AMD64/BootATA.cc +++ b/dev/Boot/src/HEL/AMD64/BootATA.cc @@ -124,7 +124,7 @@ Void boot_ata_read(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + SectorSz) / SectorSz)); - rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + rt_out8(IO + ATA_REG_LBA0, (Lba)&0xFF); rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8); rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); @@ -154,7 +154,7 @@ Void boot_ata_write(UInt64 Lba, UInt16 IO, UInt8 Master, CharacterTypeUTF8* Buf, rt_out8(IO + ATA_REG_SEC_COUNT0, ((Size + (SectorSz)) / SectorSz)); - rt_out8(IO + ATA_REG_LBA0, (Lba) & 0xFF); + rt_out8(IO + ATA_REG_LBA0, (Lba)&0xFF); rt_out8(IO + ATA_REG_LBA1, (Lba) >> 8); rt_out8(IO + ATA_REG_LBA2, (Lba) >> 16); rt_out8(IO + ATA_REG_LBA3, (Lba) >> 24); -- cgit v1.2.3