From 0c3250e8d611ce1933419c8748f6eb3fd8ab8618 Mon Sep 17 00:00:00 2001
From: kamkow1 <kamkow256@gmail.com>
Date: Tue, 14 Oct 2025 20:20:41 +0200
Subject: [PATCH] Remove/fix unused stuff and other warnings

---
 kernel/dev/fbdev.c         |  1 +
 kernel/dev/ps2kbdev.c      |  2 ++
 kernel/dev/serialdev.c     |  8 ++++----
 kernel/dev/termdev.c       |  1 +
 kernel/hal/util.c          |  4 ++--
 kernel/hal/x86_64/intr.c   |  2 +-
 kernel/hal/x86_64/vmm.c    |  7 +++----
 kernel/hal/x86_64/vmm.h    |  2 +-
 kernel/randcrypto/uniqid.c |  2 +-
 kernel/storedev/atasd.c    |  3 ++-
 kernel/syscall/mman.c      |  1 -
 kernel/term/term.c         | 34 ----------------------------------
 ulib/string/string.c       |  4 ++--
 user/fs/tree.c             |  2 +-
 user/pctl/ls.c             |  4 ++--
 user/tb/interp.c           |  1 -
 user/tb/runtime.c          |  1 +
 17 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/kernel/dev/fbdev.c b/kernel/dev/fbdev.c
index 7102d87..aafbdb0 100644
--- a/kernel/dev/fbdev.c
+++ b/kernel/dev/fbdev.c
@@ -11,6 +11,7 @@
 #include "errors.h"
 
 int32_t fbdev_getinfo(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
+  (void)dev; (void)buffer; (void)len; (void)extra;
   FbDevGetInfo info = {
     .w = BOOT_INFO.fb->width,
     .h = BOOT_INFO.fb->height,
diff --git a/kernel/dev/ps2kbdev.c b/kernel/dev/ps2kbdev.c
index ed4440a..6511df0 100644
--- a/kernel/dev/ps2kbdev.c
+++ b/kernel/dev/ps2kbdev.c
@@ -164,6 +164,7 @@ struct {
 } PS2KB_CONSUMERS = {0};
 
 int32_t ps2kbdev_readch(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
+  (void)dev; (void)len; (void)extra;
   uint64_t pid = (uint64_t)buffer;
   Proc *consproc = NULL;
   spinlock_acquire(&PROCS.spinlock);
@@ -202,6 +203,7 @@ int32_t ps2kbdev_readch(struct Dev *dev, uint8_t *buffer, size_t len, void *extr
 #define CONSUMER_RBUF_MAX 0x400
 
 int32_t ps2kbdev_attchcons(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
+  (void)dev; (void)len; (void)extra;
   uint64_t pid = (uint64_t)buffer;
   spinlock_acquire(&PROCS.spinlock);
   Proc *proc, *proctmp;
diff --git a/kernel/dev/serialdev.c b/kernel/dev/serialdev.c
index 3a77b70..d6f9680 100644
--- a/kernel/dev/serialdev.c
+++ b/kernel/dev/serialdev.c
@@ -49,23 +49,23 @@ void serial_sendb(uint8_t b) {
 }
 
 int32_t serialdev_sendb(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
-  (void)len; (void)extra;
+  (void)dev; (void)len; (void)extra;
   serial_sendb(buffer[0]);
   return E_OK;
 }
 
 int32_t serialdev_sendready(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
-  (void)buffer; (void)len; (void) extra;
+  (void)dev; (void)buffer; (void)len; (void) extra;
   return serial_sendready();
 }
 
 int32_t serialdev_recvb(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
-  (void)buffer; (void)len; (void)extra;
+  (void)dev; (void)buffer; (void)len; (void)extra;
   return serial_recvb();
 }
 
 int32_t serialdev_recvready(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
-  (void)buffer; (void)len; (void)extra;
+  (void)dev; (void)buffer; (void)len; (void)extra;
   return serial_recvready();
 }
 
diff --git a/kernel/dev/termdev.c b/kernel/dev/termdev.c
index 06ca4a8..6b5be37 100644
--- a/kernel/dev/termdev.c
+++ b/kernel/dev/termdev.c
@@ -10,6 +10,7 @@
 #include "sysdefs/devctl.h"
 
 int32_t termdev_putch(struct Dev *dev, uint8_t *buffer, size_t len, void *extra) {
+  (void)dev; (void)extra;
   kprintf("%.*s", (int)len, (char *)buffer);
   return E_OK;
 }
diff --git a/kernel/hal/util.c b/kernel/hal/util.c
index b8d4e70..33f5696 100644
--- a/kernel/hal/util.c
+++ b/kernel/hal/util.c
@@ -24,8 +24,8 @@ size_t hal_strlen(char *s) {
 // https://aticleworld.com/memcmp-in-c/
 int hal_memcmp(const void *s1, const void *s2, int len)
 {
-    unsigned char *p = s1;
-    unsigned char *q = s2;
+    unsigned char *p = (unsigned char *)s1;
+    unsigned char *q = (unsigned char *)s2;
     int charCompareStatus = 0;
     //If both pointer pointing same memory block
     if (s1 == s2)
diff --git a/kernel/hal/x86_64/intr.c b/kernel/hal/x86_64/intr.c
index 85ed5c0..70a74da 100644
--- a/kernel/hal/x86_64/intr.c
+++ b/kernel/hal/x86_64/intr.c
@@ -229,7 +229,7 @@ void intr_handleintr(IntrStackFrame *frame) {
       default:
         IntrHandler *ih, *ihtmp;
         LL_FOREACH_SAFE(INTR_HANDLERS, ih, ihtmp) {
-          if (ih->irq == frame->trapnum) {
+          if ((uint64_t)ih->irq == frame->trapnum) {
             ih->fn();
           }
         }
diff --git a/kernel/hal/x86_64/vmm.c b/kernel/hal/x86_64/vmm.c
index 14e641a..a4fef5f 100644
--- a/kernel/hal/x86_64/vmm.c
+++ b/kernel/hal/x86_64/vmm.c
@@ -59,7 +59,7 @@ void hal_vmm_map_page(uint64_t cr3phys, uint64_t virtaddr, uint64_t physaddr, ui
   *pte = (physaddr & ~0xFFFULL) | ((uint64_t)flags & 0x7ULL);
 }
 
-void hal_vmm_unmap_page(uint64_t cr3phys, uint64_t virtaddr, uint64_t physaddr) {
+void hal_vmm_unmap_page(uint64_t cr3phys, uint64_t virtaddr) {
   uint64_t *pml4 = (uint64_t *)VIRT(cr3phys);
   PgIndex pi = hal_vmm_pageindex(virtaddr);
   
@@ -93,11 +93,10 @@ void hal_vmm_unmap_range(uint64_t cr3phys, void *virtstart, void *physstart, siz
 
   spinlock_acquire(&spinlock);
   uint8_t *vaddr = (uint8_t *)virtstart;
-  uint8_t *paddr = (uint8_t *)physstart;
   uint8_t *end = vaddr + size;
 
-  for (; vaddr < end; vaddr += HAL_PAGE_SIZE, paddr += HAL_PAGE_SIZE) {
-    hal_vmm_unmap_page(cr3phys, (uint64_t)vaddr, (uint64_t)paddr);
+  for (; vaddr < end; vaddr += HAL_PAGE_SIZE) {
+    hal_vmm_unmap_page(cr3phys, (uint64_t)vaddr);
   }
   spinlock_release(&spinlock);
 }
diff --git a/kernel/hal/x86_64/vmm.h b/kernel/hal/x86_64/vmm.h
index 568448a..cf3ed6c 100644
--- a/kernel/hal/x86_64/vmm.h
+++ b/kernel/hal/x86_64/vmm.h
@@ -53,7 +53,7 @@ typedef struct {
 extern uint64_t KERNEL_CR3;
 
 void hal_vmm_init(void);
-void hal_vmm_unmap_page(uint64_t cr3phys, uint64_t virtaddr, uint64_t physaddr);
+void hal_vmm_unmap_page(uint64_t cr3phys, uint64_t virtaddr);
 void hal_vmm_map_page(uint64_t cr3phys, uint64_t virtaddr, uint64_t physaddr, uint32_t flags);
 uint64_t hal_vmm_current_cr3(void);
 void hal_vmm_map_range(uint64_t cr3phys, void *virtstart, void *physstart, size_t size, uint32_t flags);
diff --git a/kernel/randcrypto/uniqid.c b/kernel/randcrypto/uniqid.c
index c232f44..3e2975d 100644
--- a/kernel/randcrypto/uniqid.c
+++ b/kernel/randcrypto/uniqid.c
@@ -52,7 +52,7 @@ void randcrypto_gen_uniqid(char *out, size_t n) {
   uint32_t extra = (r != -1) ? (uint32_t)r : uniqstate * 0x27d4eb2dU;
 
   uniqstate += 0x9E3779B1u;
-  uint32_t v = uniqmix32(uniqstate);
+  uint32_t v = uniqmix32(uniqstate ^ extra);
   
   spinlock_release(&uniqstate_spinlock);
 
diff --git a/kernel/storedev/atasd.c b/kernel/storedev/atasd.c
index 8f61380..6e5ffb0 100644
--- a/kernel/storedev/atasd.c
+++ b/kernel/storedev/atasd.c
@@ -128,7 +128,7 @@ void ata_probe(void) {
       .devno = ATA_MASTER,
       .capacity = probesize,
     };
-    StoreDev *sd = storedev_create(STOREDEV_ATASD, (void *)&extra);
+    storedev_create(STOREDEV_ATASD, (void *)&extra);
   }
 }
 
@@ -211,6 +211,7 @@ done:
 }
 
 int32_t atasd_cleanup(struct StoreDev *sd) {
+  (void)sd;
   return E_OK;
 }
 
diff --git a/kernel/syscall/mman.c b/kernel/syscall/mman.c
index 3414e99..87a85ea 100644
--- a/kernel/syscall/mman.c
+++ b/kernel/syscall/mman.c
@@ -81,7 +81,6 @@ int32_t SYSCALL1(sys_mman_unmap, addr1) {
   Proc *proc = PROCS.current;
   spinlock_release(&PROCS.spinlock);
 
-  uint8_t *virt = NULL;
   VasRange *tofree = NULL;
 
   VasRange *vas, *vastmp;
diff --git a/kernel/term/term.c b/kernel/term/term.c
index 5730f41..b9f49bc 100644
--- a/kernel/term/term.c
+++ b/kernel/term/term.c
@@ -8,34 +8,6 @@
 
 Term TERM;
 
-static uint32_t ansi_colours[8] = {
-    0xFFFFFBF0, 
-    0xFFE64C4C, 
-    0xFF4CAF50, 
-    0xFFCC9900, 
-    0xFF337AB7, 
-    0xFF9B59B6, 
-    0xFF0097A7, 
-    0xFF555555  
-};
-
-static uint32_t ansi_bright_colours[8] = {
-    0xFFBFB9AA, 
-    0xFFFF6B6B, 
-    0xFF66BB6A, 
-    0xFFFFC107, 
-    0xFF42A5F5, 
-    0xFFBA68C8, 
-    0xFF26C6DA, 
-    0xFF000000  
-};
-
-// defaults
-static uint32_t default_bg        = 0xFFFFFBF0; 
-static uint32_t default_fg        = 0xFF222222; 
-static uint32_t default_bg_bright = 0xFFFFFBF0;
-static uint32_t default_fg_bright = 0xFF000000; 
-
 void term_doinit(void *addr) {
   TERM.ftctx = flanterm_fb_init(
     NULL, // malloc
@@ -57,12 +29,6 @@ void term_doinit(void *addr) {
     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,
diff --git a/ulib/string/string.c b/ulib/string/string.c
index d4175b4..d2277ea 100644
--- a/ulib/string/string.c
+++ b/ulib/string/string.c
@@ -27,8 +27,8 @@ void *string_memcpy(void *dst, const void *src, size_t n) {
 // https://aticleworld.com/memcmp-in-c/
 int string_memcmp(const void *s1, const void *s2, int len)
 {
-    unsigned char *p = s1;
-    unsigned char *q = s2;
+    unsigned char *p = (unsigned char *)s1;
+    unsigned char *q = (unsigned char *)s2;
     int charCompareStatus = 0;
     //If both pointer pointing same memory block
     if (s1 == s2)
diff --git a/user/fs/tree.c b/user/fs/tree.c
index 56283f8..e20f65f 100644
--- a/user/fs/tree.c
+++ b/user/fs/tree.c
@@ -3,7 +3,7 @@
 #include <ulib.h>
 
 int showtree(char *root, int indent) {
-  #define INDENT() for (size_t i = 0; i < indent; i++) uprintf(" ")
+  #define INDENT() for (size_t i = 0; i < (size_t)indent; i++) uprintf(" ")
 
   FsStat statbuf; ZERO(&statbuf);
   if (fs_stat(root, &statbuf) != E_OK) {
diff --git a/user/pctl/ls.c b/user/pctl/ls.c
index 9ea50ad..b604578 100644
--- a/user/pctl/ls.c
+++ b/user/pctl/ls.c
@@ -32,7 +32,7 @@ void pctl_ls(void) {
   char *membuf = umalloc(20);
   
   uprintf("%-30s %s %-15s %-8s\n", "NAME", "PID", "MEMORY", "STATE");
-  for (size_t i = 0; i < procslen; i++) {
+  for (size_t i = 0; i < (size_t)procslen; i++) {
     ProcStat stat; ZERO(&stat);
 
     string_memset(namebuf, 0, 34);
@@ -45,7 +45,7 @@ void pctl_ls(void) {
         continue;
       }
 
-      if (PCTL_LS_CONFIG.pid != -1 && stat.pid != PCTL_LS_CONFIG.pid) {
+      if (PCTL_LS_CONFIG.pid != -1 && stat.pid != (uint64_t)PCTL_LS_CONFIG.pid) {
         continue;
       }
 
diff --git a/user/tb/interp.c b/user/tb/interp.c
index 5cedaf6..0f90d36 100644
--- a/user/tb/interp.c
+++ b/user/tb/interp.c
@@ -238,6 +238,5 @@ next:
     line = string_tokenizealloc(NULL, "\n");
   }
 
-done:
   return ok;
 }
diff --git a/user/tb/runtime.c b/user/tb/runtime.c
index 37cea1c..6610b18 100644
--- a/user/tb/runtime.c
+++ b/user/tb/runtime.c
@@ -79,6 +79,7 @@ bool rt_mkalias(Token *tks) {
 }
 
 bool rt_PID(Token *tks) {
+  (void)tks;
   uprintf("%lu\n", PID);
   return true;
 }