summaryrefslogtreecommitdiffhomepage
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/amd64-ci.make6
-rw-r--r--src/boot/amd64-desktop.make6
-rw-r--r--src/boot/arm64-desktop.make4
-rw-r--r--src/boot/modules/BootNet/BootNet.cpp (renamed from src/boot/modules/BootNet/BootNet.cc)20
-rw-r--r--src/boot/modules/BootNet/amd64.json6
-rw-r--r--src/boot/modules/SysChk/SysChk.cpp (renamed from src/boot/modules/SysChk/SysChk.cc)0
-rw-r--r--src/boot/modules/SysChk/amd64-ahci-epm.json12
-rw-r--r--src/boot/modules/SysChk/amd64-ahci-gpt.json12
-rw-r--r--src/boot/modules/SysChk/amd64-pio-epm.json14
-rw-r--r--src/boot/modules/SysChk/amd64-pio-gpt.json14
-rw-r--r--src/boot/modules/SysChk/arm64.json2
-rw-r--r--src/boot/src/BootFileReader.cpp (renamed from src/boot/src/BootFileReader.cc)0
-rw-r--r--src/boot/src/BootString.cpp (renamed from src/boot/src/BootString.cc)0
-rw-r--r--src/boot/src/BootSupport.cpp (renamed from src/boot/src/BootSupport.cc)0
-rw-r--r--src/boot/src/BootTextWriter.cpp (renamed from src/boot/src/BootTextWriter.cc)0
-rw-r--r--src/boot/src/BootThread.cpp (renamed from src/boot/src/BootThread.cc)0
-rw-r--r--src/boot/src/HEL/AMD64/BootATA.cpp (renamed from src/boot/src/HEL/AMD64/BootATA.cc)0
-rw-r--r--src/boot/src/HEL/AMD64/BootEFI.cpp (renamed from src/boot/src/HEL/AMD64/BootEFI.cc)0
-rw-r--r--src/boot/src/HEL/AMD64/BootPlatform.cpp (renamed from src/boot/src/HEL/AMD64/BootPlatform.cc)0
-rw-r--r--src/boot/src/HEL/AMD64/BootSATA.cpp (renamed from src/boot/src/HEL/AMD64/BootSATA.cc)0
-rw-r--r--src/boot/src/HEL/ARM64/BootEFI.cpp (renamed from src/boot/src/HEL/ARM64/BootEFI.cc)0
-rw-r--r--src/boot/src/HEL/ARM64/BootPlatform.cpp (renamed from src/boot/src/HEL/ARM64/BootPlatform.cc)0
-rw-r--r--src/boot/src/New+Delete.cpp (renamed from src/boot/src/New+Delete.cc)0
23 files changed, 48 insertions, 48 deletions
diff --git a/src/boot/amd64-ci.make b/src/boot/amd64-ci.make
index a6a1399e..845892fd 100644
--- a/src/boot/amd64-ci.make
+++ b/src/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
+EMU=qemu-system-x86_64
endif
ifeq ($(NEOS_MODEL), )
@@ -100,9 +100,9 @@ endif
compile-amd64:
$(WINDRES) src/boot_rsrc.rsrc -O coff -o boot_rsrc.o
$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
- $(wildcard src/HEL/AMD64/*.cc) \
+ $(wildcard src/HEL/AMD64/*.cpp) \
$(wildcard src/HEL/AMD64/*.S) \
- $(wildcard src/*.cc)
+ $(wildcard src/*.cpp)
mv *.o obj/
.PHONY: run-efi-amd64-ahci
diff --git a/src/boot/amd64-desktop.make b/src/boot/amd64-desktop.make
index 0c230f62..658ef516 100644
--- a/src/boot/amd64-desktop.make
+++ b/src/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
+EMU=qemu-system-x86_64
endif
ifeq ($(NEOS_MODEL), )
@@ -110,9 +110,9 @@ endif
compile-amd64:
$(WINDRES) src/boot_rsrc.rsrc -O coff -o boot_rsrc.o
$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
- $(wildcard src/HEL/AMD64/*.cc) \
+ $(wildcard src/HEL/AMD64/*.cpp) \
$(wildcard src/HEL/AMD64/*.S) \
- $(wildcard src/*.cc)
+ $(wildcard src/*.cpp)
mv *.o obj/
.PHONY: run-efi-amd64-ahci
diff --git a/src/boot/arm64-desktop.make b/src/boot/arm64-desktop.make
index 3a418a14..bd380327 100644
--- a/src/boot/arm64-desktop.make
+++ b/src/boot/arm64-desktop.make
@@ -74,9 +74,9 @@ endif
compile:
$(RESCMD)
$(CC_GNU) $(NE_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \
- $(wildcard src/HEL/ARM64/*.cc) \
+ $(wildcard src/HEL/ARM64/*.cpp) \
$(wildcard src/HEL/ARM64/*.S) \
- $(wildcard src/*.cc)
+ $(wildcard src/*.cpp)
.PHONY: run
run:
diff --git a/src/boot/modules/BootNet/BootNet.cc b/src/boot/modules/BootNet/BootNet.cpp
index 353f5497..28c72110 100644
--- a/src/boot/modules/BootNet/BootNet.cc
+++ b/src/boot/modules/BootNet/BootNet.cpp
@@ -18,10 +18,10 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
Boot::BootTextWriter writer;
- writer.Write("BootNet: Init BootNet...\r");
+ writer.Write("Net: Init BootNet...\r");
if (BS->LocateProtocol(&kEfiSimpleProtoGUID, nullptr, (VoidPtr*) &kEfiProtocol) != kEfiOk) {
- writer.Write("BootNet: Not supported by firmware.\r");
+ writer.Write("Net: Not supported by the current firmware.\r");
return kEfiFail;
}
@@ -30,28 +30,28 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
SetMem(&inet, 0, sizeof(BOOTNET_INTERNET_HEADER));
- writer.Write("BootNet: Downloading kernel...\r");
+ writer.Write("Net: Downloading image...\r");
bootnet_read_ip_packet(inet, &inet_out);
if (!inet_out) {
- writer.Write("BootNet: Not a packet, aborting.\r");
+ writer.Write("Net: Not a packet, aborting.\r");
return kEfiFail;
}
if (inet_out->NB1 != 'O' || inet_out->NB1 != 'N' || inet_out->NB1 != 'E' ||
inet_out->NB1 != 'T') {
- writer.Write("BootNet: Not a packet, aborting.\r");
+ writer.Write("Net: Not a packet, aborting.\r");
return kEfiFail;
}
if (inet_out->Length < 1) {
- writer.Write("BootNet: No executable attached to the packet, aborting.\r");
+ writer.Write("Net: No executable attached to the packet, aborting.\r");
return kEfiFail;
}
if (inet_out->Version != kBootNetVersion) {
- writer.Write("BootNet: The version clashes, not good.\r");
+ writer.Write("Net: The version clashes, not good.\r");
return kEfiFail;
}
@@ -59,7 +59,7 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
Boot::BootThread thread(inet_out->Data);
if (thread.IsValid()) {
- writer.Write("BootNet: Running NeKernel...\r");
+ writer.Write("Net: Running image...\r");
return thread.Start(handover, YES);
}
@@ -68,11 +68,11 @@ EXTERN_C Int32 BootNetModuleMain(Kernel::HEL::BootInfoHeader* handover) {
constexpr auto kROMSize = 0x200;
if (inet_out->Length > kROMSize) {
- writer.Write("BootNet: Not within 512K, won't flash EEPROM.\r");
+ writer.Write("Net: Not an image within 512K, we won't flash the EEPROM.\r");
return kEfiFail;
}
- writer.Write("BootNet: Programming the flash...\r");
+ writer.Write("Net: Programming the EEPROM...\r");
/// TODO: Program new firmware to EEPROM (if crc and size matches)
diff --git a/src/boot/modules/BootNet/amd64.json b/src/boot/modules/BootNet/amd64.json
index 1f28e837..41ce26e1 100644
--- a/src/boot/modules/BootNet/amd64.json
+++ b/src/boot/modules/BootNet/amd64.json
@@ -9,11 +9,11 @@
"./"
],
"sources_path": [
- "*.cc",
+ "*.cpp",
"*.S",
- "../../src/HEL/AMD64/*.cc",
+ "../../src/HEL/AMD64/*.cpp",
"../../src/HEL/AMD64/*.S",
- "../../src/*.cc"
+ "../../src/*.cpp"
],
"output_name": "net.efi",
"compiler_flags": [
diff --git a/src/boot/modules/SysChk/SysChk.cc b/src/boot/modules/SysChk/SysChk.cpp
index ebc2be68..ebc2be68 100644
--- a/src/boot/modules/SysChk/SysChk.cc
+++ b/src/boot/modules/SysChk/SysChk.cpp
diff --git a/src/boot/modules/SysChk/amd64-ahci-epm.json b/src/boot/modules/SysChk/amd64-ahci-epm.json
index 83282c3f..444003cf 100644
--- a/src/boot/modules/SysChk/amd64-ahci-epm.json
+++ b/src/boot/modules/SysChk/amd64-ahci-epm.json
@@ -3,14 +3,14 @@
"compiler_std": "c++20",
"headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
"sources_path": [
- "*.cc",
+ "*.cpp",
"*.S",
- "../../src/HEL/AMD64/BootSATA.cc",
- "../../src/HEL/AMD64/BootPlatform.cc",
+ "../../src/HEL/AMD64/BootSATA.cpp",
+ "../../src/HEL/AMD64/BootPlatform.cpp",
"../../src/HEL/AMD64/BootAPI.S",
- "../../src/BootTextWriter.cc",
- "../../src/BootSupport.cc",
- "../../src/New+Delete.cc",
+ "../../src/BootTextWriter.cpp",
+ "../../src/BootSupport.cpp",
+ "../../src/New+Delete.cpp",
"../../../kernel/HALKit/AMD64/PCI/*.cpp",
"../../../kernel/HALKit/AMD64/Storage/*.cpp",
"../../../kernel/src/Storage/*.cpp",
diff --git a/src/boot/modules/SysChk/amd64-ahci-gpt.json b/src/boot/modules/SysChk/amd64-ahci-gpt.json
index 8fcf2a57..9b0f4546 100644
--- a/src/boot/modules/SysChk/amd64-ahci-gpt.json
+++ b/src/boot/modules/SysChk/amd64-ahci-gpt.json
@@ -3,14 +3,14 @@
"compiler_std": "c++20",
"headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
"sources_path": [
- "*.cc",
+ "*.cpp",
"*.S",
- "../../src/HEL/AMD64/BootSATA.cc",
- "../../src/HEL/AMD64/BootPlatform.cc",
+ "../../src/HEL/AMD64/BootSATA.cpp",
+ "../../src/HEL/AMD64/BootPlatform.cpp",
"../../src/HEL/AMD64/BootAPI.S",
- "../../src/BootTextWriter.cc",
- "../../src/BootSupport.cc",
- "../../src/New+Delete.cc",
+ "../../src/BootTextWriter.cpp",
+ "../../src/BootSupport.cpp",
+ "../../src/New+Delete.cpp",
"../../../kernel/HALKit/AMD64/PCI/*.cpp",
"../../../kernel/HALKit/AMD64/Storage/*.cpp",
"../../../kernel/src/Storage/*.cpp",
diff --git a/src/boot/modules/SysChk/amd64-pio-epm.json b/src/boot/modules/SysChk/amd64-pio-epm.json
index 12d47119..0c4a1c59 100644
--- a/src/boot/modules/SysChk/amd64-pio-epm.json
+++ b/src/boot/modules/SysChk/amd64-pio-epm.json
@@ -9,14 +9,14 @@
"./"
],
"sources_path": [
- "*.cc",
+ "*.cpp",
"*.S",
- "../../src/HEL/AMD64/BootATA.cc",
- "../../src/HEL/AMD64/BootPlatform.cc",
+ "../../src/HEL/AMD64/BootATA.cpp",
+ "../../src/HEL/AMD64/BootPlatform.cpp",
"../../src/HEL/AMD64/BootAPI.S",
- "../../src/BootTextWriter.cc",
- "../../src/BootSupport.cc",
- "../../src/New+Delete.cc"
+ "../../src/BootTextWriter.cpp",
+ "../../src/BootSupport.cpp",
+ "../../src/New+Delete.cpp"
],
"output_name": "chk.efi",
"compiler_flags": [
@@ -42,4 +42,4 @@
"kChkVersionLowest=0x0100",
"kChkVersion=0x0100"
]
-} \ No newline at end of file
+}
diff --git a/src/boot/modules/SysChk/amd64-pio-gpt.json b/src/boot/modules/SysChk/amd64-pio-gpt.json
index f68d5d36..ca564067 100644
--- a/src/boot/modules/SysChk/amd64-pio-gpt.json
+++ b/src/boot/modules/SysChk/amd64-pio-gpt.json
@@ -9,14 +9,14 @@
"./"
],
"sources_path": [
- "*.cc",
+ "*.cpp",
"*.S",
- "../../src/HEL/AMD64/BootATA.cc",
- "../../src/HEL/AMD64/BootPlatform.cc",
+ "../../src/HEL/AMD64/BootATA.cpp",
+ "../../src/HEL/AMD64/BootPlatform.cpp",
"../../src/HEL/AMD64/BootAPI.S",
- "../../src/BootTextWriter.cc",
- "../../src/BootSupport.cc",
- "../../src/New+Delete.cc"
+ "../../src/BootTextWriter.cpp",
+ "../../src/BootSupport.cpp",
+ "../../src/New+Delete.cpp"
],
"output_name": "chk.efi",
"compiler_flags": [
@@ -42,4 +42,4 @@
"kChkVersionLowest=0x0100",
"kChkVersion=0x0100"
]
-} \ No newline at end of file
+}
diff --git a/src/boot/modules/SysChk/arm64.json b/src/boot/modules/SysChk/arm64.json
index ad5fde6e..2a04c772 100644
--- a/src/boot/modules/SysChk/arm64.json
+++ b/src/boot/modules/SysChk/arm64.json
@@ -2,7 +2,7 @@
"compiler_path": "clang++",
"compiler_std": "c++20",
"headers_path": ["../", "../../", "../../../kernel", "../../../", "./"],
- "sources_path": ["*.cc", "*.S", "../../src/HEL/ARM64/*.cc", "../../src/HEL/ARM64/*.S", "../../src/*.cc"],
+ "sources_path": ["*.cpp", "*.S", "../../src/HEL/ARM64/*.cpp", "../../src/HEL/ARM64/*.S", "../../src/*.cpp"],
"output_name": "chk.efi",
"compiler_flags": [
"-ffreestanding",
diff --git a/src/boot/src/BootFileReader.cc b/src/boot/src/BootFileReader.cpp
index 9deeeb4b..9deeeb4b 100644
--- a/src/boot/src/BootFileReader.cc
+++ b/src/boot/src/BootFileReader.cpp
diff --git a/src/boot/src/BootString.cc b/src/boot/src/BootString.cpp
index 6cda5f24..6cda5f24 100644
--- a/src/boot/src/BootString.cc
+++ b/src/boot/src/BootString.cpp
diff --git a/src/boot/src/BootSupport.cc b/src/boot/src/BootSupport.cpp
index cb6d9d0b..cb6d9d0b 100644
--- a/src/boot/src/BootSupport.cc
+++ b/src/boot/src/BootSupport.cpp
diff --git a/src/boot/src/BootTextWriter.cc b/src/boot/src/BootTextWriter.cpp
index e980b0ae..e980b0ae 100644
--- a/src/boot/src/BootTextWriter.cc
+++ b/src/boot/src/BootTextWriter.cpp
diff --git a/src/boot/src/BootThread.cc b/src/boot/src/BootThread.cpp
index c75ff41d..c75ff41d 100644
--- a/src/boot/src/BootThread.cc
+++ b/src/boot/src/BootThread.cpp
diff --git a/src/boot/src/HEL/AMD64/BootATA.cc b/src/boot/src/HEL/AMD64/BootATA.cpp
index 423f4437..423f4437 100644
--- a/src/boot/src/HEL/AMD64/BootATA.cc
+++ b/src/boot/src/HEL/AMD64/BootATA.cpp
diff --git a/src/boot/src/HEL/AMD64/BootEFI.cc b/src/boot/src/HEL/AMD64/BootEFI.cpp
index 9ef6d1ec..9ef6d1ec 100644
--- a/src/boot/src/HEL/AMD64/BootEFI.cc
+++ b/src/boot/src/HEL/AMD64/BootEFI.cpp
diff --git a/src/boot/src/HEL/AMD64/BootPlatform.cc b/src/boot/src/HEL/AMD64/BootPlatform.cpp
index acdf8258..acdf8258 100644
--- a/src/boot/src/HEL/AMD64/BootPlatform.cc
+++ b/src/boot/src/HEL/AMD64/BootPlatform.cpp
diff --git a/src/boot/src/HEL/AMD64/BootSATA.cc b/src/boot/src/HEL/AMD64/BootSATA.cpp
index c093179b..c093179b 100644
--- a/src/boot/src/HEL/AMD64/BootSATA.cc
+++ b/src/boot/src/HEL/AMD64/BootSATA.cpp
diff --git a/src/boot/src/HEL/ARM64/BootEFI.cc b/src/boot/src/HEL/ARM64/BootEFI.cpp
index 6322d311..6322d311 100644
--- a/src/boot/src/HEL/ARM64/BootEFI.cc
+++ b/src/boot/src/HEL/ARM64/BootEFI.cpp
diff --git a/src/boot/src/HEL/ARM64/BootPlatform.cc b/src/boot/src/HEL/ARM64/BootPlatform.cpp
index 8e45fa60..8e45fa60 100644
--- a/src/boot/src/HEL/ARM64/BootPlatform.cc
+++ b/src/boot/src/HEL/ARM64/BootPlatform.cpp
diff --git a/src/boot/src/New+Delete.cc b/src/boot/src/New+Delete.cpp
index 20965cbe..20965cbe 100644
--- a/src/boot/src/New+Delete.cc
+++ b/src/boot/src/New+Delete.cpp
generated by cgit v1.2.3 (git 2.39.1) at 2026-03-12 22:49:07 +0000