From aaec2471dc7dee11d653ee89f893cc7de2d1a803 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 14 Mar 2026 15:29:32 +0100 Subject: [CHORE] Update system headers, pre-final changes. Signed-off-by: Amlal El Mahrouss --- include/Drivers/Config.h | 19 +++++++++++++++++++ include/Drivers/DDK.h | 11 +++++++++++ include/Drivers/NeSystem.h | 11 ----------- include/System/Config.h | 3 ++- include/System/NeSystem.h | 23 +++++++++++++++-------- include/System/Wayland.h | 7 +++---- include/System/X11+Fwd.h | 21 --------------------- include/System/X11.h | 21 +++++++++++++++++++++ 8 files changed, 71 insertions(+), 45 deletions(-) create mode 100644 include/Drivers/Config.h create mode 100644 include/Drivers/DDK.h delete mode 100644 include/Drivers/NeSystem.h delete mode 100644 include/System/X11+Fwd.h create mode 100644 include/System/X11.h (limited to 'include') diff --git a/include/Drivers/Config.h b/include/Drivers/Config.h new file mode 100644 index 0000000..cb788d6 --- /dev/null +++ b/include/Drivers/Config.h @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _NE_DDK_CONFIG_H_ +#define _NE_DDK_CONFIG_H_ + +#define _ARCH __ne_arch + +#define _SUBSYSTEM_NET 0x1000 +#define _SUBSYSTEM_DDK 0x1000 +#define _SUBSYSTEM_SYS 0x1000 + +#define _NEKERNEL 202603L + +#include + +#endif diff --git a/include/Drivers/DDK.h b/include/Drivers/DDK.h new file mode 100644 index 0000000..f8a96ac --- /dev/null +++ b/include/Drivers/DDK.h @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _NE_DDK_DDK_H_ +#define _NE_DDK_DDK_H_ + +#include + +#endif // _NE_DDK_DDK_H_ diff --git a/include/Drivers/NeSystem.h b/include/Drivers/NeSystem.h deleted file mode 100644 index fe042fa..0000000 --- a/include/Drivers/NeSystem.h +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _NE_DDK_H_ -#define _NE_DDK_H_ - -#include - -#endif diff --git a/include/System/Config.h b/include/System/Config.h index 9a7bfb3..474a107 100644 --- a/include/System/Config.h +++ b/include/System/Config.h @@ -10,7 +10,8 @@ #define _SUBSYSTEM_NET 0x1000 #define _SUBSYSTEM_DDK 0x1000 #define _SUBSYSTEM_SYS 0x1000 -#define _NEKERNEL 202603 + +#define _NEKERNEL 202603L #include #include diff --git a/include/System/NeSystem.h b/include/System/NeSystem.h index b494db4..832db9e 100644 --- a/include/System/NeSystem.h +++ b/include/System/NeSystem.h @@ -3,24 +3,31 @@ // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/ne_system -#ifndef _NE_SYSTEM_H_ -#define _NE_SYSTEM_H_ +#ifndef _SYSTEM_NE_SYSTEM_H_ +#define _SYSTEM_NE_SYSTEM_H_ #define _NE_SYSTEM 202603L #include -// POSIX wrapper API +/// @brief POSIX wrapper API #include -// IPC API + +/// @brief IPC API #include -// System calls API + +/// @brief System calls API #include -// Sound mixer API + +/// @brief Sound mixer API #include #ifdef _NE_NEED_X11 -#include +#include +#endif + +#ifdef _NE_NEED_WAYLAND +#include #endif -#endif // !_NE_SYSTEM_H_ +#endif // _SYSTEM_NE_SYSTEM_H_ diff --git a/include/System/Wayland.h b/include/System/Wayland.h index 3c7cfb0..2b4afe5 100644 --- a/include/System/Wayland.h +++ b/include/System/Wayland.h @@ -3,12 +3,11 @@ // Licensed under the Apache License, Version 2.0 (see LICENSE file) // Official repository: https://github.com/ne-foss-org/src -#ifndef _NE_WAYLAND_H_ -#define _NE_WAYLAND_H_ +#ifndef _SYSTEM_NE_WAYLAND_H_ +#define _SYSTEM_NE_WAYLAND_H_ #define _NE_WAYLAND_SYSTEM 202603L #include - -#endif \ No newline at end of file +#endif // _SYSTEM_NE_WAYLAND_H_ \ No newline at end of file diff --git a/include/System/X11+Fwd.h b/include/System/X11+Fwd.h deleted file mode 100644 index f06a3f4..0000000 --- a/include/System/X11+Fwd.h +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _NE_X11_H_ -#define _NE_X11_H_ - -#define _NE_X11_SYSTEM 202603L - -// NeSystem Header. -#include - -// Defs of the X11 protocol. -#include - -// XDG' extensions of the X11 protocol. -#include - -#endif - diff --git a/include/System/X11.h b/include/System/X11.h new file mode 100644 index 0000000..3f4d318 --- /dev/null +++ b/include/System/X11.h @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _SYSTEM_NE_X11_H_ +#define _SYSTEM_NE_X11_H_ + +#define _NE_X11_SYSTEM 202603L + +// NeSystem Header. +#include + +// Defs of the X11 protocol. +#include + +// XDG' extensions of the X11 protocol. +#include + +#endif // _SYSTEM_NE_X11_H_ + -- cgit v1.2.3 From 6eaccbeb057d4080c9b44fddc32e4c284225ee65 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 14 Mar 2026 15:34:19 +0100 Subject: [CHORE] Update system headers, final changes for the structure. Signed-off-by: Amlal El Mahrouss --- compile_flags.txt | 10 +++---- include/Drivers/Config.h | 19 -------------- include/Drivers/DDK.h | 11 -------- include/System/Config.h | 20 -------------- include/System/NeSystem.h | 33 ------------------------ include/System/Wayland.h | 13 ---------- include/System/X11.h | 21 --------------- include/httpsrv/.keep | 0 include/maildel/.keep | 0 include/ne_system/Drivers/DDK.h | 11 ++++++++ include/ne_system/Drivers/Detail/Config.h | 19 ++++++++++++++ include/ne_system/System/Detail/Config.h | 20 ++++++++++++++ include/ne_system/System/NeSystem.h | 33 ++++++++++++++++++++++++ include/ne_system/System/WindowSystems/Wayland.h | 13 ++++++++++ include/ne_system/System/WindowSystems/X11.h | 21 +++++++++++++++ include/ne_system/sdk_map | 4 +++ src/ne_system/.keep | 0 17 files changed, 126 insertions(+), 122 deletions(-) delete mode 100644 include/Drivers/Config.h delete mode 100644 include/Drivers/DDK.h delete mode 100644 include/System/Config.h delete mode 100644 include/System/NeSystem.h delete mode 100644 include/System/Wayland.h delete mode 100644 include/System/X11.h create mode 100644 include/httpsrv/.keep create mode 100644 include/maildel/.keep create mode 100644 include/ne_system/Drivers/DDK.h create mode 100644 include/ne_system/Drivers/Detail/Config.h create mode 100644 include/ne_system/System/Detail/Config.h create mode 100644 include/ne_system/System/NeSystem.h create mode 100644 include/ne_system/System/WindowSystems/Wayland.h create mode 100644 include/ne_system/System/WindowSystems/X11.h create mode 100644 include/ne_system/sdk_map create mode 100644 src/ne_system/.keep (limited to 'include') diff --git a/compile_flags.txt b/compile_flags.txt index 1f71a88..8bbca40 100644 --- a/compile_flags.txt +++ b/compile_flags.txt @@ -1,9 +1,9 @@ -Ilib -std=c++20 -xc++ --Idev/boot/ --Idev/build/dev --Idev/kernel/dev --Isrc/necar/dev +-Isrc/boot/ +-Isrc/build/dev +-Isrc/kernel/dev +-Isrc/nectar/dev -I/opt/homebrew/Cellar/boost/1.90.0/include --Iinclude/ \ No newline at end of file +-Iinclude/ne_system/ \ No newline at end of file diff --git a/include/Drivers/Config.h b/include/Drivers/Config.h deleted file mode 100644 index cb788d6..0000000 --- a/include/Drivers/Config.h +++ /dev/null @@ -1,19 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _NE_DDK_CONFIG_H_ -#define _NE_DDK_CONFIG_H_ - -#define _ARCH __ne_arch - -#define _SUBSYSTEM_NET 0x1000 -#define _SUBSYSTEM_DDK 0x1000 -#define _SUBSYSTEM_SYS 0x1000 - -#define _NEKERNEL 202603L - -#include - -#endif diff --git a/include/Drivers/DDK.h b/include/Drivers/DDK.h deleted file mode 100644 index f8a96ac..0000000 --- a/include/Drivers/DDK.h +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _NE_DDK_DDK_H_ -#define _NE_DDK_DDK_H_ - -#include - -#endif // _NE_DDK_DDK_H_ diff --git a/include/System/Config.h b/include/System/Config.h deleted file mode 100644 index 474a107..0000000 --- a/include/System/Config.h +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#pragma once - -#define _ARCH __ne_arch - -#define _SUBSYSTEM_NET 0x1000 -#define _SUBSYSTEM_DDK 0x1000 -#define _SUBSYSTEM_SYS 0x1000 - -#define _NEKERNEL 202603L - -#include -#include -#include - - diff --git a/include/System/NeSystem.h b/include/System/NeSystem.h deleted file mode 100644 index 832db9e..0000000 --- a/include/System/NeSystem.h +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/ne_system - -#ifndef _SYSTEM_NE_SYSTEM_H_ -#define _SYSTEM_NE_SYSTEM_H_ - -#define _NE_SYSTEM 202603L - -#include - -/// @brief POSIX wrapper API -#include - -/// @brief IPC API -#include - -/// @brief System calls API -#include - -/// @brief Sound mixer API -#include - -#ifdef _NE_NEED_X11 -#include -#endif - -#ifdef _NE_NEED_WAYLAND -#include -#endif - -#endif // _SYSTEM_NE_SYSTEM_H_ diff --git a/include/System/Wayland.h b/include/System/Wayland.h deleted file mode 100644 index 2b4afe5..0000000 --- a/include/System/Wayland.h +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _SYSTEM_NE_WAYLAND_H_ -#define _SYSTEM_NE_WAYLAND_H_ - -#define _NE_WAYLAND_SYSTEM 202603L - -#include - -#endif // _SYSTEM_NE_WAYLAND_H_ \ No newline at end of file diff --git a/include/System/X11.h b/include/System/X11.h deleted file mode 100644 index 3f4d318..0000000 --- a/include/System/X11.h +++ /dev/null @@ -1,21 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) -// Licensed under the Apache License, Version 2.0 (see LICENSE file) -// Official repository: https://github.com/ne-foss-org/src - -#ifndef _SYSTEM_NE_X11_H_ -#define _SYSTEM_NE_X11_H_ - -#define _NE_X11_SYSTEM 202603L - -// NeSystem Header. -#include - -// Defs of the X11 protocol. -#include - -// XDG' extensions of the X11 protocol. -#include - -#endif // _SYSTEM_NE_X11_H_ - diff --git a/include/httpsrv/.keep b/include/httpsrv/.keep new file mode 100644 index 0000000..e69de29 diff --git a/include/maildel/.keep b/include/maildel/.keep new file mode 100644 index 0000000..e69de29 diff --git a/include/ne_system/Drivers/DDK.h b/include/ne_system/Drivers/DDK.h new file mode 100644 index 0000000..7a46c8b --- /dev/null +++ b/include/ne_system/Drivers/DDK.h @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _NE_DDK_DDK_H_ +#define _NE_DDK_DDK_H_ + +#include + +#endif // _NE_DDK_DDK_H_ diff --git a/include/ne_system/Drivers/Detail/Config.h b/include/ne_system/Drivers/Detail/Config.h new file mode 100644 index 0000000..cb788d6 --- /dev/null +++ b/include/ne_system/Drivers/Detail/Config.h @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _NE_DDK_CONFIG_H_ +#define _NE_DDK_CONFIG_H_ + +#define _ARCH __ne_arch + +#define _SUBSYSTEM_NET 0x1000 +#define _SUBSYSTEM_DDK 0x1000 +#define _SUBSYSTEM_SYS 0x1000 + +#define _NEKERNEL 202603L + +#include + +#endif diff --git a/include/ne_system/System/Detail/Config.h b/include/ne_system/System/Detail/Config.h new file mode 100644 index 0000000..474a107 --- /dev/null +++ b/include/ne_system/System/Detail/Config.h @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#pragma once + +#define _ARCH __ne_arch + +#define _SUBSYSTEM_NET 0x1000 +#define _SUBSYSTEM_DDK 0x1000 +#define _SUBSYSTEM_SYS 0x1000 + +#define _NEKERNEL 202603L + +#include +#include +#include + + diff --git a/include/ne_system/System/NeSystem.h b/include/ne_system/System/NeSystem.h new file mode 100644 index 0000000..3652678 --- /dev/null +++ b/include/ne_system/System/NeSystem.h @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/ne_system + +#ifndef _SYSTEM_NE_SYSTEM_H_ +#define _SYSTEM_NE_SYSTEM_H_ + +#define _NE_SYSTEM 202603L + +#include + +/// @brief POSIX wrapper API +#include + +/// @brief IPC API +#include + +/// @brief System calls API +#include + +/// @brief Sound mixer API +#include + +#ifdef _NE_NEED_X11 +#include +#endif + +#ifdef _NE_NEED_WAYLAND +#include +#endif + +#endif // _SYSTEM_NE_SYSTEM_H_ diff --git a/include/ne_system/System/WindowSystems/Wayland.h b/include/ne_system/System/WindowSystems/Wayland.h new file mode 100644 index 0000000..2b4afe5 --- /dev/null +++ b/include/ne_system/System/WindowSystems/Wayland.h @@ -0,0 +1,13 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _SYSTEM_NE_WAYLAND_H_ +#define _SYSTEM_NE_WAYLAND_H_ + +#define _NE_WAYLAND_SYSTEM 202603L + +#include + +#endif // _SYSTEM_NE_WAYLAND_H_ \ No newline at end of file diff --git a/include/ne_system/System/WindowSystems/X11.h b/include/ne_system/System/WindowSystems/X11.h new file mode 100644 index 0000000..3f4d318 --- /dev/null +++ b/include/ne_system/System/WindowSystems/X11.h @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: Apache-2.0 +// Copyright 2026, Amlal El Mahrouss (amlal@nekernel.org) +// Licensed under the Apache License, Version 2.0 (see LICENSE file) +// Official repository: https://github.com/ne-foss-org/src + +#ifndef _SYSTEM_NE_X11_H_ +#define _SYSTEM_NE_X11_H_ + +#define _NE_X11_SYSTEM 202603L + +// NeSystem Header. +#include + +// Defs of the X11 protocol. +#include + +// XDG' extensions of the X11 protocol. +#include + +#endif // _SYSTEM_NE_X11_H_ + diff --git a/include/ne_system/sdk_map b/include/ne_system/sdk_map new file mode 100644 index 0000000..da79ef9 --- /dev/null +++ b/include/ne_system/sdk_map @@ -0,0 +1,4 @@ +[DDK] +Drivers +[User] +System \ No newline at end of file diff --git a/src/ne_system/.keep b/src/ne_system/.keep new file mode 100644 index 0000000..e69de29 -- cgit v1.2.3