From b9322e60e0b895e9f487ad7169f709cc4e84316c Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 12 Mar 2019 17:13:09 +0100 Subject: [PATCH] stuff --- .stylehlp | 26 ++++++++++++++++++++++++++ boot/loader/loader.asm | 8 +++++++- kaleid/kernel/init/init.c | 2 +- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/.stylehlp b/.stylehlp index 588d391..66bda54 100644 --- a/.stylehlp +++ b/.stylehlp @@ -24,3 +24,29 @@ //------------------------------------------// + +;=----------------------------------------------------------------------------=; +; GNU GPL OS/K ; +; ; +; Desc: ; +; ; +; ; +; Copyright © 2018-2019 The OS/K Team ; +; ; +; This file is part of OS/K. ; +; ; +; OS/K is free software: you can redistribute it and/or modify ; +; it under the terms of the GNU General Public License as published by ; +; the Free Software Foundation, either version 3 of the License, or ; +; (at your option) any later version. ; +; ; +; OS/K is distributed in the hope that it will be useful, ; +; but WITHOUT ANY WARRANTY; without even the implied warranty of ; +; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ; +; GNU General Public License for more details. ; +; ; +; You should have received a copy of the GNU General Public License ; +; along with OS/K. If not, see . ; +;=----------------------------------------------------------------------------=; + + diff --git a/boot/loader/loader.asm b/boot/loader/loader.asm index 33236e0..5cf97c7 100644 --- a/boot/loader/loader.asm +++ b/boot/loader/loader.asm @@ -95,9 +95,15 @@ Die: _loader: jmp lbegin -LOGO: db 219, 219, 219, " OS/K", 0 +LOGO db 219, 219, 219, " OS/K", 0 +mbInfo dq 0 +mbMagic dq 0 lbegin: + + pop ebx ; 1st argument multiboot info pointer + pop eax ; 2nd argument is magic number + call clear ; Clear the screen ;; BEGIN OF CHECKLIST diff --git a/kaleid/kernel/init/init.c b/kaleid/kernel/init/init.c index cfa2991..1d56806 100644 --- a/kaleid/kernel/init/init.c +++ b/kaleid/kernel/init/init.c @@ -43,6 +43,6 @@ noreturn void StartKern(void *mbInfo, int mbMagic) InitTerms(); // We're out - StartPanic("Goodbye World :("); + StartPanic("We had\n *mbInfo : %x\n mbMagic : %x\n\nGoodbye World :(", mbInfo, mbMagic); }