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

Merge branch 'BetterTerm' of github.com:os-k-team/os-k into BetterTerm

This commit is contained in:
Julian Barathieu 2019-05-08 20:24:03 +02:00
parent 3ddfce4ba8 7302681f35
commit 8f4fd73de3
4 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -86,6 +86,7 @@ IDT Overhaul
* RTC : basic timer wait() * RTC : basic timer wait()
2019-05-08 @os-k-team <os-k-team@os-k.eu> 2019-05-08 @os-k-team <os-k-team@os-k.eu>
* Shell : basic shell that can beep, scroll up, scroll down and shutdwn * Shell : basic shell that can beep, scroll up, scroll down and shutdwn, and
with a help command.
* Power management : implementation of shutdown on qemu, virtualbox etc * Power management : implementation of shutdown on qemu, virtualbox etc
* Terminal : actual scroll up and down * Terminal : actual scroll up and down

11
Makefile
View File

@ -144,6 +144,8 @@ $(KOBJDIR)/libc/mem.o: $(KALEIDDIR)/libc/mem.c $(INCLUDEDIR)/*/*.h | $(KOBJDIR)
@$(KCC) -fno-strict-aliasing $< -o $@ @$(KCC) -fno-strict-aliasing $< -o $@
@echo ${CL2}[$@] ${CL}Compiled.${CL3} @echo ${CL2}[$@] ${CL}Compiled.${CL3}
## MISC MAKEFILE ------------------------------------------------------------- #
$(KOBJDIR)/kernel/cpu/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c \ $(KOBJDIR)/kernel/cpu/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c \
$(KALEIDDIR)/kernel/cpu/isr.asm $(INCLUDEDIR)/*/*.h | $(KOBJDIR) $(KALEIDDIR)/kernel/cpu/isr.asm $(INCLUDEDIR)/*/*.h | $(KOBJDIR)
@mkdir -p $(shell dirname $@) @mkdir -p $(shell dirname $@)
@ -153,6 +155,15 @@ $(KOBJDIR)/kernel/cpu/idt.o: $(KALEIDDIR)/kernel/cpu/idt.c \
@rm -f $@.1 $@.2 @rm -f $@.1 $@.2
@echo ${CL2}[$@] ${CL}Compiled.${CL3} @echo ${CL2}[$@] ${CL}Compiled.${CL3}
$(KOBJDIR)/kernel/cpu/cpuid.o: $(KALEIDDIR)/kernel/cpu/cpuid.c \
$(KALEIDDIR)/kernel/cpu/cpuf.asm $(INCLUDEDIR)/*/*.h | $(KOBJDIR)
@mkdir -p $(shell dirname $@)
@$(ASM) $(ASMFLAGS) $(KALEIDDIR)/kernel/cpu/cpuf.asm -o $@.1
@$(KCC) $< -o $@.2
@$(LD) $(LDFLAGS) -r $@.1 $@.2 -o $@
@rm -f $@.1 $@.2
@echo ${CL2}[$@] ${CL}Compiled.${CL3}
## MAIN MAKEFILE ------------------------------------------------------------- # ## MAIN MAKEFILE ------------------------------------------------------------- #
$(KOBJDIR)/%.o: %.c $(INCLUDEDIR)/*/*.h $(KALEIDDIR)/*/*/*.h | $(KOBJDIR) $(KOBJDIR)/%.o: %.c $(INCLUDEDIR)/*/*.h $(KALEIDDIR)/*/*/*.h | $(KOBJDIR)

12
ProjectTree
View File

@ -76,6 +76,7 @@
│   │   │   ├── ke │   │   │   ├── ke
│   │   │   │   ├── log.o │   │   │   │   ├── log.o
│   │   │   │   ├── panic.o │   │   │   │   ├── panic.o
│   │   │   │   ├── shcmds.o
│   │   │   │   └── shell.o │   │   │   │   └── shell.o
│   │   │   ├── mm │   │   │   ├── mm
│   │   │   │   ├── gdt.o │   │   │   │   ├── gdt.o
@ -109,8 +110,6 @@
│   │   ├── string.o │   │   ├── string.o
│   │   └── strtol.o │   │   └── strtol.o
│   ├── grub.log │   ├── grub.log
│   ├── kaleid32_disasm.asm
│   ├── kaleid64_disasm.asm
│   └── kernel.ld │   └── kernel.ld
├── include ├── include
│   ├── base │   ├── base
@ -136,6 +135,7 @@
│   │   ├── heap.h │   │   ├── heap.h
│   │   ├── idt.h │   │   ├── idt.h
│   │   ├── iomisc.h │   │   ├── iomisc.h
│   │   ├── keyboard.h
│   │   ├── mboot.h │   │   ├── mboot.h
│   │   ├── mm.h │   │   ├── mm.h
│   │   ├── proc.h │   │   ├── proc.h
@ -172,7 +172,9 @@
│   │   ├── ke │   │   ├── ke
│   │   │   ├── log.c │   │   │   ├── log.c
│   │   │   ├── panic.c │   │   │   ├── panic.c
│   │   │   └── shell.c │   │   │   ├── shcmds.c
│   │   │   ├── shell.c
│   │   │   └── shell.h
│   │   ├── mm │   │   ├── mm
│   │   │   ├── gdt.c │   │   │   ├── gdt.c
│   │   │   ├── heap.c │   │   │   ├── heap.c
@ -207,8 +209,10 @@
├── AUTHORS ├── AUTHORS
├── ChangeLog ├── ChangeLog
├── COPYING ├── COPYING
├── kaleid32_disasm.asm
├── kaleid64_disasm.asm
├── Makefile ├── Makefile
├── ProjectTree ├── ProjectTree
└── README.md └── README.md
39 directories, 147 files 39 directories, 151 files

23
kaleid/kernel/cpu/cpuf.asm Normal file
View File

@ -0,0 +1,23 @@
;=----------------------------------------------------------------------------=;
; GNU GPL OS/K ;
; ;
; Desc: CPU management related functions ;
; ;
; ;
; 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/>. ;
;=----------------------------------------------------------------------------=;