diff options
Diffstat (limited to 'dev/boot/src')
| -rw-r--r-- | dev/boot/src/BootSupport.cc | 3 | ||||
| -rw-r--r-- | dev/boot/src/BootTextWriter.cc | 2 | ||||
| -rw-r--r-- | dev/boot/src/BootThread.cc | 5 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootATA.cc | 9 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootEFI.cc | 6 | ||||
| -rw-r--r-- | dev/boot/src/New+Delete.cc | 15 |
6 files changed, 25 insertions, 15 deletions
diff --git a/dev/boot/src/BootSupport.cc b/dev/boot/src/BootSupport.cc index f8a527d9..ade8ed01 100644 --- a/dev/boot/src/BootSupport.cc +++ b/dev/boot/src/BootSupport.cc @@ -58,9 +58,6 @@ EXTERN_C size_t strlen(const char* whatToCheck) /// @brief strcmp definition in C++. EXTERN_C int strcmp(const char* whatToCheck, const char* whatToCheckRight) { - if (!whatToCheck || *whatToCheck == 0) - return 0; - SizeT len = 0; while (whatToCheck[len] == whatToCheckRight[len]) diff --git a/dev/boot/src/BootTextWriter.cc b/dev/boot/src/BootTextWriter.cc index 0b132f83..95e248a2 100644 --- a/dev/boot/src/BootTextWriter.cc +++ b/dev/boot/src/BootTextWriter.cc @@ -157,7 +157,7 @@ Boot::BootTextWriter& Boot::BootTextWriter::_Write(const UInt64& x) return *this; } - if (y < 0) + if (y == ~0UL) y = -y; const char cNumbers[] = "0123456789ABCDEF"; diff --git a/dev/boot/src/BootThread.cc b/dev/boot/src/BootThread.cc index ee70812f..ce691f96 100644 --- a/dev/boot/src/BootThread.cc +++ b/dev/boot/src/BootThread.cc @@ -25,7 +25,7 @@ namespace Boot EXTERN_C Int32 rt_jump_to_address(VoidPtr code, HEL::BootInfoHeader* handover, UInt8* stack); BootThread::BootThread(VoidPtr blob) - : fBlob(blob), fStartAddress(nullptr) + : fStartAddress(nullptr), fBlob(blob) { // detect the format. const Char* blob_bytes = reinterpret_cast<char*>(fBlob); @@ -84,7 +84,6 @@ namespace Boot constexpr auto sectionForCode = ".text"; constexpr auto sectionForBootZ = ".ldr"; - constexpr auto sectionForBSS = ".bss"; for (SizeT sectIndex = 0; sectIndex < numSecs; ++sectIndex) { @@ -168,6 +167,8 @@ namespace Boot Int32 BootThread::Start(HEL::BootInfoHeader* handover, Bool own_stack) { HEL::HandoverProc err_fn = [](HEL::BootInfoHeader* rcx) -> Int32 { + NE_UNUSED(rcx); + fb_render_string("BootZ: Invalid Boot Image...", 50, 10, RGB(0xFF, 0xFF, 0xFF)); ::Boot::Stop(); diff --git a/dev/boot/src/HEL/AMD64/BootATA.cc b/dev/boot/src/HEL/AMD64/BootATA.cc index a172e4cb..8b1b5a0a 100644 --- a/dev/boot/src/HEL/AMD64/BootATA.cc +++ b/dev/boot/src/HEL/AMD64/BootATA.cc @@ -23,10 +23,9 @@ using namespace Boot; -#define kATADataLen 256 +#define kATADataLen (256) static Boolean kATADetected = false; -static Int32 kATADeviceType = kATADeviceCount; static UInt16 kATAData[kATADataLen] = {0}; Boolean boot_ata_detected(Void); @@ -64,6 +63,8 @@ Void boot_ata_select(UInt16 Bus) Boolean boot_ata_init(UInt16 Bus, UInt8 Drive, UInt16& OutBus, UInt8& OutMaster) { + NE_UNUSED(Drive); + if (boot_ata_detected()) return true; @@ -214,7 +215,7 @@ BootDeviceATA::operator bool() @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, const SizeT& SectorSz) +BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { @@ -238,7 +239,7 @@ BootDeviceATA& BootDeviceATA::Read(CharacterTypeUTF8* Buf, const SizeT& SectorSz @param Sz Sector size @param Buf buffer */ -BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, const SizeT& SectorSz) +BootDeviceATA& BootDeviceATA::Write(CharacterTypeUTF8* Buf, SizeT SectorSz) { if (!boot_ata_detected()) { diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index 57651016..4220c6cb 100644 --- a/dev/boot/src/HEL/AMD64/BootEFI.cc +++ b/dev/boot/src/HEL/AMD64/BootEFI.cc @@ -86,10 +86,6 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr image_handle, new HEL::BootInfoHeader(); UInt32 map_key = 0; - UInt32 size_struct_ptr = 0; - EfiMemoryDescriptor* struct_ptr = nullptr; - UInt32 sz_desc = 0; - UInt32 rev_desc = 0; #ifdef ZBA_USE_FB if (!boot_init_fb()) @@ -222,7 +218,7 @@ EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr image_handle, FB::fb_clear_video(); - FBDrawBitMapInRegion(zka_has_disk, NE_HAS_DISK_WIDTH, NE_HAS_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_HAS_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_HAS_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2); fb_clear(); diff --git a/dev/boot/src/New+Delete.cc b/dev/boot/src/New+Delete.cc index 3e3cf48f..61698510 100644 --- a/dev/boot/src/New+Delete.cc +++ b/dev/boot/src/New+Delete.cc @@ -63,6 +63,21 @@ void operator delete(void* buf, size_t size) if (!buf) return; + NE_UNUSED(size); + + BS->FreePool(buf); +} + +/// @brief Deletes the object (array specific). +/// @param buf the object. +/// @param size it's size. +void operator delete[](void* buf, size_t size) +{ + if (!buf) + return; + + NE_UNUSED(size); + BS->FreePool(buf); } |