diff options
Diffstat (limited to 'dev/ZBA')
| -rw-r--r-- | dev/ZBA/Sources/HEL/AMD64/BootMain.cxx | 13 | ||||
| -rw-r--r-- | dev/ZBA/amd64-efi.make | 2 |
2 files changed, 7 insertions, 8 deletions
diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx index 9cccc922..3e78414c 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx @@ -211,11 +211,10 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, handoverHdrPtr->f_BitMapStart = 0; - while (BS->AllocatePool(EfiRuntimeServicesData, kHandoverHeapSz, &handoverHdrPtr->f_BitMapStart) != kEfiOk) + while (BS->AllocatePool(EfiRuntimeServicesData, kHandoverBitMapSz, &handoverHdrPtr->f_BitMapStart) != kEfiOk) ; - handoverHdrPtr->f_VirtualSize = - Descriptor[cDefaultMemoryMap].NumberOfPages; /* # of pages */ + handoverHdrPtr->f_BitMapSize = kHandoverBitMapSz; /* # of pages */ handoverHdrPtr->f_FirmwareCustomTables[0] = (VoidPtr)BS; handoverHdrPtr->f_FirmwareCustomTables[1] = (VoidPtr)ST; @@ -291,13 +290,13 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, urbanistTTF.Blob()) { handoverHdrPtr->f_StartupChime = chimeWav.Blob(); - handoverHdrPtr->f_ChimeSz = chimeWav.Size(); + handoverHdrPtr->f_ChimeSz = chimeWav.Size(); handoverHdrPtr->f_StartupImage = readerSysDrv.Blob(); - handoverHdrPtr->f_StartupSz = readerSysDrv.Size(); + handoverHdrPtr->f_StartupSz = readerSysDrv.Size(); handoverHdrPtr->f_KernelImage = readerKernel.Blob(); - handoverHdrPtr->f_KernelSz = readerKernel.Size(); + handoverHdrPtr->f_KernelSz = readerKernel.Size(); handoverHdrPtr->f_TTFallbackFont = urbanistTTF.Blob(); - handoverHdrPtr->f_FontSz = urbanistTTF.Size(); + handoverHdrPtr->f_FontSz = urbanistTTF.Size(); } else { diff --git a/dev/ZBA/amd64-efi.make b/dev/ZBA/amd64-efi.make index 1f8bf1b1..0e159c41 100644 --- a/dev/ZBA/amd64-efi.make +++ b/dev/ZBA/amd64-efi.make @@ -36,7 +36,7 @@ EMU_FLAGS=-net none -m 8G -M q35 \ file=fat:rw:Sources/Root/,index=2,format=raw \ -drive id=disk_2,file=$(IMG_2),if=none \ -device ahci,id=ahci \ - -device ide-hd,drive=disk_2,bus=ahci.0 -serial stdio -no-reboot + -device ide-hd,drive=disk_2,bus=ahci.0 -d int -no-reboot -no-shutdown LD_FLAGS=-e Main --subsystem=10 |