From 7f27ead23b6a10d4e27acd49219adb25a83b54c2 Mon Sep 17 00:00:00 2001
From: Julian Barathieu <spectral@os-k.eu>
Date: Thu, 9 May 2019 11:33:07 +0200
Subject: [PATCH] Stuff

---
 kaleid/kernel/mm/map.c    | 2 +-
 kaleid/kernel/ps/sched.c  | 2 +-
 kaleid/kernel/sh/shcmds.c | 6 +++---
 kaleid/kernel/sh/shell.c  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/kaleid/kernel/mm/map.c b/kaleid/kernel/mm/map.c
index 45334c7..6f1c6cb 100644
--- a/kaleid/kernel/mm/map.c
+++ b/kaleid/kernel/mm/map.c
@@ -195,7 +195,7 @@ void MmPrintMemoryMap(void) {
 
         ulong len = memoryMap.entry[i].length;
 
-        KernLog("Mem zone : %lp\t%s\twith length: %luMB + %luKB + %luB\n",
+        KernLog("mem zone: %lp\t%s\twith length: %04luMB + %04luKB + %04luB\n",
                 memoryMap.entry[i].addr, avStr,
                 _ADDR_TO_MB(len), _ADDR_TO_KB(len), _ADDR_TO_B(len)
                 );
diff --git a/kaleid/kernel/ps/sched.c b/kaleid/kernel/ps/sched.c
index b7ab3dc..047c728 100644
--- a/kaleid/kernel/ps/sched.c
+++ b/kaleid/kernel/ps/sched.c
@@ -390,7 +390,7 @@ void pstest(void)
 
     while (tick < 100) {
         //if (tick%25==0)ClearTerm(StdOut);
-        if (tick > 0 && tick != 50 && tick % 10 == 0) {
+        if (tick > 0 && tick != 50 && tick % 10 == 0 && PsCurProc) {
             KernLog("Blocking current process\n");
             PsBlockCurProc();
         }
diff --git a/kaleid/kernel/sh/shcmds.c b/kaleid/kernel/sh/shcmds.c
index e00a95c..6c5240c 100644
--- a/kaleid/kernel/sh/shcmds.c
+++ b/kaleid/kernel/sh/shcmds.c
@@ -101,7 +101,7 @@ error_t CmdMemUsage(int argc, char **argv, char *cmdline)
     stack_diff = (size_t)BtLoaderInfo.kernelEndAddr - (realKernelEnd + 1);
     heap_diff = (size_t)heap_end - (size_t)heap_start;
     
-    KernLog("Kernel image:\n");
+    KernLog("Kernel image\n");
 
     KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
                 BtLoaderInfo.kernelAddr,
@@ -121,7 +121,7 @@ error_t CmdMemUsage(int argc, char **argv, char *cmdline)
                 _ADDR_TO_B(img_diff),
                 img_diff);
 
-    KernLog("Kernel stack:\n");
+    KernLog("Kernel stack\n");
 
     KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
                 BtLoaderInfo.kernelEndAddr,
@@ -159,7 +159,7 @@ error_t CmdMemUsage(int argc, char **argv, char *cmdline)
                 _ADDR_TO_B(stack_diff),
                 stack_diff);
 
-    KernLog("Kernel heap:\n");
+    KernLog("Kernel heap\n");
 
     KernLog("\tstarts at:\t\t%p (%04luMB + %04luKB + %04luB)\n",
                 heap_start, _ADDR_TO_MB(heap_start),
diff --git a/kaleid/kernel/sh/shell.c b/kaleid/kernel/sh/shell.c
index 8c961e2..3b0a8a9 100644
--- a/kaleid/kernel/sh/shell.c
+++ b/kaleid/kernel/sh/shell.c
@@ -67,7 +67,7 @@ void KeStartShell(void)
     memzero(argv0, ARG_MAX);
     shargv = &argv0;
 
-    KernLog("shell> ");
+    KernLog("\nshell> ");
     BFlushBuf(BStdOut);
 
     while ((rc = BGetFromBuf(BStdIn, &ch)) == EOK || rc == EENDF) {