Merge pull request #4 from amlel-el-mahrouss/dev

pr/general: mostly minor patches.

12 files changed, 31 insertions, 29 deletions

diff --git a/dev/boot/BootKit/BootKit.h b/dev/boot/BootKit/BootKit.h
index b5062eab..759b0d94 100644
--- a/dev/boot/BootKit/BootKit.h
+++ b/dev/boot/BootKit/BootKit.h
@@ -14,7 +14,7 @@
 #include <BootKit/HW/ATA.h>
 #include <FirmwareKit/EPM.h>
 #include <CompilerKit/Version.h>
-#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
 #include <BootKit/Rsrc/zka_disk.rsrc>
 #include <BootKit/Rsrc/zka_no_disk.rsrc>
 #include <BootKit/Rsrc/zka_has_disk.rsrc>
diff --git a/dev/boot/BootKit/Qr.h b/dev/boot/BootKit/Qr.h
index 760d8b7f..61ae2234 100644
--- a/dev/boot/BootKit/Qr.h
+++ b/dev/boot/BootKit/Qr.h
@@ -5,7 +5,7 @@
 #include <BootKit/Shared/bit.h>
 
 #include <BootKit/QrPrelude.h>
-#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
 #include <BootKit/Support.h>
 #include <CompilerKit/Detail.h>
 
diff --git a/dev/boot/amd64-ci.make b/dev/boot/amd64-ci.make
index 21c797f6..3c7c6527 100644
--- a/dev/boot/amd64-ci.make
+++ b/dev/boot/amd64-ci.make
@@ -17,7 +17,7 @@ ifneq ($(findstring CYGWIN_NT-10.0,$(shell uname)), )
 EMU=qemu-system-x86_64w.exe
 else
 # this for NT distributions
-EMU=qemu-system-x86_64  -net none
+EMU=qemu-system-x86_64  
 endif
 
 ifeq ($(NEOS_MODEL), )
@@ -49,16 +49,16 @@ DEBUG_MACRO = -D__DEBUG__
 endif
 
 ifeq ($(shell uname), Darwin)
-EMU_FLAGS=-M q35 -net none -smp 4 -m 8G \
+EMU_FLAGS=-M q35  -smp 4 -m 8G \
     -bios $(BIOS) -cdrom $(BOOT) -boot d
 endif
 
 ifneq ($(shell uname), Darwin)
-EMU_FLAGS=-net none -smp 4 -m 8G \
+EMU_FLAGS= -smp 4 -m 8G \
     -bios $(BIOS) -M q35 -cdrom $(BOOT) -boot d -accel kvm
 endif
 
-LD_FLAGS=-e Main --subsystem=10
+LD_FLAGS=-e ModuleMain --subsystem=10
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=obj/*.o
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make
index 95ccac2e..b0f81a39 100644
--- a/dev/boot/amd64-desktop.make
+++ b/dev/boot/amd64-desktop.make
@@ -17,7 +17,7 @@ ifneq ($(findstring CYGWIN_NT-10.0,$(shell uname)), )
 EMU=qemu-system-x86_64w.exe
 else
 # this for NT distributions
-EMU=qemu-system-x86_64  -net none
+EMU=qemu-system-x86_64  
 endif
 
 ifeq ($(NEOS_MODEL), )
@@ -49,16 +49,16 @@ DEBUG_MACRO = -D__DEBUG__
 endif
 
 ifeq ($(shell uname), Darwin)
-EMU_FLAGS=-M q35 -net none -smp 4 -m 8G \
+EMU_FLAGS=-M q35  -smp 4 -m 8G \
     -bios $(BIOS) -cdrom $(BOOT) -boot d
 endif
 
 ifneq ($(shell uname), Darwin)
-EMU_FLAGS=-net none -smp 4 -m 8G \
+EMU_FLAGS= -smp 4 -m 8G \
     -bios $(BIOS) -M q35 -cdrom $(BOOT) -boot d -accel kvm
 endif
 
-LD_FLAGS=-e Main --subsystem=10
+LD_FLAGS=-e ModuleMain --subsystem=10
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=obj/*.o
diff --git a/dev/boot/arm64-desktop.make b/dev/boot/arm64-desktop.make
index a862b5b8..a553e908 100644
--- a/dev/boot/arm64-desktop.make
+++ b/dev/boot/arm64-desktop.make
@@ -27,14 +27,14 @@ IMG=epm-master-1.img
 IMG_2=epm-slave.img
 IMG_3=epm-master-2.img
 
-EMU_FLAGS=-net none -smp 4 -m 8G -cpu max -M virt \
+EMU_FLAGS= -smp 4 -m 8G -cpu max -M virt \
 			-bios $(BIOS) \
 			-drive id=disk,file=$(IMG),format=raw,if=none \
 			-drive \
 			file=fat:rw:src/root/,index=2,format=raw \
 		    -no-shutdown -no-reboot -cpu cortex-a72 -device virtio-gpu-pci
 
-LD_FLAGS=-subsystem:efi_application -entry:Main /nodefaultlib
+LD_FLAGS=-subsystem:efi_application -entry:ModuleMain /nodefaultlib
 
 STANDALONE_MACRO=-D__BOOTZ_STANDALONE__
 OBJ=*.o
diff --git a/dev/boot/gdbinit b/dev/boot/gdbinit
index 9522f6e8..e5b29f38 100644
--- a/dev/boot/gdbinit
+++ b/dev/boot/gdbinit
@@ -1,3 +1,3 @@
 set disassemble-next-line on
-b Main
+b ModuleMain
 target remote localhost:1234
diff --git a/dev/boot/modules/BootNet/BootNet.cc b/dev/boot/modules/BootNet/BootNet.cc
index 1129ef30..2396852f 100644
--- a/dev/boot/modules/BootNet/BootNet.cc
+++ b/dev/boot/modules/BootNet/BootNet.cc
@@ -11,6 +11,8 @@
 #include <BootKit/BootKit.h>
 #include <BootKit/BootThread.h>
 
+EfiGUID kEfiIP4ProtoGUID;
+
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
 	BOOTNET_INTERNET_HEADER inet{};
@@ -22,7 +24,7 @@ EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 	if (inet.Length < 1)
 	{
 		Boot::BootTextWriter writer;
-		writer.Write("BootNetLauncher: No executable attached to the packet, aborting.\r");
+		writer.Write("BootNet: No executable attached to the packet, aborting.\r");
 
 		return kEfiFail;
 	}
diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc
index 2a814326..51b247a5 100644
--- a/dev/boot/modules/SysChk/SysChk.cc
+++ b/dev/boot/modules/SysChk/SysChk.cc
@@ -8,8 +8,8 @@
  */
 
 #include <BootKit/BootKit.h>
-#include <modules/CoreGfx/FBMgr.h>
-#include <modules/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
+#include <modules/CoreGfx/TextGfx.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -19,7 +19,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
 
 EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* handover)
 {
diff --git a/dev/boot/src/BootFileReader.cc b/dev/boot/src/BootFileReader.cc
index 7fed58f0..1236b7f0 100644
--- a/dev/boot/src/BootFileReader.cc
+++ b/dev/boot/src/BootFileReader.cc
@@ -13,7 +13,7 @@
 #include <BootKit/BootKit.h>
 #include <FirmwareKit/Handover.h>
 #include <FirmwareKit/EFI/API.h>
-#include <modules/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextGfx.h>
 
 /// @file BootFileReader
 /// @brief Bootloader File reader.
diff --git a/dev/boot/src/BootThread.cc b/dev/boot/src/BootThread.cc
index 4cd2c466..3341601a 100644
--- a/dev/boot/src/BootThread.cc
+++ b/dev/boot/src/BootThread.cc
@@ -13,7 +13,7 @@
 #include <KernelKit/PE.h>
 #include <KernelKit/MSDOS.h>
 #include <CFKit/Utils.h>
-#include <modules/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/TextGfx.h>
 
 /// @brief External boot services symbol.
 EXTERN EfiBootServices* BS;
diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc
index 5f89aae6..076055b9 100644
--- a/dev/boot/src/HEL/AMD64/BootEFI.cc
+++ b/dev/boot/src/HEL/AMD64/BootEFI.cc
@@ -5,8 +5,8 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <modules/CoreGfx/FBMgr.h>
-#include <modules/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
+#include <modules/CoreGfx/TextGfx.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -16,7 +16,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
@@ -78,11 +78,11 @@ STATIC Bool boot_init_fb() noexcept
 EfiGUID kEfiGlobalNamespaceVarGUID = {
 	0x8BE4DF61, 0x93CA, 0x11D2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C}};
 
-/// @brief Main EFI entrypoint.
+/// @brief ModuleMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
+EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	image_handle,
 								EfiSystemTable* sys_table)
 {
 	InitEFI(sys_table); ///! Init the EFI library.
diff --git a/dev/boot/src/HEL/ARM64/BootEFI.cc b/dev/boot/src/HEL/ARM64/BootEFI.cc
index 6839c2ec..adce693e 100644
--- a/dev/boot/src/HEL/ARM64/BootEFI.cc
+++ b/dev/boot/src/HEL/ARM64/BootEFI.cc
@@ -5,8 +5,8 @@
 ------------------------------------------- */
 
 #include <BootKit/BootKit.h>
-#include <modules/CoreGfx/FBMgr.h>
-#include <modules/CoreGfx/TextMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
+#include <modules/CoreGfx/TextGfx.h>
 #include <FirmwareKit/EFI.h>
 #include <FirmwareKit/EFI/API.h>
 #include <FirmwareKit/Handover.h>
@@ -16,7 +16,7 @@
 #include <NewKit/Macros.h>
 #include <NewKit/Ref.h>
 #include <BootKit/BootThread.h>
-#include <modules/CoreGfx/FBMgr.h>
+#include <modules/CoreGfx/CoreGfx.h>
 
 // Makes the compiler shut up.
 #ifndef kMachineModel
@@ -74,11 +74,11 @@ STATIC Bool boot_init_fb() noexcept
 
 EXTERN EfiBootServices* BS;
 
-/// @brief Main EFI entrypoint.
+/// @brief ModuleMain EFI entrypoint.
 /// @param image_handle Handle of this image.
 /// @param sys_table The system table of it.
 /// @return nothing, never returns.
-EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr	image_handle,
+EFI_EXTERN_C EFI_API Int32 ModuleMain(EfiHandlePtr	image_handle,
 								EfiSystemTable* sys_table)
 {
 	InitEFI(sys_table); ///! Init the EFI library.