From 43da9c40c426095d990bb43cd1081ff4035f87f0 Mon Sep 17 00:00:00 2001 From: Julian Barathieu Date: Thu, 9 May 2019 10:25:52 +0200 Subject: [PATCH] Minor stuff --- kaleid/kernel/init/info.c | 2 +- kaleid/kernel/sh/shcmds.c | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/kaleid/kernel/init/info.c b/kaleid/kernel/init/info.c index 3202992..d8dec18 100644 --- a/kaleid/kernel/init/info.c +++ b/kaleid/kernel/init/info.c @@ -114,7 +114,7 @@ void BtDoSanityChecks(uint mbMagic) { tmp = (BtLoaderInfo.kernelEndAddr - BtLoaderInfo.kernelAddr) / KB; DebugLog("[Init] Kernel successfully loaded at %p with %x magic\n" - " and it uses %d Kio\n\n", + " and it uses %dKB\n\n", BtLoaderInfo.kernelAddr, mbMagic,tmp); } diff --git a/kaleid/kernel/sh/shcmds.c b/kaleid/kernel/sh/shcmds.c index 095c2af..5ce7698 100644 --- a/kaleid/kernel/sh/shcmds.c +++ b/kaleid/kernel/sh/shcmds.c @@ -50,13 +50,17 @@ error_t CmdQuit(int argc, char **argv, char *cmdline) error_t CmdHelp(int argc, char **argv, char *cmdline) { - uint count = 0; + uint i, count = 0; Command_t *cmd; if (argc == 1) { KernLog("List of all shell built-ins:\n"); for (cmd = cmdtable; cmd->name != NULL; cmd++, count++) { - KernLog("\t%s\t\t%s\n", cmd->name, cmd->help); + KernLog("\t%s", cmd->name); + for (i = strlen(cmd->name)/4; i<3; i++) { + KernLog("\t"); + } + KernLog("%s\n", cmd->help); } KernLog("End of list; %u commands total\n", count); } @@ -135,11 +139,11 @@ error_t CmdDie(int argc, char **argv, char *cmdline) Command_t cmdtable[] = { { "beep", CmdBeep, "Make a beep" }, - { "sw", CmdStarWars, "?"}, { "date", CmdDate, "Print date" }, { "die", CmdDie, "Die painfully" }, { "exit", CmdQuit, "Initiate shutdown" }, { "help", CmdHelp, "Show this message" }, + { "march", CmdStarWars, "Play the Imperial March"}, { "mmap", CmdMemMap, "Show memory map" }, { "musage", CmdMemUsage, "Show memory statistics" }, { "pstest", CmdPsTest, "Scheduler test routine" },