Nigel/BarinkOS
1
0
Fork 0
Code Issues 1 Pull Requests 2 Releases Activity

Merge into main the new state of the operating system/kernel #1

Open
Nigel wants to merge 120 commits from dev into main
pull from: dev
merge into: Nigel:main
Conversation 0 Commits 120 Files Changed 146 +5 -4
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a70ae5ca31 - Show all commits

4
source/kernel/Drivers/PS-2/keyboard.h
View File

@ -1,14 +1,14 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "../../Terminal/kterm.h" #include "../../Terminal/kterm.h"
typedef enum ScanCodeSet{ enum ScanCodeSet {
None = 0, None = 0,
ScanCodeSet1 = 1, ScanCodeSet1 = 1,
ScanCodeSet2 = 2, ScanCodeSet2 = 2,
ScanCodeSet3 = 3, ScanCodeSet3 = 3,
}; };
typedef enum Modifiers{ enum Modifiers {
LSHIFT = 1, LSHIFT = 1,
RSHIFT = 2, RSHIFT = 2,

3
source/kernel/Memory/PhysicalMemoryManager.cpp
View File

@ -53,6 +53,9 @@ void SetupPhysicalMemoryManager( BootInfoBlock* Bootinfo) {
printf("kernel size in memory: 0x%x\n", kernel_size); printf("kernel size in memory: 0x%x\n", kernel_size);
allocate_region((uint32_t)&kernel_begin, kernel_size); allocate_region((uint32_t)&kernel_begin, kernel_size);
printf("allocate BIOS region");
allocate_region (0x0000000, 0x00100000);
} }
// NOTE: This can only give blocks of 4kb at a time! // NOTE: This can only give blocks of 4kb at a time!

2
source/kernel/Memory/VirtualMemoryManager.h
View File

@ -8,5 +8,3 @@ void FreePage(uint32_t v_addr);
void Map(uint32_t p_addr, uint32_t v_addr); void Map(uint32_t p_addr, uint32_t v_addr);
void Unmap (uint32_t v_addr); void Unmap (uint32_t v_addr);