Store device structs in a dynamic list

kernel/dev/dev.h

@@ -7,7 +7,8 @@
 
 typedef int32_t (*DevFn)(uint8_t *buffer, size_t len, void *extra);
 
-typedef struct {
+typedef struct Dev {
+  struct Dev *next;
   DevFn fns[DEV_FNS_MAX];
 } Dev;
 

kernel/dev/ps2kbdev.c

@@ -6,6 +6,8 @@
 #include "dev.h"
 #include "errors.h"
 #include "dlmalloc/malloc.h"
+#include "util/util.h"
+#include "syscall/devctl.h"
 
 Dev PS2KBDEV;
 Ps2KbFastBuf PS2KB_BUF;
@@ -32,4 +34,5 @@ void ps2kbdev_init(void) {
   uint8_t *buf = dlmalloc(bufsz);
   rbuf_init(&PS2KB_BUF.rbuf, buf, bufsz);
   PS2KB_BUF.init = true;
+  LL_APPEND(DEVS, &PS2KBDEV);
 }

kernel/dev/termdev.c

@@ -5,6 +5,8 @@
 #include "termdev.h"
 #include "dev.h"
 #include "errors.h"
+#include "util/util.h"
+#include "syscall/devctl.h"
 
 Dev TERMDEV;
 
@@ -16,4 +18,5 @@ int32_t termdev_putch(uint8_t *buffer, size_t len, void *extra) {
 void termdev_init(void) {
   hal_memset(&TERMDEV, 0, sizeof(TERMDEV));
   TERMDEV.fns[0] = &termdev_putch;
+  LL_APPEND(DEVS, &TERMDEV);
 }

kernel/syscall/devctl.c

@@ -10,10 +10,7 @@
 #include "dev/ps2kbdev.h"
 #include "util/util.h"
 
-Dev *DEVS[] = {
+Dev *DEVS = NULL;
-  [0x10] = &TERMDEV,
-  [0x11] = &PS2KBDEV,
-};
 
 int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
   uint64_t *devh = (uint64_t *)devh1;
@@ -26,9 +23,18 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
 
   switch (cmd) {
     case DEVCTL_GET_HANDLE: {
-      uint64_t devid = buffer1;
+      Dev *founddev = NULL;
-      if (devid >= LEN(DEVS)) {
+      size_t i = 0;
-        ret = E_INVALIDARGUMENT;
+      Dev *dev, *devtmp;
+      LL_FOREACH_SAFE_IDX(DEVS, dev, devtmp, i) {
+        if (i == buffer1) {
+          founddev = dev;
+          break;
+        }
+      }
+
+      if (founddev == NULL) {
+        ret = E_NOENTRY;
         goto done;
       }
 
@@ -36,14 +42,14 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
       for (size_t i = 0; i < PROC_DEVHANDLES_MAX; i++) {
         if (proc->devs[i] == NULL) {
           found = true;
-          proc->devs[i] = DEVS[devid];
+          proc->devs[i] = founddev;
           *devh = i;
           break;
         }
       }
 
       if (!found) {
-        ret = E_NOENTRY;
+        ret = E_NOMEMORY;
         goto done;
       }
     } break;
@@ -59,6 +65,10 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
       }
 
       Dev *dev = proc->devs[*devh];
+      if (dev == NULL) {
+        ret = E_NOENTRY;
+        goto done;
+      }
       ret = dev->fns[cmd]((uint8_t *)buffer1, (size_t)len1, (void *)extra1);
     } break;
   }

kernel/syscall/devctl.h

@@ -3,6 +3,9 @@
 
 #include <stdint.h>
 #include "syscall.h"
+#include "dev/dev.h"
+
+extern Dev *DEVS;
 
 int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1);
 

ulib/_premain.c

@@ -2,13 +2,11 @@
 #include <stddef.h>
 #include <system/system.h>
 #include <sysdefs/processctl.h>
-#include <sysdefs/devctl.h>
 #include <errors.h>
 #include <uprintf.h>
 #include <log.h>
 #include <util/util.h>
 #include <umalloc/umalloc.h>
-#include <devids.h>
 
 extern void main(void);
 extern uint8_t _bss_start[];

ulib/dev.h

@@ -0,0 +1,11 @@
+#ifndef ULIB_DEV_H_
+#define ULIB_DEV_H_
+
+#define DEV_TERMDEV     0
+#define DEV_PS2KBDEV    1
+
+#define DEV_TERMDEV_PUTCH 0
+
+#define DEV_PS2KBDEV_READCH 0
+
+#endif // ULIB_DEV_H_

ulib/devids.h

@@ -1,9 +0,0 @@
-#ifndef ULIB_DEVIDS_H_
-#define ULIB_DEVIDS_H_
-
-enum {
-  DEV_TERMDEV = 0x10,
-  DEV_PS2KBDEV = 0x11,
-};
-
-#endif // ULIB_DEVIDS_H_

ulib/ulib.h

@@ -16,7 +16,7 @@
 #include <log.h>
 #include <assert.h>
 #include <umalloc/umalloc.h>
-#include <devids.h>
+#include <dev.h>
 
 #include <errors.h>
 #include <sysdefs/ioctl.h>

user/init/main.c

@@ -20,10 +20,10 @@ void tb_runinitscript(void) {
     string_memset(buf, 0, sizeof(buf));
     r = ipcpipe(tb, IPCPIPE_OUT, IPCPIPE_READ, (uint8_t *)buf, sizeof(buf)-1);
     if (r > 0) {
-      devctl(&termdev, 0x00, (uint8_t *)buf, string_len(buf), 0);
+      devctl(&termdev, DEV_TERMDEV_PUTCH, (uint8_t *)buf, string_len(buf), 0);
     }
 
-    r = devctl(&ps2kbdev, 0x00, NULL, 0, 0);
+    r = devctl(&ps2kbdev, DEV_PS2KBDEV_READCH, NULL, 0, 0);
     if (r != E_NOTYET) {
       uint8_t b = r;
       ipcpipe(tb, IPCPIPE_IN, IPCPIPE_WRITE, &b, 1);