Initialize devices before storedev_init()

base/scripts/rc.tb

@@ -1,3 +1,4 @@
 mkalias pctl base:/bin/pctl
 mkalias tb base:/bin/tb
 mkalias fs base:/bin/fs
+mkalias dev base:/bin/dev

kernel/arch/x86_64/x86_64.mk

@@ -11,7 +11,7 @@ CFLAGS += -m64 \
 					-mno-red-zone \
 					-fno-stack-protector \
 					-fno-stack-check \
-					-Os \
+					-O0 \
 
 LDFLAGS += -m elf_x86_64 \
 					-pie \

kernel/dev/ps2kbdev.c

@@ -71,6 +71,7 @@ static uint8_t normalmap[0x100] = {
   [0xcb] KB_LEFT,   [0xcd] KB_RIGHT,
   [0x97] KB_HOME,   [0xcf] KB_END,
   [0xd2] KB_INSERT, [0xd3] KB_DELETE,
+  [0xc7] KB_HOME,
 };
 
 static uint8_t shiftmap[256] = {
@@ -92,6 +93,7 @@ static uint8_t shiftmap[256] = {
   [0xcb] KB_LEFT,   [0xcd] KB_RIGHT,
   [0x97] KB_HOME,   [0xcf] KB_END,
   [0xd2] KB_INSERT, [0xd3] KB_DELETE,
+  [0xc7] KB_HOME,
 };
 
 static uint8_t ctlmap[256] =
@@ -110,6 +112,7 @@ static uint8_t ctlmap[256] =
   [0xcb] KB_LEFT,   [0xcd] KB_RIGHT,
   [0x97] KB_HOME,   [0xcf] KB_END,
   [0xd2] KB_INSERT, [0xd3] KB_DELETE,
+  [0xc7] KB_HOME,
 };
 
 int32_t ps2kb_intr(void) {

kernel/kmain.c

@@ -62,10 +62,10 @@ void kmain(void) {
   hal_init();
   pmm_init();
   hal_vmm_init();
+  dev_init();
   storedev_init();
   baseimg_init();
   vfs_init();
-  dev_init();
   proc_init();
 
   for(;;);

kernel/syscall/devctl.c

@@ -52,6 +52,44 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
         goto done;
       }
     } break;
+    case DEVCTL_DEVLS_SZ: {
+      size_t n = 0;
+      spinlock_acquire(&DEVTABLE.spinlock);
+      for (size_t i = 0; i < LEN(DEVTABLE.devs); i++) {
+        if (DEVTABLE.devs[i]._hshtbstate == HSHTB_TAKEN) {
+          n++;
+        }
+      }
+      spinlock_release(&DEVTABLE.spinlock);
+      ret = n;
+    } break;
+    case DEVCTL_DEVLS_STAT: {
+      DevStat *devstat = (DevStat *)buffer1;
+      size_t idx = (size_t)len1;
+
+      if (devstat == NULL) {
+        ret = E_INVALIDARGUMENT;
+        goto done;
+      }
+
+      devstat->present = false;
+
+      spinlock_acquire(&DEVTABLE.spinlock);
+      for (size_t i = 0; i < LEN(DEVTABLE.devs); i++) {
+        if (i == idx && DEVTABLE.devs[i]._hshtbstate == HSHTB_TAKEN) {
+          Dev *dev = &DEVTABLE.devs[i];
+          hal_memcpy(devstat->name, dev->ident, sizeof(dev->ident));
+          for (size_t j = 0; j < DEV_FNS_MAX; j++) {
+            if (dev->fns[j] != NULL) {
+              devstat->nfns++;
+            }
+          }
+          devstat->present = true;
+          break;
+        }
+      }
+      spinlock_release(&DEVTABLE.spinlock);
+    } break;
     default: {
       if (devh == NULL) {
         ret = E_INVALIDARGUMENT;

kernel/term/term.c

@@ -51,12 +51,18 @@ void term_doinit(void *addr) {
     BOOT_INFO.fb->blue_mask_size,
     BOOT_INFO.fb->blue_mask_shift,
     NULL, // canvas
-    ansi_colours, // ansi colors
-    ansi_bright_colours, // ansi bright colors
-    &default_bg, // default bg
-    &default_fg, // default fg
-    &default_fg_bright, // default bg bright
-    &default_bg_bright, // default fg bright
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    /* ansi_colours, // ansi colors */
+    /* ansi_bright_colours, // ansi bright colors */
+    /* &default_bg, // default bg */
+    /* &default_fg, // default fg */
+    /* &default_fg_bright, // default bg bright */
+    /* &default_bg_bright, // default fg bright */
     FM_T_437_F16,
     8,
     16,

share/sysdefs/devctl.h

@@ -2,6 +2,8 @@
 #define SHARE_SYSDEFS_DEVCTL_H_
 
 #define DEVCTL_GET_HANDLE 100
+#define DEVCTL_DEVLS_SZ   101
+#define DEVCTL_DEVLS_STAT 102
 
 #define DEV_TERMDEV_PUTCH 0
 
@@ -25,6 +27,12 @@ typedef struct {
   uint8_t fontw, fonth;
 } FbDevGetInfo;
 
+typedef struct {
+  bool present;
+  char name[0x100];
+  size_t nfns;
+} DevStat;
+
 #endif
 
 #endif // SHARE_SYSDEFS_DEVCTL_H_

ulib/dlinklist.h

@@ -0,0 +1,138 @@
+#ifndef ULIB_DLINKLIST_H_
+#define ULIB_DLINKLIST_H_
+
+#define DL_APPEND(head, new) \
+  do { \
+    if ((new) != NULL) { \
+      (new)->next = NULL; \
+      if ((head) != NULL) { \
+        typeof((head)) __tmp = (head); \
+        while (__tmp->next != NULL) { \
+          __tmp = __tmp->next; \
+        } \
+        __tmp->next = (new); \
+        (new)->prev = __tmp; \
+      } else { \
+        (new)->prev = NULL; \
+        (head) = (new); \
+      } \
+    } \
+  } while (0)
+
+#define DL_PREPEND(head, new) \
+  do { \
+    if ((new) != NULL) { \
+      (new)->prev = NULL; \
+      (new)->next = (head); \
+      if ((head) != NULL) { \
+        (head)->prev = (new); \
+      } \
+      (head) = (new); \
+    } \
+  } while (0)
+
+#define DL_REMOVE(head, ele) \
+  do { \
+    if ((ele) != NULL) { \
+      if ((ele)->prev != NULL) { \
+        (ele)->prev->next = (ele)->next; \
+      } else { \
+        (head) = (ele)->next; \
+      } \
+      if ((ele)->next != NULL) { \
+        (ele)->next->prev = (ele)->prev; \
+      } \
+      (ele)->next = NULL; \
+      (ele)->prev = NULL; \
+    } \
+  } while (0)
+
+#define DL_FINDPROP(head, out, propname, propvalue) \
+  do { \
+    (out) = NULL; \
+    typeof((head)) __tmp = (head); \
+    while (__tmp) { \
+      if (__tmp->propname == (propvalue)) { \
+        (out) = __tmp; \
+        break; \
+      } \
+      __tmp = __tmp->next; \
+    } \
+  } while (0)
+
+#define DL_FOREACH_SAFE(head, var, tmp) \
+  for (var = (head), tmp = (var ? var->next : NULL); \
+       var != NULL; \
+       var = tmp, tmp = (var ? var->next : NULL))
+
+#define DL_FOREACH_SAFE_IDX(head, var, tmp, idx) \
+  for ((idx) = 0, var = (head), tmp = (var ? var->next : NULL); \
+       var != NULL; \
+       var = tmp, tmp = (var ? var->next : NULL), (idx)++)
+
+#define DL_FOREACH_SAFE_IDX_LIMIT(head, var, tmp, idx, max) \
+  for ((idx) = 0, var = (head), tmp = (var ? var->next : NULL); \
+       var != NULL && (idx) < (max); \
+       var = tmp, tmp = (var ? var->next : NULL), (idx)++)
+
+#define DL_BACK(head, out) \
+  do { \
+    (out) = NULL; \
+    if ((head) != NULL) { \
+      typeof((head)) __tmp = (head); \
+      while (__tmp->next != NULL) { \
+        __tmp = __tmp->next; \
+      } \
+      (out) = __tmp; \
+    } \
+  } while (0)
+
+#define DL_FRONT(head, out) \
+  do { \
+    (out) = NULL; \
+    if ((head) != NULL) { \
+      typeof((head)) __tmp = (head); \
+      while (__tmp->prev != NULL) { \
+        __tmp = __tmp->prev; \
+      } \
+      (out) = __tmp; \
+    } \
+  } while (0)
+
+#define DL_INSERT_AFTER(head, pos, new) \
+  do { \
+    if ((pos) != NULL && (new) != NULL) { \
+      (new)->prev = (pos); \
+      (new)->next = (pos)->next; \
+      if ((pos)->next != NULL) { \
+        (pos)->next->prev = (new); \
+      } \
+      (pos)->next = (new); \
+    } else if ((pos) == NULL && (head) == NULL) { \
+      /* Empty list: make new head */ \
+      (new)->prev = NULL; \
+      (new)->next = NULL; \
+      (head) = (new); \
+    } \
+  } while (0)
+
+#define DL_INSERT_BEFORE(head, pos, new) \
+  do { \
+    if ((pos) != NULL && (new) != NULL) { \
+      (new)->next = (pos); \
+      (new)->prev = (pos)->prev; \
+      if ((pos)->prev != NULL) { \
+        (pos)->prev->next = (new); \
+      } else { \
+        (head) = (new); \
+      } \
+      (pos)->prev = (new); \
+    } else if ((pos) == NULL && (head) == NULL) { \
+      /* Empty list: make new head */ \
+      (new)->prev = NULL; \
+      (new)->next = NULL; \
+      (head) = (new); \
+    } \
+  } while (0)
+
+#endif // ULIB_DLINKLIST_H_

ulib/string/string.c

@@ -183,3 +183,32 @@ char *string_combine(char *dest, const char *src) {
   dest[i+j] = '\0';
   return dest;
 }
+
+// https://aticleworld.com/memmove-function-implementation-in-c/
+void * string_memmove(void* dest, const void* src, unsigned int n)
+{
+    char *pDest = (char *)dest;
+    const char *pSrc =( const char*)src;
+    //allocate memory for tmp array
+    char *tmp  = (char *)umalloc(sizeof(char ) * n);
+    if(NULL == tmp)
+    {
+        return NULL;
+    }
+    else
+    {
+        unsigned int i = 0;
+        // copy src to tmp array
+        for(i =0; i < n ; ++i)
+        {
+            *(tmp + i) = *(pSrc + i);
+        }
+        //copy tmp to dest
+        for(i =0 ; i < n ; ++i)
+        {
+            *(pDest + i) = *(tmp + i);
+        }
+        ufree(tmp); //free allocated memory
+    }
+    return dest;
+}

ulib/string/string.h

@@ -18,6 +18,7 @@ char *string_strchr(const char *s, int c);
 int string_strncmp(const char * s1, const char * s2, size_t n);
 char *string_tokenizealloc(char *s, char *delim);
 char *string_combine(char *dest, const char *src);
+void * string_memmove(void* dest, const void* src, unsigned int n);
 
 #endif
 

ulib/ulib.h

@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <umalloc/umalloc.h>
 #include <fs/path.h>
+#include <dlinklist.h>
 
 #include <errors.h>
 #include <sysdefs/ioctl.h>

user/dev/.gitignore

@@ -0,0 +1,2 @@
+*.o
+dev

user/dev/Makefile

@@ -0,0 +1,24 @@
+include $(ROOT)/mk/grabsrc.mk
+include ../Makefile.inc
+
+.PHONY: all clean
+
+TARGET := dev
+
+LDFLAGS += -L$(ROOT)/ulib -l:libulib.a
+
+SRCFILES := $(call GRABSRC, .)
+CFILES := $(call GET_CFILES, $(SRCFILES))
+OBJ := $(call GET_OBJ, $(SRCFILES))
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@
+
+all: $(TARGET)
+
+$(TARGET): $(OBJ)
+	$(LD) $^ $(LDFLAGS) -o $@
+	echo $$(realpath $(TARGET)) >> $(FILES)
+
+clean:
+	rm -f $(OBJ) $(TARGET)

user/dev/ls.c

@@ -0,0 +1,20 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <ulib.h>
+
+void dev_ls(void) {
+  size_t ndevs = devctl(NULL, DEVCTL_DEVLS_SZ, NULL, 0, 0);
+  uprintf("TOTAL: %zu\n", ndevs);
+
+  uprintf("%-20s %-10s\n", "DEVICE", "FUNCTIONS");
+
+  for (size_t i = 0; i < 0x100; i++) {
+    DevStat devstat; ZERO(&devstat);
+    devctl(NULL, DEVCTL_DEVLS_STAT, (uint8_t *)&devstat, i, 0);
+
+    if (!devstat.present)
+      continue;
+
+    uprintf("%-20s %-10zu\n", devstat.name, devstat.nfns);
+  }
+}

user/dev/main.c

@@ -0,0 +1,24 @@
+#include <stdint.h>
+#include <stddef.h>
+#include <ulib.h>
+
+#define CMDS(X)                 \
+  X(ls)
+
+void main(void) {
+  if (argslen() == 0) {
+    return;
+  }
+
+  char *cmd = args()[0];
+
+  #define X(name) if (string_strcmp(cmd, #name) == 0) { \
+    extern void dev_ ## name(void); \
+    dev_ ## name(); \
+    return; \
+  }
+  CMDS(X)
+  #undef X
+
+  uprintf("dev: unknown command %s\n", cmd);
+}

user/tb/interp.c

@@ -6,6 +6,7 @@
 #include "macros.h"
 
 extern PID_t PID;
+extern Dev_t ps2kbdev;
 
 static InterpResult RES;
 
@@ -214,11 +215,10 @@ bool interp_runstring(char *string, InterpResult **res, bool logcmds, bool inter
 
       processctl(app, PCTL_RUN, 0, 0, 0);
 
-      uint8_t b;
       while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4) {
         if (interactive) {
-          int32_t nrd = ipcpipe(PID, IPCPIPE_IN, IPCPIPE_READ, &b, 1);
-          if (nrd > 0 && b == C('S')) {
+          int32_t key = devctl(&ps2kbdev, DEV_PS2KBDEV_READCH, (uint8_t *)PID, 0, 0);
+          if (key > 0 && (uint8_t)key == C('S')) {
             processctl(app, PCTL_KILL, 0, 0, 0);
             goto cleanup;
           }

user/tb/main.c

@@ -139,6 +139,7 @@ void do_mode_interactive(void) {
     if (cursor < LINEBUF_MAX) {
       linebuf[cursor] = '\0';
     }
+    uprintf(ANSIQ_GR_RESET);
     uprintf("\n");
     InterpResult *res;
     if (!interp_runstring(linebuf, &res, CONFIG.logcmds, CONFIG.mode == MODE_INTERACTIVE)) {