From 390aec5ca22e62d128e71d1dee312a2f0a82ab68 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Fri, 19 Aug 2022 19:44:36 +0200
Subject: syscall/fs_wait: return a handle for each request
---
src/user/app/init/driver/initctl.c | 9 +++++----
src/user/app/init/driver/ps2.c | 9 +++++----
2 files changed, 10 insertions(+), 8 deletions(-)
(limited to 'src/user/app/init')
diff --git a/src/user/app/init/driver/initctl.c b/src/user/app/init/driver/initctl.c
index c31e8fb..34171de 100644
--- a/src/user/app/init/driver/initctl.c
+++ b/src/user/app/init/driver/initctl.c
@@ -4,15 +4,16 @@
#include <errno.h>
#include <string.h>
#include <unistd.h>
+#include <user/lib/compat.h>
void initctl_drv(handle_t killswitch) {
struct fs_wait_response res;
char buf[64];
const size_t buflen = sizeof buf;
- while (!_syscall_fs_wait(buf, buflen, &res)) {
+ while (!c0_fs_wait(buf, buflen, &res)) {
switch (res.op) {
case VFSOP_OPEN:
- _syscall_fs_respond(NULL, res.len == 0 ? 0 : -1, 0);
+ c0_fs_respond(NULL, res.len == 0 ? 0 : -1, 0);
break;
case VFSOP_WRITE:
/* null terminate */
@@ -30,10 +31,10 @@ void initctl_drv(handle_t killswitch) {
_syscall_write(killswitch, "halt", 4, 0, 0);
exit(1);
}
- _syscall_fs_respond(NULL, res.len, 0);
+ c0_fs_respond(NULL, res.len, 0);
break;
default:
- _syscall_fs_respond(NULL, -ENOSYS, 0);
+ c0_fs_respond(NULL, -ENOSYS, 0);
break;
}
}
diff --git a/src/user/app/init/driver/ps2.c b/src/user/app/init/driver/ps2.c
index 7653f83..961ea53 100644
--- a/src/user/app/init/driver/ps2.c
+++ b/src/user/app/init/driver/ps2.c
@@ -3,6 +3,7 @@
#include <shared/container/ring.h>
#include <stdbool.h>
#include <unistd.h>
+#include <user/lib/compat.h>
static const char keymap_lower[] = {
@@ -53,10 +54,10 @@ static void main_loop(void) {
static char buf[512];
struct fs_wait_response res;
int ret;
- while (!_syscall_fs_wait(buf, sizeof buf, &res)) {
+ while (!c0_fs_wait(buf, sizeof buf, &res)) {
switch (res.op) {
case VFSOP_OPEN:
- _syscall_fs_respond(NULL, 1, 0);
+ c0_fs_respond(NULL, 1, 0);
break;
case VFSOP_READ:
@@ -68,11 +69,11 @@ static void main_loop(void) {
parse_scancode(buf[i]);
}
ret = ring_get((void*)&backlog, buf, res.capacity);
- _syscall_fs_respond(buf, ret, 0);
+ c0_fs_respond(buf, ret, 0);
break;
default:
- _syscall_fs_respond(NULL, -1, 0);
+ c0_fs_respond(NULL, -1, 0);
break;
}
}
--
cgit v1.2.3