From 9e746d42d2e3faa526f12ba222f5ee6924dd30f9 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 26 Dec 2025 10:08:33 +0100 Subject: feat! breaking API changes, use header guards and libSystem fixes. Signed-off-by: Amlal El Mahrouss --- src/boot/BootKit/BootThread.h | 5 ++++- src/boot/BootKit/HW/ATA.h | 7 +++++-- src/boot/BootKit/HW/SATA.h | 7 +++++-- src/boot/BootKit/Platform.h | 5 ++++- src/boot/BootKit/Protocol.h | 5 ++++- src/boot/BootKit/QrPrelude.h | 7 +++++-- src/boot/BootKit/Support.h | 5 ++++- src/boot/modules/BootNet/BootNet.h | 5 ++++- 8 files changed, 35 insertions(+), 11 deletions(-) (limited to 'src/boot') diff --git a/src/boot/BootKit/BootThread.h b/src/boot/BootKit/BootThread.h index abe4d653..cde4e65e 100644 --- a/src/boot/BootKit/BootThread.h +++ b/src/boot/BootKit/BootThread.h @@ -4,7 +4,8 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_BOOTTHREAD_H +#define BOOTKIT_BOOTTHREAD_H #include #include @@ -39,3 +40,5 @@ class BootThread final { HEL::BootInfoHeader* fHandover{nullptr}; }; } // namespace Boot + +#endif diff --git a/src/boot/BootKit/HW/ATA.h b/src/boot/BootKit/HW/ATA.h index 1842300b..db35fa64 100644 --- a/src/boot/BootKit/HW/ATA.h +++ b/src/boot/BootKit/HW/ATA.h @@ -4,7 +4,8 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_ATA_H +#define BOOTKIT_ATA_H #include #include @@ -44,4 +45,6 @@ class BootDeviceATA final : public Device { private: ATATrait mTrait; }; -} // namespace Boot \ No newline at end of file +} // namespace Boot + +#endif diff --git a/src/boot/BootKit/HW/SATA.h b/src/boot/BootKit/HW/SATA.h index 442ea399..90f7afbb 100644 --- a/src/boot/BootKit/HW/SATA.h +++ b/src/boot/BootKit/HW/SATA.h @@ -4,7 +4,8 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_SATA_H +#define BOOTKIT_SATA_H #include #include @@ -41,4 +42,6 @@ class BootDeviceSATA final { private: SATATrait mTrait; }; -} // namespace Boot \ No newline at end of file +} // namespace Boot + +#endif diff --git a/src/boot/BootKit/Platform.h b/src/boot/BootKit/Platform.h index bfc738fc..242716c5 100644 --- a/src/boot/BootKit/Platform.h +++ b/src/boot/BootKit/Platform.h @@ -4,7 +4,8 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_PLATFORM_H +#define BOOTKIT_PLATFORM_H /** @file Platform.h @@ -30,3 +31,5 @@ EXTERN_C void rt_cld(); EXTERN_C void rt_std(); #endif /* ifdef __x86_64__ */ + +#endif diff --git a/src/boot/BootKit/Protocol.h b/src/boot/BootKit/Protocol.h index 0a049b77..6b4544ce 100644 --- a/src/boot/BootKit/Protocol.h +++ b/src/boot/BootKit/Protocol.h @@ -4,7 +4,10 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_PROTOCOL_H +#define BOOTKIT_PROTOCOL_H #include #include + +#endif diff --git a/src/boot/BootKit/QrPrelude.h b/src/boot/BootKit/QrPrelude.h index 7b09fdb0..0717db6a 100644 --- a/src/boot/BootKit/QrPrelude.h +++ b/src/boot/BootKit/QrPrelude.h @@ -4,6 +4,9 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_QRPRELUDE_H +#define BOOTKIT_QRPRELUDE_H -#include \ No newline at end of file +#include + +#endif diff --git a/src/boot/BootKit/Support.h b/src/boot/BootKit/Support.h index 110b220c..b51112ef 100644 --- a/src/boot/BootKit/Support.h +++ b/src/boot/BootKit/Support.h @@ -4,7 +4,8 @@ ======================================== */ -#pragma once +#ifndef BOOTKIT_SUPPORT_H +#define BOOTKIT_SUPPORT_H /// @file Support.h /// @brief Purpose of this file is to help port libs into the bootloader. @@ -143,3 +144,5 @@ inline long StringToLong(const char* nptr, char** endptr, int base) { return (long) ((is_neg) ? -n : n); } + +#endif diff --git a/src/boot/modules/BootNet/BootNet.h b/src/boot/modules/BootNet/BootNet.h index 9fe1a186..b8498608 100644 --- a/src/boot/modules/BootNet/BootNet.h +++ b/src/boot/modules/BootNet/BootNet.h @@ -7,6 +7,9 @@ * ======================================================== */ -#pragma once +#ifndef BOOTNET_BOOTNET_H +#define BOOTNET_BOOTNET_H #include + +#endif -- cgit v1.2.3