Implemented some I/O interfaces

3 files changed, 29 insertions, 11 deletions

diff --git a/libs/libc/crt/crt0.c b/libs/libc/crt/crt0.c
index 03e569c..3ab7ed4 100644
--- a/libs/libc/crt/crt0.c
+++ b/libs/libc/crt/crt0.c
@@ -16,7 +16,7 @@ int _start(int argc, char **argv);
 int _start(int argc, char **argv)
 {
 	u32 stamp = 0;
-	assert(read("/dev/rtc", &stamp, 0, sizeof(stamp)) == sizeof(stamp) && stamp);
+	assert(io_read(IO_TIMER, &stamp, 0, sizeof(stamp)) == sizeof(stamp) && stamp);
 	srand(stamp);
 	__stack_chk_guard = rand();
 
diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h
index c181a64..ee82946 100644
--- a/libs/libc/inc/sys.h
+++ b/libs/libc/inc/sys.h
@@ -18,14 +18,14 @@ enum sys {
 	SYS_ALLOC, // Allocate memory
 	SYS_SHACCESS, // Access shared memory
 	SYS_FREE, // Free memory
-	SYS_STAT, // Get file information
 	SYS_READ, // Read file (non-blocking)
 	SYS_WRITE, // Write to file
+	SYS_STAT, // Get file information
+	SYS_EXEC, // Execute path
 	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_IOCONTROL, // Interact with an I/O device
-	SYS_EXEC, // Execute path
 	SYS_EXIT, // Exit current process
 	SYS_BOOT, // Boot functions (e.g. reboot/shutdown)
 	SYS_YIELD, // Switch to next process
@@ -79,9 +79,12 @@ struct stat {
 void exit(s32 status) NORETURN;
 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 exec(const char *path, ...) ATTR((nonnull(1))) SENTINEL;
+res io_poll(u32 *devs);
+res io_read(enum io_type io, void *buf, u32 offset, u32 count);
+res io_write(enum io_type io, void *buf, u32 offset, u32 count);
+res io_control(enum io_type io, ...);
 res yield(void);
 res boot(u32 cmd);
 
diff --git a/libs/libc/sys.c b/libs/libc/sys.c
index ce90fed..3161d72 100644
--- a/libs/libc/sys.c
+++ b/libs/libc/sys.c
@@ -110,7 +110,12 @@ res write(const char *path, const void *buf, u32 offset, u32 count)
 	return sys4(SYS_WRITE, (int)path, (int)buf, (int)offset, (int)count);
 }
 
-res ioctl(const char *path, ...)
+res stat(const char *path, struct stat *buf)
+{
+	return sys2(SYS_STAT, (int)path, (int)buf);
+}
+
+res exec(const char *path, ...)
 {
 	va_list ap;
 	int args[4] = { 0 };
@@ -120,25 +125,35 @@ res ioctl(const char *path, ...)
 		args[i] = va_arg(ap, int);
 	va_end(ap);
 
-	return sys5(SYS_IOCONTROL, (int)path, args[0], args[1], args[2], args[3]);
+	return sys5(SYS_EXEC, (int)path, args[0], args[1], args[2], args[3]);
 }
 
-res stat(const char *path, struct stat *buf)
+res io_poll(u32 *devs)
 {
-	return sys2(SYS_STAT, (int)path, (int)buf);
+	return sys1(SYS_IOPOLL, (int)devs);
 }
 
-res exec(const char *path, ...)
+res io_read(enum io_type io, void *buf, u32 offset, u32 count)
+{
+	return sys4(SYS_IOREAD, (int)io, (int)buf, (int)offset, (int)count);
+}
+
+res io_write(enum io_type io, void *buf, u32 offset, u32 count)
+{
+	return sys4(SYS_IOWRITE, (int)io, (int)buf, (int)offset, (int)count);
+}
+
+res io_control(enum io_type io, ...)
 {
 	va_list ap;
 	int args[4] = { 0 };
 
-	va_start(ap, path);
+	va_start(ap, io);
 	for (int i = 0; i < 4; i++)
 		args[i] = va_arg(ap, int);
 	va_end(ap);
 
-	return sys5(SYS_EXEC, (int)path, args[0], args[1], args[2], args[3]);
+	return sys5(SYS_IOCONTROL, (int)io, args[0], args[1], args[2], args[3]);
 }
 
 res yield(void)