From 4ade9ad1a01715a03d91ee09b809480cd0b38659 Mon Sep 17 00:00:00 2001 From: kamkow1 Date: Tue, 9 Sep 2025 18:18:55 +0200 Subject: [PATCH] Move all syscalls into one file --- ulib/Makefile | 1 - ulib/devices/ps2kb.c | 8 -------- ulib/devices/ps2kb.h | 10 ---------- ulib/putchar.c | 2 +- ulib/system/ioctl.c | 11 ----------- ulib/system/ioctl.h | 14 -------------- ulib/system/ipcpipe.c | 10 ---------- ulib/system/ipcpipe.h | 9 --------- ulib/system/processctl.c | 8 -------- ulib/system/processctl.h | 6 ------ ulib/system/system.c | 11 +++++++++++ ulib/system/system.h | 4 ++++ user/init/main.c | 5 +---- 13 files changed, 17 insertions(+), 82 deletions(-) delete mode 100644 ulib/devices/ps2kb.c delete mode 100644 ulib/devices/ps2kb.h delete mode 100644 ulib/system/ioctl.c delete mode 100644 ulib/system/ioctl.h delete mode 100644 ulib/system/ipcpipe.c delete mode 100644 ulib/system/ipcpipe.h delete mode 100644 ulib/system/processctl.c delete mode 100644 ulib/system/processctl.h diff --git a/ulib/Makefile b/ulib/Makefile index 0171b2b..bc27d06 100644 --- a/ulib/Makefile +++ b/ulib/Makefile @@ -10,7 +10,6 @@ SRCFILES := $(call GRABSRC, \ string \ system \ printf \ - devices \ ) CFLAGS += -isystem $(ROOT)/share -isystem $(ROOT)/ulib -isystem $(ROOT)/std/include \ diff --git a/ulib/devices/ps2kb.c b/ulib/devices/ps2kb.c deleted file mode 100644 index 34d61b8..0000000 --- a/ulib/devices/ps2kb.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -#include -#include - -int32_t dev_ps2kb_read(int32_t *ch) { - return ipcpipe(1, 0, IPCPIPE_READ, (uint8_t *)ch, sizeof(*ch)); -} diff --git a/ulib/devices/ps2kb.h b/ulib/devices/ps2kb.h deleted file mode 100644 index e906dbc..0000000 --- a/ulib/devices/ps2kb.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef ULIB_DEVICES_PS2KB_H_ -#define ULIB_DEVICES_PS2KB_H_ - -#include - -#define PS2KB_C(x) ((x) - '@') - -int32_t dev_ps2kb_read(int32_t *ch); - -#endif // ULIB_DEVICES_PS2KB_H_ diff --git a/ulib/putchar.c b/ulib/putchar.c index 0fef985..7e0b4c6 100644 --- a/ulib/putchar.c +++ b/ulib/putchar.c @@ -1,6 +1,6 @@ #include +#include #include -#include #include void putchar_(char c) { diff --git a/ulib/system/ioctl.c b/ulib/system/ioctl.c deleted file mode 100644 index 8b14231..0000000 --- a/ulib/system/ioctl.c +++ /dev/null @@ -1,11 +0,0 @@ -#include -#include -#include -#include -#include -#include - -int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3) { - return syscall(SYS_IOCTL, ioh, cmd, arg1, arg2, arg3, 0); -} - diff --git a/ulib/system/ioctl.h b/ulib/system/ioctl.h deleted file mode 100644 index 1d3a442..0000000 --- a/ulib/system/ioctl.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef ULIB_SYSTEM_IOCTL_H_ -#define ULIB_SYSTEM_IOCTL_H_ - -#include -#include - -#define IOCTL_PATH(p) ((uint64_t)(p)) -#define IOCTL_BUF(b) ((uint64_t)(b)) -#define IOCTL_SIZE(sz) ((uint64_t)(sz)) -#define IOCTL_OFF(off) ((uint64_t)(off)) - -int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3); - -#endif // ULIB_SYSTEM_IOCTL_H_ diff --git a/ulib/system/ipcpipe.c b/ulib/system/ipcpipe.c deleted file mode 100644 index 7fd9b3b..0000000 --- a/ulib/system/ipcpipe.c +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include -#include "ipcpipe.h" -#include -#include -#include - -int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len) { - return syscall(SYS_IPCPIPE, pid, pipenum, cmd, (uint64_t)buffer, (uint64_t)len, 0); -} diff --git a/ulib/system/ipcpipe.h b/ulib/system/ipcpipe.h deleted file mode 100644 index 8f5c373..0000000 --- a/ulib/system/ipcpipe.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef ULIB_SYSTEM_IPCPIPE_H_ -#define ULIB_SYSTEM_IPCPIPE_H_ - -#include -#include - -int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len); - -#endif // ULIB_SYSTEM_IPCPIPE_H_ diff --git a/ulib/system/processctl.c b/ulib/system/processctl.c deleted file mode 100644 index 85d81f6..0000000 --- a/ulib/system/processctl.c +++ /dev/null @@ -1,8 +0,0 @@ -#include -#include -#include -#include - -int32_t processctl(uint64_t pid, uint64_t cmd, void *extra) { - return syscall(SYS_PROCESSCTL, pid, cmd, (uint64_t)extra, 0, 0, 0); -} diff --git a/ulib/system/processctl.h b/ulib/system/processctl.h deleted file mode 100644 index 65fb002..0000000 --- a/ulib/system/processctl.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef ULIB_SYSTEM_PROCESSCTL_H_ -#define ULIB_SYSTEM_PROCESSCTL_H_ - -int32_t processctl(uint64_t pid, uint64_t cmd, void *extra); - -#endif // ULIB_SYSTEM_PROCESSCTL_H_ diff --git a/ulib/system/system.c b/ulib/system/system.c index ede79dd..3a253f9 100644 --- a/ulib/system/system.c +++ b/ulib/system/system.c @@ -7,3 +7,14 @@ void debugprint(const char *string) { syscall(SYS_DEBUGPRINT, (uint64_t)string, 0, 0, 0, 0, 0); } +int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3) { + return syscall(SYS_IOCTL, ioh, cmd, arg1, arg2, arg3, 0); +} + +int32_t processctl(uint64_t pid, uint64_t cmd, void *extra) { + return syscall(SYS_PROCESSCTL, pid, cmd, (uint64_t)extra, 0, 0, 0); +} + +int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len) { + return syscall(SYS_IPCPIPE, pid, pipenum, cmd, (uint64_t)buffer, (uint64_t)len, 0); +} diff --git a/ulib/system/system.h b/ulib/system/system.h index 11afe05..fca7be5 100644 --- a/ulib/system/system.h +++ b/ulib/system/system.h @@ -2,7 +2,11 @@ #define ULIB_SYSTEM_SYSTEM_H_ #include +#include void debugprint(const char *string); +int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3); +int32_t processctl(uint64_t pid, uint64_t cmd, void *extra); +int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len); #endif // ULIB_SYSTEM_SYSTEM_H_ diff --git a/user/init/main.c b/user/init/main.c index d242fdd..a0c977e 100644 --- a/user/init/main.c +++ b/user/init/main.c @@ -2,12 +2,9 @@ #include #include #include -#include +#include #include #include -#include -#include -#include void main(void) { debugprint(ANSIQ_SCR_CLR_ALL);