From 6c7d60a690aa3358b3240ebdfdf1feb62956d747 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 11 Jan 2025 13:52:54 +0100 Subject: ADD: Fully implement final patent. Signed-off-by: Amlal El Mahrouss --- dev/Boot/BootKit/BootKit.h | 3 ++- dev/Boot/amd64-desktop.make | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'dev/Boot') diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index db21ba30..050d5929 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -345,7 +345,7 @@ namespace Boot part.Version = kNeFSVersionInteger; part.CatalogCount = blob_cnt; part.Kind = kNeFSHardDrive; - part.SectorSize = sizeof(NFS_ROOT_PARTITION_BLOCK); + part.SectorSize = 512; part.FreeCatalog = fDiskDev.GetSectorsCount() / sizeof(NFS_CATALOG_STRUCT); part.SectorCount = fDiskDev.GetSectorsCount(); part.FreeSectors = fDiskDev.GetSectorsCount(); @@ -377,6 +377,7 @@ namespace Boot epm_boot.FsVersion = kNeFSVersionInteger; epm_boot.LbaStart = kNeFSRootCatalogStartAddress; + epm_boot.LbaEnd = fDiskDev.GetDiskSize(); epm_boot.SectorSz = part.SectorSize; epm_boot.Kind = kEPMZkaOS; epm_boot.NumBlocks = part.CatalogCount; diff --git a/dev/Boot/amd64-desktop.make b/dev/Boot/amd64-desktop.make index 395b4e86..3fc704b6 100644 --- a/dev/Boot/amd64-desktop.make +++ b/dev/Boot/amd64-desktop.make @@ -31,7 +31,7 @@ IMG_2=epm-master-2.img EMU_FLAGS=-net none -smp 4 -m 8G -M q35 \ -bios $(BIOS) -drive \ file=fat:rw:src/Root/,index=2,format=raw \ - -monitor stdio + -serial stdio LD_FLAGS=-e Main --subsystem=10 @@ -44,7 +44,7 @@ REM_FLAG=-f FLAG_ASM=-f win64 FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__MINOSKRNL__ -D__ZBAOSLDR__ \ -DEFI_FUNCTION_WRAPPER -I./ -I../Kernel -I../ -c -nostdlib -fno-rtti -fno-exceptions \ - -std=c++20 -DBOOTZ_GPT_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT + -std=c++20 -DBOOTZ_GPT_SUPPORT -DBOOTZ_EPM_SUPPORT -D__HAVE_ZKA_APIS__ -DZBA_USE_FB -D__ZKA_AMD64__ -D__ZKA__ -DZKA_AUTO_FORMAT BOOTLOADER=zbaosldr.exe KERNEL=minoskrnl.exe -- cgit v1.2.3