From 70d6931e3b49993423c384bbf13b273597953cb7 Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Sat, 4 Oct 2025 21:34:48 +0200
Subject: [PATCH] Use shared macros for dev function IDs

---
 kernel/dev/ps2kbdev.c | 3 ++-
 kernel/dev/termdev.c  | 3 ++-
 user/init/main.c      | 5 -----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/kernel/dev/ps2kbdev.c b/kernel/dev/ps2kbdev.c
index b5b7e95..0aadcda 100644
--- a/kernel/dev/ps2kbdev.c
+++ b/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;
 
@@ -34,5 +35,5 @@ void ps2kbdev_init(void) {
   Dev *ps2kbdev;
   HSHTB_ALLOC(DEVTABLE.devs, ident, "ps2kbdev", ps2kbdev);
   spinlock_init(&ps2kbdev->spinlock);
-  ps2kbdev->fns[0] = &ps2kbdev_readch;
+  ps2kbdev->fns[DEV_PS2KBDEV_READCH] = &ps2kbdev_readch;
 }
diff --git a/kernel/dev/termdev.c b/kernel/dev/termdev.c
index 7e3c489..3011815 100644
--- a/kernel/dev/termdev.c
+++ b/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,6 +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);
 }
diff --git a/user/init/main.c b/user/init/main.c
index 95f0176..0d99c0b 100644
--- a/user/init/main.c
+++ b/user/init/main.c
@@ -35,11 +35,6 @@ void main(void) {
   PID = (uint64_t)processctl(-1, PCTL_GETPID, 0, 0, 0);
   devctl(&ps2kbdev, DEVCTL_GET_HANDLE, (uint8_t *)"ps2kbdev", 0, 0);
 
-  Dev_t serialdev;
-  int32_t err = devctl(&serialdev, DEVCTL_GET_HANDLE, (uint8_t *)"serialdev", 0, 0);
-  uint8_t a = 'A';
-  devctl(&serialdev, DEV_SERIALDEV_SENDB, &a, 1, 0);
-
   tb_runinitscript();
 
   uprintf("Shell exited! Please reboot the system.\n");