mirror of
https://github.com/Tom-on64/kern.git
synced 2026-11-03 18:22:22 +00:00
Made memory/addresses.h more organised
Also didn't need to add stdio.h to any files so that's good!
This commit is contained in:
+1
-1
@@ -18,7 +18,7 @@ void putc(char c) {
|
||||
}
|
||||
|
||||
char getc() {
|
||||
char* character = (char*)0x3000;
|
||||
char* character = (char*)0x2100;
|
||||
*character = '\0';
|
||||
while (*character == '\0') { __asm__ volatile ("hlt"); }
|
||||
return *character;
|
||||
|
||||
@@ -18,8 +18,7 @@ void timerHandler(intFrame_t* iframe) {
|
||||
static uint32_t cursorTicks = 0;
|
||||
cursorTicks++;
|
||||
|
||||
|
||||
if (terminal->showCursor) {
|
||||
if (!terminal->hideCursor) {
|
||||
if (cursorTicks % 500 == 0) putcAt(127, terminal->x, terminal->y);
|
||||
else if (cursorTicks % 250 == 0) putcAt(' ', terminal->x, terminal->y);
|
||||
}
|
||||
|
||||
+30
-24
@@ -1,41 +1,47 @@
|
||||
#ifndef ADDRESSES_H
|
||||
#define ADDRESSES_H
|
||||
|
||||
/* TODO: Follow this layout and/or change it to make more sense
|
||||
* Memory layout
|
||||
* 0x0000-0x0fff - Probably shouldn't mess with this? idk
|
||||
/*
|
||||
* Memory layout of addresses 0x0000 - 0xA000
|
||||
* 0x0000-0x0fff - Probably shouldn't mess with this? idk it feels wrong
|
||||
* 0x1000-0x17ff - Free
|
||||
* 0x1800-0x1fff - Global Variables
|
||||
* 0x2000-0x2fff - Terminal area
|
||||
* 0x3000-0x3fff - Keyboard area
|
||||
* 0x4000-0x5fff - Filesytem area
|
||||
* 0x6000-0x7fff - Font area
|
||||
* 0x8000-0x8fff - Free
|
||||
* 0x2000-0x2fff - Larger structs
|
||||
* 0x3000-0x3fff - Filesystem area
|
||||
* 0x4000-0x4fff - Font area
|
||||
* 0x6000-0x84ff - Free
|
||||
* 0x8500-0x8fff - SMAP Area
|
||||
* 0x9000-0x9fff - VBE info area
|
||||
*/
|
||||
|
||||
// Locations
|
||||
#define KERNEL_LOC 0x100000
|
||||
#define DATETIME_LOC 0x2000
|
||||
#define TERMINAL_INFO_LOC 0x8000
|
||||
#define KEYBOARD_STATE_LOC 0x3000
|
||||
#define FILETABLE_LOC 0x4000
|
||||
#define MODE_INFO_BLOCK_LOC 0x9000 // 512 Bytes
|
||||
// Global Variables
|
||||
#define SLEEP_TIMER 0x1800
|
||||
#define CURRENT_PAGE_DIR_ADDR 0x1804
|
||||
#define PHYS_MEM_MAX_BLOCKS 0x1808
|
||||
#define PHYS_MEM_USED_BLOCKS 0x180C
|
||||
|
||||
// Variables
|
||||
#define CURRENT_PAGE_DIR_ADDR 0x1800
|
||||
#define PHYS_MEM_MAX_BLOCKS 0x1804
|
||||
#define PHYS_MEM_USED_BLOCKS 0x1808
|
||||
#define SLEEP_TIMER 0x180C
|
||||
// Some structs
|
||||
#define TERMINAL_INFO_LOC 0x2000
|
||||
#define KEYBOARD_STATE_LOC 0x2100
|
||||
#define DATETIME_LOC 0x2200
|
||||
|
||||
// Font
|
||||
#define FONT_LOC 0x6000
|
||||
// Filesystem Area 0x3000 - 0x3fff
|
||||
#define FILETABLE_LOC 0x3000
|
||||
|
||||
// Font area 0x4000 - 0x4fff
|
||||
#define FONT_LOC 0x4000
|
||||
#define FONT_WIDTH (FONT_LOC)
|
||||
#define FONT_HEIGHT (FONT_LOC + 1)
|
||||
|
||||
// Physical memory manager
|
||||
#define MEMMAP_AREA 0x30000
|
||||
// Smap Area 0x8500 - 0x8fff
|
||||
#define SMAP_ENTRY_COUNT 0x8500
|
||||
#define SMAP_ENTRIES 0x8504
|
||||
|
||||
// VBE Info Area 0x9000 - 0x9fff
|
||||
#define MODE_INFO_BLOCK_LOC 0x9000 // 512 Bytes
|
||||
|
||||
// Other addresses
|
||||
#define KERNEL_LOC 0x100000
|
||||
#define MEMMAP_AREA 0x30000
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#ifndef PHYSICAL_MEM_MANAGER_H
|
||||
#define PHYSICAL_MEM_MANAGER_H
|
||||
|
||||
#include <memory/addresses.h>
|
||||
#include <string.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#define BLOCK_SIZE 4096 // 4kB
|
||||
#define BLOCKS_PER_BYTE 8
|
||||
#define SMAP_ADDRESS 0x8500
|
||||
|
||||
typedef struct smapEntry_s {
|
||||
uint64_t baseAddress;
|
||||
|
||||
@@ -14,7 +14,7 @@ typedef struct {
|
||||
uint32_t width; // Width in characters
|
||||
uint32_t height; // Height in characters
|
||||
char cursorChar; // Character to use as a cursor
|
||||
bool showCursor; // Should we display the cursor
|
||||
bool hideCursor; // Should we display the cursor
|
||||
} terminal_t;
|
||||
|
||||
terminal_t* terminal = (terminal_t*)TERMINAL_INFO_LOC;
|
||||
|
||||
+3
-3
@@ -1,4 +1,3 @@
|
||||
#include <stdio.h> // TODO: Add stdio.h to every header that needs it
|
||||
#include <interrupt/idt.h>
|
||||
#include <interrupt/exceptions.h>
|
||||
#include <interrupt/syscalls.h>
|
||||
@@ -19,6 +18,7 @@
|
||||
#include <sound/notes.h>
|
||||
#include <ports/io.h>
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
@@ -368,8 +368,8 @@ void printFiletable(char* ft) {
|
||||
}
|
||||
|
||||
void printPhysicalMemmap() {
|
||||
uint32_t entryCount = *(uint32_t*)SMAP_ADDRESS;
|
||||
smapEntry_t* smapEntry = (smapEntry_t*)(SMAP_ADDRESS+4);
|
||||
uint32_t entryCount = *(uint32_t*)SMAP_ENTRY_COUNT;
|
||||
smapEntry_t* smapEntry = (smapEntry_t*)SMAP_ENTRIES;
|
||||
|
||||
for (uint32_t i = 0; i < entryCount; i++) {
|
||||
print("Region ");
|
||||
|
||||
Reference in New Issue
Block a user