From eb40357fb62ef2d07f2aa29f85de5fac7b22bb63 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 12 Mar 2019 15:19:10 +0100 Subject: [PATCH 1/3] Assert --- kaleid/kernel/io/term.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kaleid/kernel/io/term.c b/kaleid/kernel/io/term.c index fa5da06..5392b23 100644 --- a/kaleid/kernel/io/term.c +++ b/kaleid/kernel/io/term.c @@ -32,7 +32,7 @@ extern Terminal_t VGA_Terminal; // void InitTerms(void) { - //KalAssert(!GetStdOut() && !GetStdDbg()); + KalAssert(!GetStdOut() && !GetStdDbg()); VGA_Init(); From 5da35bcbe8d7aa66369f0c5a16e68f396457bc08 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 17 Mar 2019 23:05:31 +0100 Subject: [PATCH 2/3] new tree --- ProjectTree | 85 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 35 deletions(-) diff --git a/ProjectTree b/ProjectTree index 586b9d7..6ff3997 100644 --- a/ProjectTree +++ b/ProjectTree @@ -22,37 +22,42 @@ # along with OS/K. If not, see . # #=----------------------------------------------------------------------------=# - - . +├── AUTHORS ├── boot -│   ├── loader -│   │   ├── cpu -│   │   │   ├── cpu.asm -│   │   │   └── cpuid.asm -│   │   ├── elf -│   │   │   └── elf.c -│   │   ├── fs -│   │   │   └── fat.asm -│   │   ├── io -│   │   │   ├── ata.asm -│   │   │   ├── lmmem.asm -│   │   │   ├── lmterm.asm -│   │   │   ├── rmmem.asm -│   │   │   └── rmterm.asm -│   │   └── loader.asm -│   ├── mbr -│   │   ├── mbr.asm -│   │   └── mbr.inc -│   └── folder.desc +│   ├── folder.desc +│   ├── grub +│   │   ├── create_disk.sh +│   │   ├── grub.cfg +│   │   ├── grub-install.sh +│   │   ├── mount.sh +│   │   ├── multiboot.pdf +│   │   └── umount.sh +│   └── loader +│   ├── cpu +│   │   ├── cpu32.inc +│   │   └── cpu.inc +│   ├── io +│   │   └── terminal.inc +│   ├── loader.asm +│   ├── mem +│   │   ├── management.inc +│   │   └── structures.inc +│   └── multiboot +│   ├── check.inc +│   └── header.inc ├── build -│   ├── idttool.py -│   ├── kernel.ld -│   └── preproc.h +│   ├── bin +│   │   ├── disk.img +│   │   └── kaleid +│   └─── kernel.ld +├── ChangeLog +├── COPYING +├── grub.log ├── kaleid │   ├── crtlib -│   │   ├── arith.c │   │   ├── atoi.c +│   │   ├── ctype.c │   │   ├── itoa.c │   │   ├── memory.c │   │   ├── rand.c @@ -78,33 +83,43 @@ │   │   │   ├── locks.h │   │   │   ├── malloc.h │   │   │   └── prog.h -│   │   ├── kernel -│   │   │   ├── base.h -│   │   │   ├── sched.h -│   │   │   └── terminal.h │   │   ├── kalbase.h │   │   ├── kaleid.h │   │   ├── kalext.h -│   │   └── kalkern.h +│   │   ├── kernel +│   │   │   ├── base.h +│   │   │   ├── cpu.h +│   │   │   ├── iomisc.h +│   │   │   ├── mm.h +│   │   │   ├── panic.h +│   │   │   ├── proc.h +│   │   │   ├── sched.h +│   │   │   └── term.h +│   │   └── multiboot +│   │   └── multiboot.h │   └── kernel +│   ├── cpu +│   │   └── cpuid.c │   ├── init │   │   ├── init.c │   │   └── table.c │   ├── io +│   │   ├── ata.inc │   │   ├── cursor.c │   │   ├── term.c │   │   └── vga.c │   ├── ke │   │   └── panic.c +│   ├── mm │   └── proc │   ├── Makefile │   └── sched.c -├── AUTHORS -├── ChangeLog -├── COPYING +├── loader_disasm32.asm +├── loader_disasm64.asm ├── Makefile -├── Makefile.in ├── ProjectTree +├── qemu.log └── Readme.md -20 directories, 61 files +28 directories, 99 files + From af567d1fc9883a923d01c34d283664b3b9fc83da Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Sun, 17 Mar 2019 23:18:25 +0100 Subject: [PATCH 3/3] stuff --- .stylehlp | 24 +++++++++++++++++++++++- AUTHORS | 7 +++++-- ChangeLog | 6 ++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/.stylehlp b/.stylehlp index 66bda54..ec5e145 100644 --- a/.stylehlp +++ b/.stylehlp @@ -49,4 +49,26 @@ ; along with OS/K. If not, see . ; ;=----------------------------------------------------------------------------=; - +#=----------------------------------------------------------------------------=# +# 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 # +# 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/AUTHORS b/AUTHORS index 3c74434..ddebb5a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -29,13 +29,16 @@ project repository, and own the copyright in it. Founders and owner of the OS/K project repository Julian Barathieu (julianb0) - Adrien Bourmault (NeoX95) + Adrien Bourmault (neox95) Main contributors Julian Barathieu (julianb0) - Adrien Bourmault (NeoX95) + Adrien Bourmault (neox95) Other contributors (void) + + + Contact : os-k-team@os-k.eu diff --git a/ChangeLog b/ChangeLog index 9410f1e..d2b38a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -29,4 +29,10 @@ - Added A20 line Enabling to MBR 2018/12/21 - Boot is now in two stages. First stage is 512B MBR code that loads second stage loader from FAT16. That second stage loader enables A20, switches into long mode and write colored text =D +[...] +2019/03/17 Well... After the Time Skip, we now have many many changes. + - Migration to GRUB now complete + - The Kernel boots, prepared by the loader. Both are loaded by GRUB + - We chose to use Multiboot v1 because the v2 lacks on documentation + - We only support x86_64