diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/boot/amd64-desktop.make | 4 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/.hgkeep (renamed from dev/boot/modules/NetBoot/.hgkeep) | 0 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/Boot.S (renamed from dev/boot/modules/NetBoot/Boot.S) | 0 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/BootNet.cc (renamed from dev/boot/modules/NetBoot/NetBoot.cc) | 6 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/BootNet.h (renamed from dev/boot/modules/NetBoot/NetBoot.h) | 2 | ||||
| -rw-r--r-- | dev/boot/modules/BootNet/amd64.json (renamed from dev/boot/modules/NetBoot/amd64.json) | 2 | ||||
| -rw-r--r-- | dev/boot/modules/SysChk/SysChk.cc | 2 | ||||
| -rw-r--r-- | dev/boot/src/HEL/AMD64/BootEFI.cc | 6 | ||||
| -rw-r--r-- | dev/kernel/FirmwareKit/CoreBoot/NS.h | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/dev/boot/amd64-desktop.make b/dev/boot/amd64-desktop.make index 9e47788c..8494a2b3 100644 --- a/dev/boot/amd64-desktop.make +++ b/dev/boot/amd64-desktop.make @@ -74,7 +74,7 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -mno-red-zone -D__NEOSKRNL__ -D__BOOTZ__ BOOTLOADER=bootz.exe KERNEL=neoskrnl.exe SYSCHK=syschk.sys -NETBOOT=netboot.sys +NETBOOT=bootnet.sys SCIKIT=libuser.dylib .PHONY: invalid-recipe @@ -90,7 +90,7 @@ all: compile-amd64 $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTZ.EFI $(COPY) ../kernel/$(KERNEL) src/Root/$(KERNEL) $(COPY) ./modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK) - $(COPY) ./modules/NetBoot/$(NETBOOT) src/Root/$(NETBOOT) + $(COPY) ./modules/BootNet/$(NETBOOT) src/Root/$(NETBOOT) $(COPY) ../user/$(SCIKIT) src/Root/$(SCIKIT) $(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER) diff --git a/dev/boot/modules/NetBoot/.hgkeep b/dev/boot/modules/BootNet/.hgkeep index e69de29b..e69de29b 100644 --- a/dev/boot/modules/NetBoot/.hgkeep +++ b/dev/boot/modules/BootNet/.hgkeep diff --git a/dev/boot/modules/NetBoot/Boot.S b/dev/boot/modules/BootNet/Boot.S index 8ebfb352..8ebfb352 100644 --- a/dev/boot/modules/NetBoot/Boot.S +++ b/dev/boot/modules/BootNet/Boot.S diff --git a/dev/boot/modules/NetBoot/NetBoot.cc b/dev/boot/modules/BootNet/BootNet.cc index 4a169d33..b4c1408f 100644 --- a/dev/boot/modules/NetBoot/NetBoot.cc +++ b/dev/boot/modules/BootNet/BootNet.cc @@ -1,13 +1,13 @@ /* * ======================================================== * - * NetBoot + * BootNet * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. * * ======================================================== */ -#include <modules/NetBoot/NetBoot.h> +#include <modules/BootNet/BootNet.h> #include <BootKit/BootKit.h> #include <BootKit/BootThread.h> @@ -17,7 +17,7 @@ EXTERN_C Int32 ModuleMain(NeOS::HEL::BootInfoHeader* handover) memset(&inet, 0, sizeof(NETBOOT_INTERNET_HEADER)); - /// TODO: Read packet from JSON file 'netboot.json' + /// TODO: Read packet from JSON file 'bootnet.json' if (inet.PatchLength < 1) { diff --git a/dev/boot/modules/NetBoot/NetBoot.h b/dev/boot/modules/BootNet/BootNet.h index e250ef27..cde30658 100644 --- a/dev/boot/modules/NetBoot/NetBoot.h +++ b/dev/boot/modules/BootNet/BootNet.h @@ -1,7 +1,7 @@ /* * ======================================================== * - * NetBoot + * BootNet * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. * * ======================================================== diff --git a/dev/boot/modules/NetBoot/amd64.json b/dev/boot/modules/BootNet/amd64.json index db39cced..95124574 100644 --- a/dev/boot/modules/NetBoot/amd64.json +++ b/dev/boot/modules/BootNet/amd64.json @@ -3,7 +3,7 @@ "compiler_std": "c++20", "headers_path": ["../", "../../", "../../../kernel", "../../../", "./"], "sources_path": ["*.cc", "*.S", "../../src/HEL/AMD64/*.cc", "../../src/HEL/AMD64/*.S", "../../src/*.cc"], - "output_name": "netboot.sys", + "output_name": "bootnet.sys", "compiler_flags": [ "-nostdlib", "-std=c++20", diff --git a/dev/boot/modules/SysChk/SysChk.cc b/dev/boot/modules/SysChk/SysChk.cc index c22e183b..e9a740bd 100644 --- a/dev/boot/modules/SysChk/SysChk.cc +++ b/dev/boot/modules/SysChk/SysChk.cc @@ -1,7 +1,7 @@ /* * ======================================================== * - * NetBoot + * SysChk * Copyright (C) 2024-2025, Amlal EL Mahrouss, all rights reserved. * * ======================================================== diff --git a/dev/boot/src/HEL/AMD64/BootEFI.cc b/dev/boot/src/HEL/AMD64/BootEFI.cc index a6af4235..fe976ebd 100644 --- a/dev/boot/src/HEL/AMD64/BootEFI.cc +++ b/dev/boot/src/HEL/AMD64/BootEFI.cc @@ -310,7 +310,7 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, Boot::Stop(); } - Boot::BootFileReader reader_netboot(L"netboot.sys", image_handle); + Boot::BootFileReader reader_netboot(L"bootnet.sys", image_handle); reader_netboot.ReadAll(0); Boot::BootThread* netboot_thread = nullptr; @@ -324,13 +324,13 @@ EFI_EXTERN_C EFI_API Int32 Main(EfiHandlePtr image_handle, if (kernel_thread->Start(handover_hdr, YES) != kEfiOk) { // ------------------------------------------ // - // If we fail into booting the kernel, then run NetBoot. + // If we fail into booting the kernel, then run BootNet. // ------------------------------------------ // if (reader_netboot.Blob()) { netboot_thread = new Boot::BootThread(reader_netboot.Blob()); - netboot_thread->SetName("BootZ: NetBoot"); + netboot_thread->SetName("BootZ: BootNet"); netboot_thread->Start(handover_hdr, YES); } } diff --git a/dev/kernel/FirmwareKit/CoreBoot/NS.h b/dev/kernel/FirmwareKit/CoreBoot/NS.h index 95576de8..6cac6ac3 100644 --- a/dev/kernel/FirmwareKit/CoreBoot/NS.h +++ b/dev/kernel/FirmwareKit/CoreBoot/NS.h @@ -7,4 +7,4 @@ #pragma once #include <FirmwareKit/CoreBoot/CoreBoot.h> -#include <FirmwareKit/CoreBoot/NetBoot.h>
\ No newline at end of file +#include <FirmwareKit/CoreBoot/BootNet.h>
\ No newline at end of file |