summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAmlal El Mahrouss <amlal@nekernel.org>2026-03-15 13:26:42 +0100
committerAmlal El Mahrouss <amlal@nekernel.org>2026-03-15 13:26:42 +0100
commit8681147fd7e1925a08a38b2ce5a8f502d9e0f506 (patch)
tree517fda8f7347e896f20396716b57b6bfe2bad077
parent15fe1319df5ee11ffec4b730026a2dba9e7ab7a8 (diff)
parent6eaccbeb057d4080c9b44fddc32e4c284225ee65 (diff)
Merge branch 'develop' of github.com:ne-foss-org/ne_system into develop
-rw-r--r--compile_flags.txt10
-rw-r--r--include/httpsrv/.keep0
-rw-r--r--include/maildel/.keep0
-rw-r--r--include/ne_system/Drivers/DDK.h (renamed from include/Drivers/NeSystem.h)8
-rw-r--r--include/ne_system/Drivers/Detail/Config.h19
-rw-r--r--include/ne_system/System/Detail/Config.h (renamed from include/System/Config.h)3
-rw-r--r--include/ne_system/System/NeSystem.h (renamed from include/System/NeSystem.h)25
-rw-r--r--include/ne_system/System/WindowSystems/Wayland.h (renamed from include/System/Wayland.h)7
-rw-r--r--include/ne_system/System/WindowSystems/X11.h (renamed from include/System/X11+Fwd.h)6
-rw-r--r--include/ne_system/sdk_map4
-rw-r--r--src/ne_system/.keep0
11 files changed, 56 insertions, 26 deletions
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/httpsrv/.keep b/include/httpsrv/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/include/httpsrv/.keep
diff --git a/include/maildel/.keep b/include/maildel/.keep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/include/maildel/.keep
diff --git a/include/Drivers/NeSystem.h b/include/ne_system/Drivers/DDK.h
index fe042fa..7a46c8b 100644
--- a/include/Drivers/NeSystem.h
+++ b/include/ne_system/Drivers/DDK.h
@@ -3,9 +3,9 @@
// 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_
+#ifndef _NE_DDK_DDK_H_
+#define _NE_DDK_DDK_H_
-#include <libDDK/DriverKit/DriverKit.h>
+#include <Drivers/Detail/Config.h>
-#endif
+#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 <libDDK/DriverKit/DriverKit.h>
+
+#endif
diff --git a/include/System/Config.h b/include/ne_system/System/Detail/Config.h
index 9a7bfb3..474a107 100644
--- a/include/System/Config.h
+++ b/include/ne_system/System/Detail/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 <CoreFoundation.fwrk/headers/Foundation.h>
#include <DiskImage.fwrk/headers/DiskImage.h>
diff --git a/include/System/NeSystem.h b/include/ne_system/System/NeSystem.h
index b494db4..3652678 100644
--- a/include/System/NeSystem.h
+++ b/include/ne_system/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 <System/Config.h>
+#include <System/Detail/Config.h>
-// POSIX wrapper API
+/// @brief POSIX wrapper API
#include <libPOSIXWrapper/POSIXKit/unistd.h>
-// IPC API
+
+/// @brief IPC API
#include <libMsg/MsgKit/Server.h>
-// System calls API
+
+/// @brief System calls API
#include <libSystem/SystemKit/System.h>
-// Sound mixer API
+
+/// @brief Sound mixer API
#include <libSoundSystem/SoundSystemKit/VirtualMixer.h>
#ifdef _NE_NEED_X11
-#include <System/X11+Fwd.h>
+#include <System/WindowSystems/X11.h>
+#endif
+
+#ifdef _NE_NEED_WAYLAND
+#include <System/WindowSystems/Wayland.h>
#endif
-#endif // !_NE_SYSTEM_H_
+#endif // _SYSTEM_NE_SYSTEM_H_
diff --git a/include/System/Wayland.h b/include/ne_system/System/WindowSystems/Wayland.h
index 3c7cfb0..2b4afe5 100644
--- a/include/System/Wayland.h
+++ b/include/ne_system/System/WindowSystems/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 <System/X11+Fwd.h>
-
-#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/ne_system/System/WindowSystems/X11.h
index f06a3f4..3f4d318 100644
--- a/include/System/X11+Fwd.h
+++ b/include/ne_system/System/WindowSystems/X11.h
@@ -3,8 +3,8 @@
// 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_
+#ifndef _SYSTEM_NE_X11_H_
+#define _SYSTEM_NE_X11_H_
#define _NE_X11_SYSTEM 202603L
@@ -17,5 +17,5 @@
// XDG' extensions of the X11 protocol.
#include <System/X11/Ext/Imports.h>
-#endif
+#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
--- /dev/null
+++ b/src/ne_system/.keep