diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | dev/kernel/HALKit/AMD64/CxxAbi.cc (renamed from dev/kernel/src/CxxAbi-AMD64.cc) | 4 | ||||
| -rw-r--r-- | dev/kernel/HALKit/ARM64/APM/APM+IO.cc | 2 | ||||
| -rw-r--r-- | dev/kernel/HALKit/ARM64/CxxAbi.cc (renamed from dev/kernel/src/CxxAbi-ARM64.cc) | 3 | ||||
| -rwxr-xr-x | modules_ahci_x64.sh | 4 | ||||
| -rwxr-xr-x | modules_pio_x64.sh | 4 | ||||
| -rwxr-xr-x | setup_x64_project.sh | 4 | ||||
| -rw-r--r-- | tooling/fsck.hefs.cc | 2 |
8 files changed, 9 insertions, 16 deletions
@@ -52,7 +52,7 @@ - [MinGW](https://www.mingw-w64.org/) (cross-compiling) - [Clang](https://clang.llvm.org/) - [NASM](https://nasm.us/) -- [NeBuild](https://github.com/nekernel-org/btb) (build system) +- [NeBuild](https://github.com/nekernel-org/nebuild) (build system) ### **Build & Run** diff --git a/dev/kernel/src/CxxAbi-AMD64.cc b/dev/kernel/HALKit/AMD64/CxxAbi.cc index 30c8306e..cd135abc 100644 --- a/dev/kernel/src/CxxAbi-AMD64.cc +++ b/dev/kernel/HALKit/AMD64/CxxAbi.cc @@ -4,8 +4,6 @@ ------------------------------------------- */ -#ifdef __NE_AMD64__ - #include <KernelKit/DebugOutput.h> #include <KernelKit/KPC.h> #include <KernelKit/UserProcessScheduler.h> @@ -78,5 +76,3 @@ EXTERN_C void __cxa_guard_abort(__guard* g) { (void) g; } } // namespace cxxabiv1 - -#endif // ifdef __NE_AMD64__ diff --git a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc index e58fb782..17a60515 100644 --- a/dev/kernel/HALKit/ARM64/APM/APM+IO.cc +++ b/dev/kernel/HALKit/ARM64/APM/APM+IO.cc @@ -9,7 +9,7 @@ using namespace Kernel; -/// @brief Send APM command to it's IO space. +/// @brief Send APM command to its IO space. /// @param base_dma the IO base port. /// @param cmd the command. /// @return status code. diff --git a/dev/kernel/src/CxxAbi-ARM64.cc b/dev/kernel/HALKit/ARM64/CxxAbi.cc index e91eb958..09898b08 100644 --- a/dev/kernel/src/CxxAbi-ARM64.cc +++ b/dev/kernel/HALKit/ARM64/CxxAbi.cc @@ -4,8 +4,6 @@ ------------------------------------------- */ -#ifdef __NE_ARM64__ - #include <KernelKit/DebugOutput.h> #include <KernelKit/KPC.h> #include <NeKit/CxxAbi.h> @@ -88,4 +86,3 @@ EXTERN_C Kernel::Void _Init_thread_header(Kernel::Int* thread_obj) { EXTERN_C Kernel::Int _tls_index = 0UL; -#endif // ifdef __NE_ARM64__ diff --git a/modules_ahci_x64.sh b/modules_ahci_x64.sh index eadce549..89d5f60b 100755 --- a/modules_ahci_x64.sh +++ b/modules_ahci_x64.sh @@ -5,7 +5,7 @@ # 04/05/25: Improve and fix script. cd dev/boot/modules/SysChk -btb amd64-ahci-epm.json +nebuild amd64-ahci-epm.json cd ../ cd BootNet -btb amd64.json
\ No newline at end of file +nebuild amd64.json
\ No newline at end of file diff --git a/modules_pio_x64.sh b/modules_pio_x64.sh index b091704e..bc1153ba 100755 --- a/modules_pio_x64.sh +++ b/modules_pio_x64.sh @@ -5,7 +5,7 @@ # 04/05/25: Improve and fix script. cd dev/boot/modules/SysChk -btb amd64-pio-epm.json +nebuild amd64-pio-epm.json cd ../ cd BootNet -btb amd64.json
\ No newline at end of file +nebuild amd64.json
\ No newline at end of file diff --git a/setup_x64_project.sh b/setup_x64_project.sh index fd5edf7c..da74a332 100755 --- a/setup_x64_project.sh +++ b/setup_x64_project.sh @@ -8,9 +8,9 @@ cd dev/libSystem cd src make libsys_asm_io_x64 cd .. -btb libSystem.json +nebuild libSystem.json cd ../ddk -btb ddk.json +nebuild ddk.json cd ../boot make -f amd64-desktop.make efi make -f amd64-desktop.make epm-img diff --git a/tooling/fsck.hefs.cc b/tooling/fsck.hefs.cc index 950a709b..e59cacc0 100644 --- a/tooling/fsck.hefs.cc +++ b/tooling/fsck.hefs.cc @@ -43,7 +43,7 @@ int main(int argc, char** argv) { return EXIT_FAILURE; } - if (boot_node.badSectors >= kMkFsMaxBadSectors) { + if (boot_node.badSectors > kMkFsMaxBadSectors) { mkfs::console_out() << "hefs: error: HeFS disk has too much bad sectors: " << opt_disk << "\n"; return EXIT_FAILURE; } |