os-k-team/os-k
os-k-team
/
os-k
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

stuff

This commit is contained in:
Adrien Bourmault 2019-03-12 17:13:09 +01:00
parent 8660d52912
commit b9322e60e0
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
.stylehlp
View File

@ -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 <https://www.gnu.org/licenses/>. ;
;=----------------------------------------------------------------------------=;

8
boot/loader/loader.asm
View File

@ -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

2
kaleid/kernel/init/init.c
View File

@ -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);
}