Merge pull request #2090 from ghaerr/xmsmsg

[kernel] Minor cleanup to precision timer, XMS A20 boot msg, fdreg.h
ghaerr · Oct 31, 2024 · 6e2bf76 · 6e2bf76
2 parents 2d59813 + faf275b
commit 6e2bf76
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/elks/arch/i86/drivers/block/directfd.c b/elks/arch/i86/drivers/block/directfd.c
@@ -86,14 +86,14 @@
 #include <linuxmt/timer.h>
 #include <linuxmt/mm.h>
 #include <linuxmt/signal.h>
-#include <linuxmt/fdreg.h>
 #include <linuxmt/fd.h>
 #include <linuxmt/errno.h>
 #include <linuxmt/string.h>
 #include <linuxmt/heap.h>
 #include <linuxmt/debug.h>
 
 #include <arch/dma.h>
+#include <arch/fdreg.h>
 #include <arch/system.h>
 #include <arch/io.h>
 #include <arch/irq.h>

diff --git a/elks/arch/i86/lib/prectimer.c b/elks/arch/i86/lib/prectimer.c
@@ -113,21 +113,12 @@ unsigned long get_ptime(void)
     count = lo | hi;
     pticks = lastcount - count;
     lastcount = count;
-#if 1
     if ((int)pticks < 0) {          /* wrapped, jiffies is higher */
         pticks += MAX_PTICK;        /* = MAX_PTICK - count + lastcount */
         jdiff--;                    /* adjust jiffies for wrap, won't ever be negative */
     }
     if (jdiff < 4286)               /* < ~42.86s */
         return jdiff * (unsigned long)MAX_PTICK + pticks;
-#else /* incorrect (old) version - to be removed */
-    if ((int)pticks < 0)            /* wrapped */
-        pticks += MAX_PTICK;        /* = MAX_PTICK - count + lastcount */
-    if (jdiff < 2)                  /* < 10ms: 1..11931 */
-        return pticks;
-    if (jdiff < 4286)               /* < ~42.86s */
-        return (jdiff - 1) * (unsigned long)MAX_PTICK + pticks;
-#endif
     return 0;                       /* overflow displays 0s */
 }
 

diff --git a/elks/arch/i86/mm/xms.c b/elks/arch/i86/mm/xms.c
@@ -8,8 +8,8 @@
 #include <linuxmt/memory.h>
 #include <linuxmt/kernel.h>
 #include <linuxmt/init.h>
-
 #include <linuxmt/string.h>
+#include <linuxmt/debug.h>
 #include <arch/segment.h>
 
 /* linear address to start XMS buffer allocations from */
@@ -51,10 +51,10 @@ int xms_init(void)
 		return 0;
 	}
 #endif
-	printk("A20 was %s", verify_a20()? "on" : "off");
+	debug("A20 was %s", verify_a20()? "on" : "off");
 	enable_a20_gate();
 	enabled = verify_a20();
-	printk(" now %s, ", enabled? "on" : "off");
+	debug(" now %s, ", enabled? "on" : "off");
 	if (!enabled) {
 		printk("disabled, A20 error, ");
 		return 0;

diff --git a/elks/include/linuxmt/fdreg.h → elks/include/arch/fdreg.h b/elks/include/linuxmt/fdreg.h → elks/include/arch/fdreg.h
diff --git a/libc/debug/prectimer.c b/libc/debug/prectimer.c
@@ -113,21 +113,12 @@ unsigned long get_ptime(void)
     count = lo | hi;
     pticks = lastcount - count;
     lastcount = count;
-#if 1
     if ((int)pticks < 0) {          /* wrapped, jiffies is higher */
         pticks += MAX_PTICK;        /* = MAX_PTICK - count + lastcount */
         jdiff--;                    /* adjust jiffies for wrap, won't ever be negative */
     }
     if (jdiff < 4286)               /* < ~42.86s */
         return jdiff * (unsigned long)MAX_PTICK + pticks;
-#else /* incorrect (old) version - to be removed */
-    if ((int)pticks < 0)            /* wrapped */
-        pticks += MAX_PTICK;        /* = MAX_PTICK - count + lastcount */
-    if (jdiff < 2)                  /* < 10ms: 1..11931 */
-        return pticks;
-    if (jdiff < 4286)               /* < ~42.86s */
-        return (jdiff - 1) * (unsigned long)MAX_PTICK + pticks;
-#endif
     return 0;                       /* overflow displays 0s */
 }