From a49a17b22cc45e3a73d1e60c048dcf78d3e75c55 Mon Sep 17 00:00:00 2001 From: antifallobst Date: Wed, 25 Jan 2023 12:22:27 +0100 Subject: [PATCH] changed name nyx_os -> nox_os --- CMakeLists.txt | 2 +- README.md | 6 +++--- build.sh | 6 +++--- kernel/inc/utils/math.h | 10 +++++----- kernel/inc/utils/memory.h | 10 +++++----- kernel/inc/utils/stdtypes.h | 10 +++++----- kernel/inc/utils/string.h | 10 +++++----- kernel/kernel.ld | 2 ++ kernel/src/kmain.c | 6 +++--- kernel/src/utils/memory.c | 6 +++--- kernel/src/utils/string.c | 6 +++--- limine.cfg | 4 ++-- 12 files changed, 40 insertions(+), 38 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e0c435b..9e9241e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ cmake_minimum_required(VERSION 3.21) -project(NyxOS) +project(NoxOS) add_subdirectory(kernel) diff --git a/README.md b/README.md index 4dd1fe2..32fbcf5 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -# NyxOS +# NoxOS ## Copyright / License Copyright (C) Antifallobst -NyxOS is free software: +NoxOS is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. diff --git a/build.sh b/build.sh index 4d0b31a..4fd8744 100755 --- a/build.sh +++ b/build.sh @@ -49,7 +49,7 @@ generate_image() { -no-emul-boot -boot-load-size 4 -boot-info-table \ --efi-boot limine-cd-efi.bin \ -efi-boot-part --efi-boot-image --protective-msdos-label \ - iso -o nyxos.iso + iso -o noxos.iso rm -rfv iso @@ -58,10 +58,10 @@ generate_image() { } emulate() { - qemu-system-x86_64 -cdrom build/nyxos.iso + qemu-system-x86_64 -cdrom build/noxos.iso } -echo "!=====[ NyxOS build script ]=====!" +echo "!=====[ NoxOS build script ]=====!" workspace_setup kernel_build diff --git a/kernel/inc/utils/math.h b/kernel/inc/utils/math.h index d147b2f..8e70708 100644 --- a/kernel/inc/utils/math.h +++ b/kernel/inc/utils/math.h @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -13,10 +13,10 @@ * If not, see . */ -#ifndef NYXOS_MATH_H -#define NYXOS_MATH_H +#ifndef NOX_MATH_H +#define NOX_MATH_H #define max(a, b) (a > b ? a : b) #define min(a, b) (a > b ? b : a) -#endif //NYXOS_MATH_H +#endif //NOX_MATH_H diff --git a/kernel/inc/utils/memory.h b/kernel/inc/utils/memory.h index ee90a97..76996e7 100644 --- a/kernel/inc/utils/memory.h +++ b/kernel/inc/utils/memory.h @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -13,8 +13,8 @@ * If not, see . */ -#ifndef NYXOS_MEMORY_H -#define NYXOS_MEMORY_H +#ifndef NOX_MEMORY_H +#define NOX_MEMORY_H #include "stdtypes.h" @@ -22,4 +22,4 @@ void memory_copy (void* source, void* destination, uint32_t num); void memory_set (void* destination, uint8_t data, uint32_t num); bool memory_compare (void* a, void* b, uint32_t num); -#endif //NYXOS_MEMORY_H +#endif //NOX_MEMORY_H diff --git a/kernel/inc/utils/stdtypes.h b/kernel/inc/utils/stdtypes.h index 042ce91..670b9b8 100644 --- a/kernel/inc/utils/stdtypes.h +++ b/kernel/inc/utils/stdtypes.h @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -13,8 +13,8 @@ * If not, see . */ -#ifndef NYXOS_STDTYPES_H -#define NYXOS_STDTYPES_H +#ifndef NOX_STDTYPES_H +#define NOX_STDTYPES_H typedef unsigned char uint8_t; typedef signed char int8_t; @@ -32,4 +32,4 @@ typedef _Bool bool; #define NULL (void*)0 -#endif //NYXOS_STDTYPES_H +#endif //NOX_STDTYPES_H diff --git a/kernel/inc/utils/string.h b/kernel/inc/utils/string.h index cc28bb4..3a15d98 100644 --- a/kernel/inc/utils/string.h +++ b/kernel/inc/utils/string.h @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -13,8 +13,8 @@ * If not, see . */ -#ifndef NYXOS_STRING_H -#define NYXOS_STRING_H +#ifndef NOX_STRING_H +#define NOX_STRING_H #include "stdtypes.h" @@ -23,4 +23,4 @@ typedef const char* string_t; uint32_t string_length (string_t str); bool string_compare(string_t a, string_t b); -#endif //NYXOS_STRING_H +#endif //NOX_STRING_H diff --git a/kernel/kernel.ld b/kernel/kernel.ld index 65106cd..dbab51c 100644 --- a/kernel/kernel.ld +++ b/kernel/kernel.ld @@ -39,4 +39,6 @@ SECTIONS *(.eh_frame) *(.note .note.*) } + + _kernel_end = .; } diff --git a/kernel/src/kmain.c b/kernel/src/kmain.c index df6becb..33a40c1 100644 --- a/kernel/src/kmain.c +++ b/kernel/src/kmain.c @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. @@ -29,7 +29,7 @@ void _start() { struct limine_terminal* terminal = terminal_request.response->terminals[0]; - terminal_request.response->write(terminal, "Booting NyxOS", 13); + terminal_request.response->write(terminal, "Booting NoxOS...", 16); while(true) asm("hlt"); } diff --git a/kernel/src/utils/memory.c b/kernel/src/utils/memory.c index db54afd..8e87ad0 100644 --- a/kernel/src/utils/memory.c +++ b/kernel/src/utils/memory.c @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -43,4 +43,4 @@ bool memory_compare (void* a, void* b, uint32_t num) { } return true; -} \ No newline at end of file +} diff --git a/kernel/src/utils/string.c b/kernel/src/utils/string.c index 41ec19c..1452bb5 100644 --- a/kernel/src/utils/string.c +++ b/kernel/src/utils/string.c @@ -1,11 +1,11 @@ /* Copyright (C) Antifallobst * - * NyxOS is free software: + * NoxOS is free software: * you can redistribute it and/or modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, * or (at your option) any later version. * - * NyxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * NoxOS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * See the GNU General Public License for more details. * @@ -35,4 +35,4 @@ bool string_compare(string_t a, string_t b) { return false; } return memory_compare(a, b, a_len); -} \ No newline at end of file +} diff --git a/limine.cfg b/limine.cfg index 6f9bab0..9985f1b 100644 --- a/limine.cfg +++ b/limine.cfg @@ -1,5 +1,5 @@ TIMEOUT=5 -:NyxOS +:NoxOS PROTOCOL=limine - KERNEL_PATH=boot:///kernel.elf \ No newline at end of file + KERNEL_PATH=boot:///kernel.elf