Merge pull request #47 from os-k-team/master

merge
This commit is contained in:
Adrien Bourmault 2019-03-17 23:23:17 +01:00 committed by GitHub
commit c52955751d
4 changed files with 84 additions and 38 deletions

View File

@ -49,4 +49,26 @@
; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ; ; along with OS/K. If not, see <https://www.gnu.org/licenses/>. ;
;=----------------------------------------------------------------------------=; ;=----------------------------------------------------------------------------=;
#=----------------------------------------------------------------------------=#
# 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 <https://www.gnu.org/licenses/>. #
#=----------------------------------------------------------------------------=#

View File

@ -29,13 +29,16 @@ project repository, and own the copyright in it.
Founders and owner of the OS/K project repository Founders and owner of the OS/K project repository
Julian Barathieu (julianb0) Julian Barathieu (julianb0)
Adrien Bourmault (NeoX95) Adrien Bourmault (neox95)
Main contributors Main contributors
Julian Barathieu (julianb0) Julian Barathieu (julianb0)
Adrien Bourmault (NeoX95) Adrien Bourmault (neox95)
Other contributors Other contributors
(void) (void)
Contact : os-k-team@os-k.eu

View File

@ -29,4 +29,10 @@
- Added A20 line Enabling to MBR - 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. 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 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

View File

@ -22,37 +22,42 @@
# along with OS/K. If not, see <https://www.gnu.org/licenses/>. # # along with OS/K. If not, see <https://www.gnu.org/licenses/>. #
#=----------------------------------------------------------------------------=# #=----------------------------------------------------------------------------=#
. .
├── AUTHORS
├── boot ├── boot
│   ├── loader │   ├── folder.desc
│   │   ├── cpu │   ├── grub
│   │   │   ├── cpu.asm │   │   ├── create_disk.sh
│   │   │   └── cpuid.asm │   │   ├── grub.cfg
│   │   ├── elf │   │   ├── grub-install.sh
│   │   │   └── elf.c │   │   ├── mount.sh
│   │   ├── fs │   │   ├── multiboot.pdf
│   │   │   └── fat.asm │   │   └── umount.sh
│   │   ├── io │   └── loader
│   │   │   ├── ata.asm │   ├── cpu
│   │   │   ├── lmmem.asm │   │   ├── cpu32.inc
│   │   │   ├── lmterm.asm │   │   └── cpu.inc
│   │   │   ├── rmmem.asm │   ├── io
│   │   │   └── rmterm.asm │   │   └── terminal.inc
│   │   └── loader.asm │   ├── loader.asm
│   ├── mbr │   ├── mem
│   │   ├── mbr.asm │   │   ├── management.inc
│   │   └── mbr.inc │   │   └── structures.inc
│   └── folder.desc │   └── multiboot
│   ├── check.inc
│   └── header.inc
├── build ├── build
│   ├── idttool.py │   ├── bin
│   ├── kernel.ld │   │   ├── disk.img
│   └── preproc.h │   │   └── kaleid
│   └─── kernel.ld
├── ChangeLog
├── COPYING
├── grub.log
├── kaleid ├── kaleid
│   ├── crtlib │   ├── crtlib
│   │   ├── arith.c
│   │   ├── atoi.c │   │   ├── atoi.c
│   │   ├── ctype.c
│   │   ├── itoa.c │   │   ├── itoa.c
│   │   ├── memory.c │   │   ├── memory.c
│   │   ├── rand.c │   │   ├── rand.c
@ -78,33 +83,43 @@
│   │   │   ├── locks.h │   │   │   ├── locks.h
│   │   │   ├── malloc.h │   │   │   ├── malloc.h
│   │   │   └── prog.h │   │   │   └── prog.h
│   │   ├── kernel
│   │   │   ├── base.h
│   │   │   ├── sched.h
│   │   │   └── terminal.h
│   │   ├── kalbase.h │   │   ├── kalbase.h
│   │   ├── kaleid.h │   │   ├── kaleid.h
│   │   ├── kalext.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 │   └── kernel
│   ├── cpu
│   │   └── cpuid.c
│   ├── init │   ├── init
│   │   ├── init.c │   │   ├── init.c
│   │   └── table.c │   │   └── table.c
│   ├── io │   ├── io
│   │   ├── ata.inc
│   │   ├── cursor.c │   │   ├── cursor.c
│   │   ├── term.c │   │   ├── term.c
│   │   └── vga.c │   │   └── vga.c
│   ├── ke │   ├── ke
│   │   └── panic.c │   │   └── panic.c
│   ├── mm
│   └── proc │   └── proc
│   ├── Makefile │   ├── Makefile
│   └── sched.c │   └── sched.c
├── AUTHORS ├── loader_disasm32.asm
├── ChangeLog ├── loader_disasm64.asm
├── COPYING
├── Makefile ├── Makefile
├── Makefile.in
├── ProjectTree ├── ProjectTree
├── qemu.log
└── Readme.md └── Readme.md
20 directories, 61 files 28 directories, 99 files