From 9ded3a2bde80eede5fd887812d70c2f834b53c84 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Tue, 13 Apr 2021 22:09:23 +0200
Subject: Started IO dev manager

---
 libs/libc/crt/crt0.c   |  2 +-
 libs/libc/inc/rand.h   | 15 +++++++++++++++
 libs/libc/inc/random.h | 15 ---------------
 libs/libc/inc/sys.h    |  9 +++++----
 libs/libc/random.c     |  2 +-
 libs/libc/sys.c        |  5 -----
 6 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 libs/libc/inc/rand.h
 delete mode 100644 libs/libc/inc/random.h

(limited to 'libs')

diff --git a/libs/libc/crt/crt0.c b/libs/libc/crt/crt0.c
index d264d61..03e569c 100644
--- a/libs/libc/crt/crt0.c
+++ b/libs/libc/crt/crt0.c
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 #include <def.h>
-#include <random.h>
+#include <rand.h>
 #include <sys.h>
 
 #ifdef USER
diff --git a/libs/libc/inc/rand.h b/libs/libc/inc/rand.h
new file mode 100644
index 0000000..1b41df5
--- /dev/null
+++ b/libs/libc/inc/rand.h
@@ -0,0 +1,15 @@
+// MIT License, Copyright (c) 2020 Marvin Borner
+
+#ifndef RANDOM_H
+#define RANDOM_H
+
+#include <def.h>
+
+#define rand_range(min, max) (rand() % ((max) + 1 - (min)) + (min))
+
+void srand(u32 seed);
+u32 rand(void);
+void rand_fill(void *buf, u32 size);
+char *randstr(u32 size);
+
+#endif
diff --git a/libs/libc/inc/random.h b/libs/libc/inc/random.h
deleted file mode 100644
index 1b41df5..0000000
--- a/libs/libc/inc/random.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// MIT License, Copyright (c) 2020 Marvin Borner
-
-#ifndef RANDOM_H
-#define RANDOM_H
-
-#include <def.h>
-
-#define rand_range(min, max) (rand() % ((max) + 1 - (min)) + (min))
-
-void srand(u32 seed);
-u32 rand(void);
-void rand_fill(void *buf, u32 size);
-char *randstr(u32 size);
-
-#endif
diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h
index a9ebf2e..e7acc49 100644
--- a/libs/libc/inc/sys.h
+++ b/libs/libc/inc/sys.h
@@ -19,10 +19,12 @@ enum sys {
 	SYS_SHACCESS, // Access shared memory
 	SYS_FREE, // Free memory
 	SYS_STAT, // Get file information
-	SYS_READ, // Read file
+	SYS_READ, // Read file (non-blocking)
 	SYS_WRITE, // Write to file
-	SYS_IOCTL, // Interact with a file/device
-	SYS_POLL, // Wait for multiple files
+	SYS_IOCTL, // Interact with an I/O device
+	SYS_IOPOLL, // Block proc until I/O device is ready
+	SYS_IOREAD, // Read data from I/O device (blocking)
+	SYS_IOWRITE, // Write data to I/O device
 	SYS_EXEC, // Execute path
 	SYS_EXIT, // Exit current process
 	SYS_BOOT, // Boot functions (e.g. reboot/shutdown)
@@ -68,7 +70,6 @@ res read(const char *path, void *buf, u32 offset, u32 count) NONNULL;
 res write(const char *path, const void *buf, u32 offset, u32 count) NONNULL;
 res ioctl(const char *path, ...) NONNULL;
 res stat(const char *path, struct stat *buf) NONNULL;
-res poll(const char **files) NONNULL;
 res exec(const char *path, ...) ATTR((nonnull(1))) SENTINEL;
 res yield(void);
 res boot(u32 cmd);
diff --git a/libs/libc/random.c b/libs/libc/random.c
index 2cd7f93..268a21f 100644
--- a/libs/libc/random.c
+++ b/libs/libc/random.c
@@ -2,7 +2,7 @@
 
 #include <def.h>
 #include <mem.h>
-#include <random.h>
+#include <rand.h>
 
 #ifdef KERNEL
 #include <cpu.h>
diff --git a/libs/libc/sys.c b/libs/libc/sys.c
index 70dcc97..7563fb4 100644
--- a/libs/libc/sys.c
+++ b/libs/libc/sys.c
@@ -128,11 +128,6 @@ res stat(const char *path, struct stat *buf)
 	return sys2(SYS_STAT, (int)path, (int)buf);
 }
 
-res poll(const char **files)
-{
-	return sys1(SYS_POLL, (int)files);
-}
-
 res exec(const char *path, ...)
 {
 	va_list ap;
-- 
cgit v1.2.3