summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.vscode/c_cpp_properties.json4
-rw-r--r--DDK/KernelCall.c (renamed from DriverKit/KernelCall.c)2
-rw-r--r--DDK/KernelDev.c (renamed from DriverKit/KernelDev.c)2
-rw-r--r--DDK/KernelDev.h (renamed from DriverKit/KernelDev.h)2
-rw-r--r--DDK/KernelDispatchCall.S (renamed from DriverKit/KernelDispatchCall.S)0
-rw-r--r--DDK/KernelPrint.c (renamed from DriverKit/KernelPrint.c)2
-rw-r--r--DDK/KernelPrint.h (renamed from DriverKit/KernelPrint.h)2
-rw-r--r--DDK/KernelStd.h (renamed from DriverKit/KernelStd.h)0
-rw-r--r--DDK/KernelStdCxx.cc (renamed from DriverKit/KernelStdCxx.cc)2
-rw-r--r--DDK/KernelString.c (renamed from DriverKit/KernelString.c)2
-rw-r--r--DDK/KernelString.h (renamed from DriverKit/KernelString.h)4
-rw-r--r--DDK/ReadMe.txt (renamed from DriverKit/ReadMe.txt)0
-rw-r--r--Drv/.gitkeep (renamed from Drivers/.gitkeep)0
-rw-r--r--Drv/Bonjour/Bonjour.c (renamed from Drivers/Bonjour/Bonjour.c)4
-rw-r--r--Drv/Bonjour/DriverRsrc.rsrc (renamed from Drivers/Bonjour/DriverRsrc.rsrc)0
-rw-r--r--Drv/Bonjour/x86_64.mk (renamed from Drivers/Bonjour/x86_64.mk)2
-rw-r--r--Drv/DynamicLoader/DriverRsrc.rsrc (renamed from Drivers/DynamicLoader/DriverRsrc.rsrc)0
-rw-r--r--Drv/DynamicLoader/DynamicLoader.c (renamed from Drivers/DynamicLoader/DynamicLoader.c)4
-rw-r--r--Drv/DynamicLoader/x86_64.mk (renamed from Drivers/DynamicLoader/x86_64.mk)2
-rw-r--r--Drv/SampleDriver/DriverRsrc.rsrc (renamed from Drivers/SampleDriver/DriverRsrc.rsrc)0
-rw-r--r--Drv/SampleDriver/SampleDriver.c (renamed from Drivers/SampleDriver/SampleDriver.c)4
-rw-r--r--Drv/SampleDriver/x86_64.mk (renamed from Drivers/SampleDriver/x86_64.mk)2
-rw-r--r--Kernel/Sources/ProcessScheduler.cxx2
23 files changed, 21 insertions, 21 deletions
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index d9d86a41..ff4a5912 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -4,7 +4,7 @@
"name": "MicroKernel (Macintosh)",
"includePath": [
"${workspaceFolder}/Kernel/**",
- "${workspaceFolder}/Drivers/**",
+ "${workspaceFolder}/Drv/**",
"${workspaceFolder}/Boot/**",
"${workspaceFolder}/**",
"${workspaceFolder}/SDK/Libraries/CoreSystem/**",
@@ -38,7 +38,7 @@
{
"name": "MicroKernel (Windows)",
"includePath": [
- "${workspaceFolder}/Drivers/**",
+ "${workspaceFolder}/Drv/**",
"${workspaceFolder}/Kernel/**",
"${workspaceFolder}/Boot/**",
"${workspaceFolder}/**",
diff --git a/DriverKit/KernelCall.c b/DDK/KernelCall.c
index d61f8439..17e0b5d5 100644
--- a/DriverKit/KernelCall.c
+++ b/DDK/KernelCall.c
@@ -6,7 +6,7 @@
------------------------------------------- */
-#include <DriverKit/KernelStd.h>
+#include <DDK/KernelStd.h>
#include <stdarg.h>
DK_EXTERN __attribute__((naked)) void __kernelDispatchCall(int32_t cnt, ...);
diff --git a/DriverKit/KernelDev.c b/DDK/KernelDev.c
index 704f17da..ee7aa84b 100644
--- a/DriverKit/KernelDev.c
+++ b/DDK/KernelDev.c
@@ -6,7 +6,7 @@
------------------------------------------- */
-#include <DriverKit/KernelDev.h>
+#include <DDK/KernelDev.h>
/// @brief Open a new binary device from path.
DK_EXTERN kernelDeviceRef kernelOpenBinaryDevice(const char* devicePath)
diff --git a/DriverKit/KernelDev.h b/DDK/KernelDev.h
index c3435e8d..4710023a 100644
--- a/DriverKit/KernelDev.h
+++ b/DDK/KernelDev.h
@@ -8,7 +8,7 @@
#pragma once
-#include <DriverKit/KernelStd.h>
+#include <DDK/KernelStd.h>
struct _kernelDevice;
diff --git a/DriverKit/KernelDispatchCall.S b/DDK/KernelDispatchCall.S
index 64b6663e..64b6663e 100644
--- a/DriverKit/KernelDispatchCall.S
+++ b/DDK/KernelDispatchCall.S
diff --git a/DriverKit/KernelPrint.c b/DDK/KernelPrint.c
index 533bf34a..9e25d31b 100644
--- a/DriverKit/KernelPrint.c
+++ b/DDK/KernelPrint.c
@@ -6,7 +6,7 @@
------------------------------------------- */
-#include <DriverKit/KernelPrint.h>
+#include <DDK/KernelPrint.h>
DK_EXTERN void kernelPrintChar(const char ch)
{
diff --git a/DriverKit/KernelPrint.h b/DDK/KernelPrint.h
index 7bf0dda9..135abcc0 100644
--- a/DriverKit/KernelPrint.h
+++ b/DDK/KernelPrint.h
@@ -8,7 +8,7 @@
#pragma once
-#include <DriverKit/KernelString.h>
+#include <DDK/KernelString.h>
/// @brief print character into UART.
DK_EXTERN void kernelPrintChar(const char ch);
diff --git a/DriverKit/KernelStd.h b/DDK/KernelStd.h
index b0dba70e..b0dba70e 100644
--- a/DriverKit/KernelStd.h
+++ b/DDK/KernelStd.h
diff --git a/DriverKit/KernelStdCxx.cc b/DDK/KernelStdCxx.cc
index 633437dc..7d8c9ff3 100644
--- a/DriverKit/KernelStdCxx.cc
+++ b/DDK/KernelStdCxx.cc
@@ -6,7 +6,7 @@
------------------------------------------- */
-#include <DriverKit/KernelStd.h>
+#include <DDK/KernelStd.h>
void* operator new(size_t sz) {
if (!sz) ++sz;
diff --git a/DriverKit/KernelString.c b/DDK/KernelString.c
index 6f28f4d8..1bd4c8c6 100644
--- a/DriverKit/KernelString.c
+++ b/DDK/KernelString.c
@@ -6,7 +6,7 @@
------------------------------------------- */
-#include <DriverKit/KernelString.h>
+#include <DDK/KernelString.h>
DK_EXTERN size_t kernelStringLength(const char* str)
{
diff --git a/DriverKit/KernelString.h b/DDK/KernelString.h
index db063a1b..d39aeea1 100644
--- a/DriverKit/KernelString.h
+++ b/DDK/KernelString.h
@@ -8,9 +8,9 @@
#pragma once
-#include <DriverKit/KernelStd.h>
+#include <DDK/KernelStd.h>
-/// @brief DriverKit equivalent of POSIX's string.h.
+/// @brief DDK equivalent of POSIX's string.h.
DK_EXTERN size_t kernelStringLength(const char* str);
DK_EXTERN int kernelStringCopy(char* dst, const char* src, size_t len);
diff --git a/DriverKit/ReadMe.txt b/DDK/ReadMe.txt
index e33c88ec..e33c88ec 100644
--- a/DriverKit/ReadMe.txt
+++ b/DDK/ReadMe.txt
diff --git a/Drivers/.gitkeep b/Drv/.gitkeep
index e69de29b..e69de29b 100644
--- a/Drivers/.gitkeep
+++ b/Drv/.gitkeep
diff --git a/Drivers/Bonjour/Bonjour.c b/Drv/Bonjour/Bonjour.c
index 52187ac1..93411e1f 100644
--- a/Drivers/Bonjour/Bonjour.c
+++ b/Drv/Bonjour/Bonjour.c
@@ -4,8 +4,8 @@
------------------------------------------- */
-#include <DriverKit/KernelString.h>
-#include <DriverKit/KernelPrint.h>
+#include <DDK/KernelString.h>
+#include <DDK/KernelPrint.h>
int __ImageStart(void)
{
diff --git a/Drivers/Bonjour/DriverRsrc.rsrc b/Drv/Bonjour/DriverRsrc.rsrc
index 494e85ee..494e85ee 100644
--- a/Drivers/Bonjour/DriverRsrc.rsrc
+++ b/Drv/Bonjour/DriverRsrc.rsrc
diff --git a/Drivers/Bonjour/x86_64.mk b/Drv/Bonjour/x86_64.mk
index afbc70ad..6a020d28 100644
--- a/Drivers/Bonjour/x86_64.mk
+++ b/Drv/Bonjour/x86_64.mk
@@ -38,7 +38,7 @@ endif
.PHONY: compile-amd64
compile-amd64:
$(WINDRES) DriverRsrc.rsrc -O coff -o DriverRsrc.o
- $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DriverKit/*.c) $(wildcard ../../DriverKit/*.S)
+ $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DDK/*.c) $(wildcard ../../DDK/*.S)
.PHONY: clean
clean:
diff --git a/Drivers/DynamicLoader/DriverRsrc.rsrc b/Drv/DynamicLoader/DriverRsrc.rsrc
index 3a3b8774..3a3b8774 100644
--- a/Drivers/DynamicLoader/DriverRsrc.rsrc
+++ b/Drv/DynamicLoader/DriverRsrc.rsrc
diff --git a/Drivers/DynamicLoader/DynamicLoader.c b/Drv/DynamicLoader/DynamicLoader.c
index 16ffc06e..83ca555e 100644
--- a/Drivers/DynamicLoader/DynamicLoader.c
+++ b/Drv/DynamicLoader/DynamicLoader.c
@@ -4,8 +4,8 @@
------------------------------------------- */
-#include <DriverKit/KernelString.h>
-#include <DriverKit/KernelPrint.h>
+#include <DDK/KernelString.h>
+#include <DDK/KernelPrint.h>
int __ImageStart(void)
{
diff --git a/Drivers/DynamicLoader/x86_64.mk b/Drv/DynamicLoader/x86_64.mk
index 1d46948b..54ee54f0 100644
--- a/Drivers/DynamicLoader/x86_64.mk
+++ b/Drv/DynamicLoader/x86_64.mk
@@ -38,7 +38,7 @@ endif
.PHONY: compile-amd64
compile-amd64:
$(WINDRES) DriverRsrc.rsrc -O coff -o DriverRsrc.o
- $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DriverKit/*.c) $(wildcard ../../DriverKit/*.S)
+ $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DDK/*.c) $(wildcard ../../DDK/*.S)
.PHONY: clean
clean:
diff --git a/Drivers/SampleDriver/DriverRsrc.rsrc b/Drv/SampleDriver/DriverRsrc.rsrc
index 3a3b8774..3a3b8774 100644
--- a/Drivers/SampleDriver/DriverRsrc.rsrc
+++ b/Drv/SampleDriver/DriverRsrc.rsrc
diff --git a/Drivers/SampleDriver/SampleDriver.c b/Drv/SampleDriver/SampleDriver.c
index 4085bf4f..821927be 100644
--- a/Drivers/SampleDriver/SampleDriver.c
+++ b/Drv/SampleDriver/SampleDriver.c
@@ -4,8 +4,8 @@
------------------------------------------- */
-#include <DriverKit/KernelString.h>
-#include <DriverKit/KernelPrint.h>
+#include <DDK/KernelString.h>
+#include <DDK/KernelPrint.h>
int __ImageStart(void)
{
diff --git a/Drivers/SampleDriver/x86_64.mk b/Drv/SampleDriver/x86_64.mk
index 1d46948b..54ee54f0 100644
--- a/Drivers/SampleDriver/x86_64.mk
+++ b/Drv/SampleDriver/x86_64.mk
@@ -38,7 +38,7 @@ endif
.PHONY: compile-amd64
compile-amd64:
$(WINDRES) DriverRsrc.rsrc -O coff -o DriverRsrc.o
- $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DriverKit/*.c) $(wildcard ../../DriverKit/*.S)
+ $(CC_GNU) $(FLAG_GNU) $(DEBUG) $(wildcard *.c) $(wildcard ../../DDK/*.c) $(wildcard ../../DDK/*.S)
.PHONY: clean
clean:
diff --git a/Kernel/Sources/ProcessScheduler.cxx b/Kernel/Sources/ProcessScheduler.cxx
index 63d566b7..32e1fbde 100644
--- a/Kernel/Sources/ProcessScheduler.cxx
+++ b/Kernel/Sources/ProcessScheduler.cxx
@@ -42,7 +42,7 @@ namespace NewOS
void ProcessHeader::Crash()
{
- kcout << this->Name << ": crashed. (id = " << number(39);
+ kcout << this->Name << ": crashed. (id = " << number(kErrorProcessFault);
kcout << ")\r";
if (this->Ring != kRingUserKind)