slinky55/RockOS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

did some restructuring, got multitasking almost working

Browse Source
This commit is contained in:
slinky55
2026-06-26 20:05:01 -05:00
parent 57d7d34c6d
commit 43bc0df81a
35 changed files with 481 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/drivers/pic/pic_stubs.S → kernel/drivers/pic/pic.S
View File

@@ -1,7 +1,12 @@
#include "drivers/pic/pic.h"
#define PIC1_ADDR 0x20 + 0xC0000000
#define PIC2_ADDR 0xA0 + 0xC0000000
#define PIC1_COMMAND PIC1_ADDR
#define PIC1_DATA (PIC1_ADDR+1)
#define PIC2_COMMAND PIC2_ADDR
#define PIC2_DATA (PIC2_ADDR+1)
#define PIC_EOI 0x20
.code32
.extern io_wait
.global init_pic
init_pic:

16
kernel/drivers/pic/pic.h
View File

@@ -1,7 +1,9 @@
#define PIC1_ADDR 0x20 + 0xC0000000
#define PIC2_ADDR 0xA0 + 0xC0000000
#define PIC1_COMMAND PIC1_ADDR
#define PIC1_DATA (PIC1_ADDR+1)
#define PIC2_COMMAND PIC2_ADDR
#define PIC2_DATA (PIC2_ADDR+1)
#define PIC_EOI 0x20
#ifndef DPIC_H
#define DPIC_H
void init_pic();
void send_eoi_master();
void send_eoi_slave();
#endif

3
kernel/drivers/pit/pit_stubs.S → kernel/drivers/pit/pit.S
View File

@@ -1,7 +1,4 @@
#include "drivers/pit/pit.h"
.code32
.global init_pit
init_pit: # tickrate: 1193182/1000 = 0x04A9 (1000hz) (1ms)
movb $0x36, %al

6
kernel/drivers/pit/pit.h
View File

@@ -0,0 +1,6 @@
#ifndef DPIT_H
#define DPIT_H
void init_pit();
#endif

2
kernel/drivers/ps2/ps2_stubs.S → kernel/drivers/ps2/ps2.S
View File

@@ -9,8 +9,6 @@
.global ps2_write_data
.global ps2_flush_output_buffer
.extern io_wait
# helpers
ps2_wait_input_empty: #(void) -> void
push %ebp

1
kernel/drivers/ps2/ps2.c
View File

@@ -1,4 +1,5 @@
#include <stdint.h>
#include <drivers/ps2/ps2.h>
extern void ps2_wait_input_empty(void);

6
kernel/drivers/ps2/ps2.h
View File

@@ -16,4 +16,10 @@
#define SELF_TEST_SUCCESS 0x55
#define PORT_TEST_SUCCESS 0x00
#ifndef __ASSEMBLER__
#include <stdint.h>
int init_ps2();
uint8_t ps2_read_data();
#endif
#endif

21
kernel/drivers/vga/vga_stream_writer.c → kernel/drivers/vga/vga.c
View File

@@ -26,10 +26,10 @@ enum vga_color {
VGA_COLOR_WHITE = 15,
};
size_t terminal_row;
size_t terminal_column;
uint8_t terminal_color;
uint16_t* terminal_buffer = (uint16_t*)VGA_MEMORY;
static size_t terminal_row;
static size_t terminal_column;
static uint8_t terminal_color;
static uint16_t* terminal_buffer = (uint16_t*)VGA_MEMORY;
static inline uint8_t vga_entry_color(enum vga_color fg, enum vga_color bg)
{
@@ -41,8 +41,7 @@ static inline uint16_t vga_entry(unsigned char uc, uint8_t color)
return (uint16_t) uc | (uint16_t) color << 8;
}
void vga_initialize()
{
void vga_init() {
terminal_row = 0;
terminal_column = 0;
terminal_color = vga_entry_color(VGA_COLOR_LIGHT_GREY, VGA_COLOR_BLACK);
@@ -55,8 +54,7 @@ void vga_initialize()
}
}
void vga_putchar(char c)
{
void vga_putchar(char c) {
if (c == '\n') {
terminal_row++;
terminal_column = 0;
@@ -77,9 +75,4 @@ void vga_putchar(char c)
if (++terminal_row == VGA_HEIGHT)
terminal_row = 0;
}
}
print_stream_t vga_print_stream = {
.putchar = vga_putchar,
.trunc = vga_initialize,
};
}

7
kernel/drivers/vga/vga.h Normal file
View File

@@ -0,0 +1,7 @@
#ifndef DVGA_H
#define DVGA_H
void vga_init();
void vga_putchar(char c);
#endif