os-k-team/os-k
os-k-team
/
os-k
mirror of https://gitlab.os-k.eu/os-k-team/os-k.git
1
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Julian Barathieu 2019-05-07 23:44:48 +02:00
parent 821b3b26c6 7383a03952
commit 1eb1ff66ce
4 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -98,7 +98,7 @@ KernSources = kernel/cpu/cpuid.c \
kernel/mm/gdt.c kernel/ps/sched.c \
kernel/init/info.c kernel/init/ssp.c \
kernel/io/rtc.c kernel/io/keyb.c \
kernel/io/spkr.c
kernel/io/spkr.c kernel/po/shtdwn.c
LibCObj=$(patsubst %.c,$(KOBJDIR)/%.o,$(LibCSources))

42
include/kernel/pwmgnt.h Normal file
View File

@ -0,0 +1,42 @@
//----------------------------------------------------------------------------//
// GNU GPL OS/K //
// //
// Desc: Power 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 //
// 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/>. //
//----------------------------------------------------------------------------//
#ifndef _KALKERN_BASE_H
#include <kernel/base.h>
#endif
#ifndef _KALKERN_IDT_H
#define _KALKERN_IDT_H
//----------------------------------------------------------------------------//
void PoShutdownQemu(void);
void PoShutdownVirtualbox(void);
void PoShutdownBochs(void);
//----------------------------------------------------------------------------//
#endif

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

@ -30,6 +30,7 @@
#include <kernel/mm.h>
#include <kernel/time.h>
#include <kernel/speaker.h>
#include <kernel/pwmgnt.h>
// info.c
extern void BtDoSanityChecks(uint mbMagic);
@ -90,6 +91,8 @@ noreturn void BtStartKern(multiboot_info_t *mbInfo, uint mbMagic, void *codeSeg)
KernLog("Goodbye at %s\n", IoGetRtcTimeChar());
PoShutdownQemu();
// End this machine's suffering
BFlushBuf(BStdOut);
KeCrashSystem();

54
kaleid/kernel/po/shtdwn.c Normal file
View File

@ -0,0 +1,54 @@
//----------------------------------------------------------------------------//
// GNU GPL OS/K //
// //
// Desc: Shutdown related function //
// //
// //
// 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/>. //
//----------------------------------------------------------------------------//
#include <kernel/base.h>
#include <kernel/iomisc.h>
#include <kernel/time.h>
void PoShutdownQemu(void)
{
KernLog("Shutdown QEMU at %s...\n", IoGetRtcTimeChar());
IoRtcWait(1000);
IoWriteWordOnPort(0x604, 0x2000);
};
void PoShutdownVirtualbox(void)
{
KernLog("Shutdown VirtualBox at %s...\n", IoGetRtcTimeChar());
IoRtcWait(1000);
IoWriteWordOnPort(0x4004, 0x3400);
};
void PoShutdownBochs(void)
{
KernLog("Shutdown Bochs at %s...\n", IoGetRtcTimeChar());
IoRtcWait(1000);
IoWriteWordOnPort(0xB004, 0x2000);
};