Use shared macros for dev function IDs

kernel/Makefile

@@ -63,6 +63,7 @@ SRCFILES += $(call GRABSRC, \
 							rbuf \
 							ipc/pipe \
 							drivers/ps2kb \
+							drivers/serial \
 							dev \
             )
 

kernel/dev/dev.c

@@ -6,6 +6,7 @@
 #include "hal/hal.h"
 #include "termdev.h"
 #include "ps2kbdev.h"
+#include "serialdev.h"
 
 DevTable DEVTABLE;
 
@@ -15,4 +16,5 @@ void dev_init(void) {
 
   termdev_init();
   ps2kbdev_init();
+  serialdev_init();
 }

kernel/dev/dev.h

@@ -12,6 +12,7 @@ typedef struct {
   int _hshtbstate;
   char ident[0x100];
   DevFn fns[DEV_FNS_MAX];
+  SpinLock spinlock;
 } Dev;
 
 

kernel/dev/ps2kbdev.c

@@ -8,6 +8,7 @@
 #include "dlmalloc/malloc.h"
 #include "util/util.h"
 #include "hshtb.h"
+#include "sysdefs/devctl.h"
 
 Ps2KbFastBuf PS2KB_BUF;
 
@@ -33,5 +34,6 @@ void ps2kbdev_init(void) {
 
   Dev *ps2kbdev;
   HSHTB_ALLOC(DEVTABLE.devs, ident, "ps2kbdev", ps2kbdev);
-  ps2kbdev->fns[0] = &ps2kbdev_readch;
+  spinlock_init(&ps2kbdev->spinlock);
+  ps2kbdev->fns[DEV_PS2KBDEV_READCH] = &ps2kbdev_readch;
 }

kernel/dev/serialdev.c

@@ -0,0 +1,42 @@
+#include <stdint.h>
+#include <stddef.h>
+#include "dev.h"
+#include "serialdev.h"
+#include "errors.h"
+#include "util/util.h"
+#include "hshtb.h"
+#include "sysdefs/devctl.h"
+#include "drivers/serial/serial.h"
+#include "kprintf.h"
+
+int32_t serialdev_sendb(uint8_t *buffer, size_t len, void *extra) {
+  (void)len; (void)extra;
+  serial_sendb(buffer[0]);
+  return E_OK;
+}
+
+int32_t serialdev_sendready(uint8_t *buffer, size_t len, void *extra) {
+  (void)buffer; (void)len; (void) extra;
+  return serial_sendready();
+}
+
+int32_t serialdev_recvb(uint8_t *buffer, size_t len, void *extra) {
+  (void)buffer; (void)len; (void)extra;
+  return serial_recvb();
+}
+
+int32_t serialdev_recvready(uint8_t *buffer, size_t len, void *extra) {
+  (void)buffer; (void)len; (void)extra;
+  return serial_recvready();
+}
+
+void serialdev_init(void) {
+  Dev *serialdev = NULL;
+  HSHTB_ALLOC(DEVTABLE.devs, ident, "serialdev", serialdev);
+  serialdev->fns[DEV_SERIALDEV_SENDB] = &serialdev_sendb;
+  serialdev->fns[DEV_SERIALDEV_SENDREADY] = &serialdev_sendready;
+  serialdev->fns[DEV_SERIALDEV_RECVB] = &serialdev_recvb;
+  serialdev->fns[DEV_SERIALDEV_RECVREADY] = &serialdev_recvready;
+  spinlock_init(&serialdev->spinlock);
+  serial_init();
+}

kernel/dev/serialdev.h

@@ -0,0 +1,10 @@
+#ifndef DEV_SERIALDEV_H_
+#define DEV_SERIALDEV_H_
+
+int32_t serialdev_sendb(uint8_t *buffer, size_t len, void *extra);
+int32_t serialdev_sendready(uint8_t *buffer, size_t len, void *extra);
+int32_t serialdev_recvb(uint8_t *buffer, size_t len, void *extra);
+int32_t serialdev_recvready(uint8_t *buffer, size_t len, void *extra);
+void serialdev_init(void);
+
+#endif // DEV_SERIALDEV_H_

kernel/dev/termdev.c

@@ -7,6 +7,7 @@
 #include "errors.h"
 #include "util/util.h"
 #include "hshtb.h"
+#include "sysdefs/devctl.h"
 
 int32_t termdev_putch(uint8_t *buffer, size_t len, void *extra) {
   kprintf("%.*s", (int)len, (char *)buffer);
@@ -16,5 +17,6 @@ int32_t termdev_putch(uint8_t *buffer, size_t len, void *extra) {
 void termdev_init(void) {
   Dev *termdev = NULL;
   HSHTB_ALLOC(DEVTABLE.devs, ident, "termdev", termdev);
-  termdev->fns[0] = &termdev_putch;
+  termdev->fns[DEV_TERMDEV_PUTCH] = &termdev_putch;
+  spinlock_init(&termdev->spinlock);
 }

kernel/drivers/serial/serial.c

@@ -0,0 +1,42 @@
+#include <stdint.h>
+#include "hal/hal.h"
+#include "kprintf.h"
+
+// https://wiki.osdev.org/Serial_Ports
+
+#define PORT 0x3f8
+
+void serial_init(void) {
+  io_out8(PORT+1, 0x00);
+  io_out8(PORT+3, 0x80);
+  io_out8(PORT+0, 0x03);
+  io_out8(PORT+1, 0x00);
+  io_out8(PORT+3, 0x03);
+  io_out8(PORT+2, 0xC7);
+  io_out8(PORT+4, 0x0B);
+  io_out8(PORT+4, 0x1E);
+  io_out8(PORT+0, 0xAE);
+
+  if (io_in8(PORT+0) != 0xAE) {
+    ERR("serial", "serial is faulty!\n");
+    return;
+  }
+
+  io_out8(PORT+4, 0x0F);
+}
+
+int serial_recvready(void) {
+  return io_in8(PORT+5) & 1;
+}
+
+uint8_t serial_recvb(void) {
+  return io_in8(PORT);
+}
+
+int serial_sendready(void) {
+  return io_in8(PORT+5) & 0x20;
+}
+
+void serial_sendb(uint8_t b) {
+  io_out8(PORT, b);
+}

kernel/drivers/serial/serial.h

@@ -0,0 +1,12 @@
+#ifndef DRIVERS_SERIAL_SERIAL_H_
+#define DRIVERS_SERIAL_SERIAL_H_
+
+#include <stdint.h>
+
+void serial_init(void);
+int serial_recvready(void);
+uint8_t serial_recvb(void);
+int serial_sendready(void);
+void serial_sendb(uint8_t b);
+
+#endif // DRIVERS_SERIAL_SERIAL_H_

kernel/hshtb.h

@@ -26,13 +26,17 @@ enum {
   HSHTB_TOMB = 2,
 };
 
+#define __HSHTB_ARRAY_LEN(tb) \
+ ((void)sizeof(struct { int _[!!(sizeof(tb) % sizeof((tb)[0]) == 0)]; }) , (sizeof(tb) / sizeof((tb)[0])))
+
 #define HSHTB_ALLOC(tb, keyfield, k, out) \
   do { \
-    size_t __len = sizeof((tb)) / sizeof((tb)[0]); \
+    size_t __len = __HSHTB_ARRAY_LEN(tb); \
     uint32_t __h = hshtb_fnv32((k), hal_strlen((k))); \
     size_t __idx = __h % __len; \
     size_t __start = __idx; \
     typeof(&(tb)[0]) __tomb = NULL; \
+    (out) = NULL; \
     do { \
       if ((tb)[__idx]._hshtbstate == HSHTB_EMPTY) { \
         typeof(&(tb)[0]) __slot = __tomb ? __tomb : &(tb)[__idx]; \
@@ -55,7 +59,7 @@ enum {
 
 #define HSHTB_GET(tb, keyfield, k, out) \
   do { \
-    size_t __len = sizeof((tb)) / sizeof((tb)[0]); \
+    size_t __len = __HSHTB_ARRAY_LEN(tb); \
     uint32_t __h = hshtb_fnv32((k), hal_strlen((k))); \
     size_t __idx = __h % __len; \
     size_t __start = __idx; \
@@ -77,7 +81,7 @@ enum {
     typeof(&(tb)[0]) __e; \
     HSHTB_GET((tb), (keyfield), (k), __e); \
     if (__e) { \
-      __e->state = HSHTB_TOMB; \
+      __e->_hshtbstate = HSHTB_TOMB; \
     } \
   } while(0)
 

kernel/kmain.c

@@ -11,8 +11,7 @@
 #include "storedev/storedev.h"
 #include "util/util.h"
 #include "proc/proc.h"
-#include "dev/termdev.h"
-#include "dev/ps2kbdev.h"
+#include "dev/dev.h"
 
 const char *human_size(uint64_t bytes, char *buf, size_t bufsize) {
   static const char *units[] = { "B", "KiB", "MiB", "GiB", "TiB", "PiB" };
@@ -66,8 +65,7 @@ void kmain(void) {
   storedev_init();
   baseimg_init();
   vfs_init();
-  termdev_init();
-  ps2kbdev_init();
+  dev_init();
   proc_init();
 
   for(;;);

kernel/syscall/devctl.c

@@ -27,8 +27,10 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
         goto done;
       }
 
+      spinlock_acquire(&DEVTABLE.spinlock);
       Dev *founddev;
       HSHTB_GET(DEVTABLE.devs, ident, ident, founddev);
+      spinlock_release(&DEVTABLE.spinlock);
 
       if (founddev == NULL) {
         ret = E_NOENTRY;
@@ -66,7 +68,9 @@ int32_t SYSCALL5(sys_devctl, devh1, cmd1, buffer1, len1, extra1) {
         ret = E_NOENTRY;
         goto done;
       }
+      spinlock_acquire(&dev->spinlock);
       ret = dev->fns[cmd]((uint8_t *)buffer1, (size_t)len1, (void *)extra1);
+      spinlock_release(&dev->spinlock);
     } break;
   }
 

share/sysdefs/devctl.h

@@ -3,6 +3,15 @@
 
 #define DEVCTL_GET_HANDLE 100
 
+#define DEV_TERMDEV_PUTCH 0
+
+#define DEV_PS2KBDEV_READCH 0
+
+#define DEV_SERIALDEV_SENDB     0
+#define DEV_SERIALDEV_SENDREADY 1
+#define DEV_SERIALDEV_RECVB     2
+#define DEV_SERIALDEV_RECVREADY 3
+
 #if !defined(__ASSEMBLER__)
 
 typedef uint64_t Dev_t;

ulib/dev.h

@@ -1,8 +0,0 @@
-#ifndef ULIB_DEV_H_
-#define ULIB_DEV_H_
-
-#define DEV_TERMDEV_PUTCH 0
-
-#define DEV_PS2KBDEV_READCH 0
-
-#endif // ULIB_DEV_H_

ulib/ulib.h

@@ -16,7 +16,6 @@
 #include <log.h>
 #include <assert.h>
 #include <umalloc/umalloc.h>
-#include <dev.h>
 #include <fs/path.h>
 
 #include <errors.h>