diff options
Diffstat (limited to 'dev/ZBA')
| -rw-r--r-- | dev/ZBA/Sources/HEL/AMD64/BootMain.cxx | 31 | ||||
| -rw-r--r-- | dev/ZBA/amd64-efi.make | 2 |
2 files changed, 17 insertions, 16 deletions
diff --git a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx index 7e85296f..2e20c5d3 100644 --- a/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx +++ b/dev/ZBA/Sources/HEL/AMD64/BootMain.cxx @@ -121,12 +121,12 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, // draw background color. // ------------------------------------------ // - handover_hdr->f_GOP.f_The = kGop->Mode->FrameBufferBase; - handover_hdr->f_GOP.f_Width = kGop->Mode->Info->VerticalResolution; - handover_hdr->f_GOP.f_Height = kGop->Mode->Info->HorizontalResolution; + handover_hdr->f_GOP.f_The = kGop->Mode->FrameBufferBase; + handover_hdr->f_GOP.f_Width = kGop->Mode->Info->VerticalResolution; + handover_hdr->f_GOP.f_Height = kGop->Mode->Info->HorizontalResolution; handover_hdr->f_GOP.f_PixelPerLine = kGop->Mode->Info->PixelsPerScanLine; - handover_hdr->f_GOP.f_PixelFormat = kGop->Mode->Info->PixelFormat; - handover_hdr->f_GOP.f_Size = kGop->Mode->FrameBufferSize; + handover_hdr->f_GOP.f_PixelFormat = kGop->Mode->Info->PixelFormat; + handover_hdr->f_GOP.f_Size = kGop->Mode->FrameBufferSize; // ------------------------------------------- // // Grab MP services, extended to runtime. // @@ -194,7 +194,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, for (; Descriptor[lookIndex].Kind != EfiMemoryType::EfiConventionalMemory; ++lookIndex) { - ; + ZKA_UNUSED(0); } cDefaultMemoryMap = lookIndex; @@ -213,7 +213,8 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, handover_hdr->f_FirmwareSpecific[HEL::kHandoverSpecificMemoryEfi] = (UIntPtr)Descriptor; - handover_hdr->f_BitMapStart = (VoidPtr)Descriptor[cDefaultMemoryMap].VirtualStart; + handover_hdr->f_BitMapStart = + (VoidPtr)Descriptor[cDefaultMemoryMap].VirtualStart; handover_hdr->f_BitMapSize = kHandoverBitMapSz; /* # of pages */ @@ -244,7 +245,7 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, handover_hdr->f_FirmwareVendorLen = BStrLen(SystemTable->FirmwareVendor); - handover_hdr->f_Magic = kHandoverMagic; + handover_hdr->f_Magic = kHandoverMagic; handover_hdr->f_Version = kHandoverVersion; // Provide fimware vendor name. @@ -290,14 +291,14 @@ EFI_EXTERN_C EFI_API Int Main(EfiHandlePtr ImageHandle, chimeWav.Blob() && urbanistTTF.Blob()) { - handover_hdr->f_StartupChime = chimeWav.Blob(); - handover_hdr->f_ChimeSz = chimeWav.Size(); - handover_hdr->f_StartupImage = readerSysDrv.Blob(); - handover_hdr->f_StartupSz = readerSysDrv.Size(); - handover_hdr->f_KernelImage = readerKernel.Blob(); - handover_hdr->f_KernelSz = readerKernel.Size(); + handover_hdr->f_StartupChime = chimeWav.Blob(); + handover_hdr->f_ChimeSz = chimeWav.Size(); + handover_hdr->f_StartupImage = readerSysDrv.Blob(); + handover_hdr->f_StartupSz = readerSysDrv.Size(); + handover_hdr->f_KernelImage = readerKernel.Blob(); + handover_hdr->f_KernelSz = readerKernel.Size(); handover_hdr->f_TTFallbackFont = urbanistTTF.Blob(); - handover_hdr->f_FontSz = urbanistTTF.Size(); + handover_hdr->f_FontSz = urbanistTTF.Size(); } else { diff --git a/dev/ZBA/amd64-efi.make b/dev/ZBA/amd64-efi.make index 5d5071e0..7695e240 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 -d int + -device ide-hd,drive=disk_2,bus=ahci.0 -d int -no-shutdown -no-reboot LD_FLAGS=-e Main --subsystem=10 |