102 Commits

Author SHA1 Message Date
bcd09a898c Add parallel port handling in parallel.c
Implement parallel port support with detection and configuration.
Add LPT port handling in parallel.c
Implement LPT port detection and configuration functions.
2026-02-04 20:53:22 +01:00
5cf2549d58 Add parallel.h header for LPT device management
This creates the header file for a parallel port driver
2026-02-02 13:18:31 -08:00
56faa3143d Merge pull request #109 from vmttmv/bl-e820
BL: Query and store e820 memory map
2026-02-02 07:49:09 -08:00
9be6a4e64b Merge pull request #74 from gbowne1/gbowne1-addpci
Adds PCI bus driver implementation
2026-01-28 13:40:37 -08:00
255ac93cae Merge pull request #75 from gbowne1/gbowne1-addps2
Add a PS/2 mouse keyboard driver
2026-01-28 13:38:06 -08:00
Borna Šoštarić
0584f7d49d Merge branch 'main' into gbowne1-addpci 2026-01-28 21:41:59 +01:00
4700e3f11a Update ata.h
Updated header to match ata.c
2026-01-28 21:41:10 +01:00
769f96acbc Update ata.c
Updated ata.c to include fixed BSY status register
2026-01-28 21:41:10 +01:00
1575c0dd12 Create ata.c 2026-01-28 21:41:10 +01:00
37e672a1c2 Create ata.h
Add base ATA PIO mode driver so that filesystems like fat16 fat32 work.
2026-01-28 21:41:10 +01:00
375dd9afdf Update gui.h
Adds gui base header
2026-01-28 21:41:10 +01:00
a42822dd54 Update gui.c
Add base gui implementation
2026-01-28 21:41:10 +01:00
6f0fee4182 Update hid.c
Fixing print_hex error
2026-01-28 21:41:10 +01:00
01f130227b Update keyboard.h
fixed typo in header include
2026-01-28 21:41:10 +01:00
f473fd5c32 Update mouse.h
Fixes static
2026-01-28 21:41:10 +01:00
576f5be8a6 Update mouse.c
Make mouse_data non static
2026-01-28 21:41:10 +01:00
538b97b877 Update keyboard.c
Fix missing definitions so theres nothing that would break the build
2026-01-28 21:41:10 +01:00
4d2eec9e93 Update keyboard.h
fixing missing includes and definition
2026-01-28 21:41:10 +01:00
d30bc6a7f5 Update keyboard.h
Add a extern const for the scancode map
2026-01-28 21:41:10 +01:00
96050d6a99 Update keyboard.c
remove static
2026-01-28 21:41:10 +01:00
e9e3237ba9 Create hid.c
Add bass HID implementation
2026-01-28 21:41:10 +01:00
3c6b2a4e8c Create hid.h
Adding base HID device support for early HID standards 1.0
2026-01-28 21:41:10 +01:00
vmttmv
8db5173495 Fix includes for string.h/string_utils.h 2026-01-28 21:41:10 +01:00
c0220b3afc Update vga.c
Change my_strlen to use our klibc strlen in klibc/include/string.h
2026-01-28 21:41:10 +01:00
f9ef99d11b Update vga.h
Add vga_init(); function prototype
2026-01-28 21:41:10 +01:00
17ce531b62 Update display.c
Added the 95% completely wired up display driver implementation file
2026-01-28 21:41:10 +01:00
4aa6fa3b59 Update display.h
updated header for display driver display.c and display.h this will need to be finished wired up. Old display driver would have done nothing.
2026-01-28 21:41:10 +01:00
Borna Šoštarić
6d78074060 add rules for formatting consecutives 2026-01-28 21:41:10 +01:00
Borna Šoštarić
3fde819c49 add .clang-format 2026-01-28 21:41:10 +01:00
Borna Šoštarić
aac87e30e0 added editorconfig file 2026-01-28 21:41:10 +01:00
Borna Šoštarić
975e21f9be add clangd config file 2026-01-28 21:41:10 +01:00
Borna Šoštarić
db2c17d4b4 add compile_commands.json genereation 2026-01-28 21:41:10 +01:00
vmttmv
c805d24dd0 Fix PDE/PTE definitions, header cleanup
- Fixes PDE/PTE definitions in kernel/paging.h
- removes memset declaration from kernel/utils.h, uses klibc string.h as
needed
2026-01-28 21:41:10 +01:00
vmttmv
b3831b6c69 Remove types.c/.h, use klibc headers, amend stdbool.h, reimplement cpuid() 2026-01-28 21:40:39 +01:00
4e1197356b Fix k_memcmp return logic and add disk_read_sector
Refactor k_memcmp to return correct difference and add disk_read_sector function.
2026-01-28 21:40:39 +01:00
a765fe5238 Fix extern declaration for disk_read_sector function 2026-01-28 21:40:39 +01:00
175c2949be Enhance cpu.h with Intel model definitions and struct
Added Intel model definitions and CPU info structure.
2026-01-28 21:40:39 +01:00
2dd82e69a7 Implement CPUID support check and CPU info printing
Added functions to check CPUID support and print CPU details.
2026-01-28 21:40:39 +01:00
Borna Šoštarić
aeecf2b0b7 fix vga clear section in on_error 2026-01-28 21:40:39 +01:00
vmttmv
091391907f Establish well-defined read buffers for bl, implement error printing 2026-01-28 21:40:39 +01:00
vmttmv
5dcf5d24b2 Fix non-aligned disk reads in bootloader 2026-01-28 21:40:39 +01:00
Borna Šoštarić
a7e536a6d3 fix RWX perms warnings in link step 2026-01-28 21:40:39 +01:00
vmttmv
b99cb27092 fix stage2.asm: disk reads wait for BSY 2026-01-28 21:40:39 +01:00
Borna Šoštarić
a3267d2ac3 initial implementation of klibc
fix linker error about ctx_switch
2026-01-28 21:40:39 +01:00
Borna Šoštarić
bc08701e63 lessen indirection in the makefile 2026-01-28 21:40:39 +01:00
Borna Šoštarić
e8f6beef8a update readme 2026-01-28 21:40:39 +01:00
Borna Šoštarić
bd427dc7e9 generate .build.env as part of configure script 2026-01-28 21:40:39 +01:00
Borna Šoštarić
619430d4bf add configure script for setting up cross compilation tools 2026-01-28 21:40:39 +01:00
Borna Šoštarić
84e28d8871 Merge branch 'main' into gbowne1-addps2 2026-01-28 21:36:14 +01:00
dee91ca211 Update ata.h
Updated header to match ata.c
2026-01-28 21:34:50 +01:00
59dfca9ebd Update ata.c
Updated ata.c to include fixed BSY status register
2026-01-28 21:34:50 +01:00
42f0b62e50 Create ata.c 2026-01-28 21:34:50 +01:00
0a4f0e59e3 Create ata.h
Add base ATA PIO mode driver so that filesystems like fat16 fat32 work.
2026-01-28 21:34:50 +01:00
9d37b7a944 Update gui.h
Adds gui base header
2026-01-28 21:34:50 +01:00
eecc2561da Update gui.c
Add base gui implementation
2026-01-28 21:34:50 +01:00
cae3731f91 Update hid.c
Fixing print_hex error
2026-01-28 21:34:50 +01:00
df33351d60 Update keyboard.h
fixed typo in header include
2026-01-28 21:34:50 +01:00
d2b19ce376 Update mouse.h
Fixes static
2026-01-28 21:34:50 +01:00
8aea3c3c0e Update mouse.c
Make mouse_data non static
2026-01-28 21:34:50 +01:00
f64e40d460 Update keyboard.c
Fix missing definitions so theres nothing that would break the build
2026-01-28 21:34:50 +01:00
45da511bfa Update keyboard.h
fixing missing includes and definition
2026-01-28 21:34:50 +01:00
0f2528e07b Update keyboard.h
Add a extern const for the scancode map
2026-01-28 21:34:50 +01:00
b36356f10c Update keyboard.c
remove static
2026-01-28 21:34:50 +01:00
4b981a5d18 Create hid.c
Add bass HID implementation
2026-01-28 21:34:50 +01:00
fa66433179 Create hid.h
Adding base HID device support for early HID standards 1.0
2026-01-28 21:34:50 +01:00
vmttmv
f08204a2b3 Fix includes for string.h/string_utils.h 2026-01-28 21:34:50 +01:00
bb6f9d1a16 Update vga.c
Change my_strlen to use our klibc strlen in klibc/include/string.h
2026-01-28 21:34:50 +01:00
57ac458a4f Update vga.h
Add vga_init(); function prototype
2026-01-28 21:34:50 +01:00
6ad8644752 Update display.c
Added the 95% completely wired up display driver implementation file
2026-01-28 21:34:50 +01:00
40462e55e6 Update display.h
updated header for display driver display.c and display.h this will need to be finished wired up. Old display driver would have done nothing.
2026-01-28 21:34:50 +01:00
Borna Šoštarić
4d2197aa2d add rules for formatting consecutives 2026-01-28 21:34:50 +01:00
Borna Šoštarić
f7b6a78b59 add .clang-format 2026-01-28 21:34:50 +01:00
Borna Šoštarić
2b32a29890 added editorconfig file 2026-01-28 21:34:50 +01:00
Borna Šoštarić
4ee0ddb9ef add clangd config file 2026-01-28 21:34:50 +01:00
Borna Šoštarić
13b915a99d add compile_commands.json genereation 2026-01-28 21:34:50 +01:00
vmttmv
d480fbcc80 Fix PDE/PTE definitions, header cleanup
- Fixes PDE/PTE definitions in kernel/paging.h
- removes memset declaration from kernel/utils.h, uses klibc string.h as
needed
2026-01-28 21:34:50 +01:00
vmttmv
d0c9c9c4e0 Remove types.c/.h, use klibc headers, amend stdbool.h, reimplement cpuid() 2026-01-28 21:33:36 +01:00
8be984d565 Fix k_memcmp return logic and add disk_read_sector
Refactor k_memcmp to return correct difference and add disk_read_sector function.
2026-01-28 21:33:36 +01:00
4f992c8fc5 Fix extern declaration for disk_read_sector function 2026-01-28 21:33:36 +01:00
16057d41d6 Enhance cpu.h with Intel model definitions and struct
Added Intel model definitions and CPU info structure.
2026-01-28 21:33:36 +01:00
41281de743 Implement CPUID support check and CPU info printing
Added functions to check CPUID support and print CPU details.
2026-01-28 21:33:36 +01:00
Borna Šoštarić
dfb161a15a fix vga clear section in on_error 2026-01-28 21:33:36 +01:00
vmttmv
a450ac06f2 Establish well-defined read buffers for bl, implement error printing 2026-01-28 21:33:36 +01:00
vmttmv
235fd2636d Fix non-aligned disk reads in bootloader 2026-01-28 21:33:36 +01:00
Borna Šoštarić
8c529c6fe4 fix RWX perms warnings in link step 2026-01-28 21:33:36 +01:00
vmttmv
155563e434 fix stage2.asm: disk reads wait for BSY 2026-01-28 21:33:36 +01:00
Borna Šoštarić
8b1ea16c56 initial implementation of klibc
fix linker error about ctx_switch
2026-01-28 21:33:36 +01:00
Borna Šoštarić
7bda5c25b8 lessen indirection in the makefile 2026-01-28 21:33:36 +01:00
Borna Šoštarić
ac0fde28a0 update readme 2026-01-28 21:33:36 +01:00
Borna Šoštarić
a182bbca19 generate .build.env as part of configure script 2026-01-28 21:33:36 +01:00
Borna Šoštarić
c503709ff4 add configure script for setting up cross compilation tools 2026-01-28 21:33:36 +01:00
vmttmv
4fa82854dd BL: Query and store e820 memory map
- bl stage 1: move gdt+pm setup to stage 2 (avoids mode switching)
- bl stage 2: at entry query e820 table from bios, then setup gdt+pm
- kernel/memmap: pad map entry to 24 bytes, as exported by bl
- kernel/memmap: map copy (gbowne1)
- Makefile: facilitate placing the memory map at a known location
- Update bl docs
2026-01-28 18:08:31 +02:00
903061551c Update ps2.c
Remove the definition of the in/out assembly and add io.h include instead of inline
2026-01-27 12:41:17 -08:00
4393fbf6cb Update pci.c
Change this to use io.h to define the in/out assembly instead of doing directly
2026-01-27 12:37:38 -08:00
a37f94de44 Update ps2.c
Fixed the `__volatile__` into a volatile keyword
2026-01-27 08:16:44 -08:00
401a19143c Update pci.c
Fixed volatile to a keyword
2026-01-27 08:10:56 -08:00
cc92ade8fd Update ps2.c
Fixing asm to __asm__
2026-01-26 17:06:44 -08:00
a9f6d5fa05 Update pci.c
Fixed the inline assembly macro asm to __asm__
2026-01-26 16:55:35 -08:00
4e8b13ad77 Create ps2.c
add initial ps/2 driver code. This will need wired up to be used
2025-12-17 05:50:02 -08:00
9f8ca3a60c Create ps2.h 2025-12-17 05:47:59 -08:00
574980035e Create pci.c 2025-12-17 05:32:44 -08:00
a0bd0941d6 Create pci.h 2025-12-17 05:31:15 -08:00
13 changed files with 660 additions and 121 deletions

View File

@@ -8,8 +8,13 @@ OBJCOPY = i386-elf-objcopy
BUILD_DIR = build BUILD_DIR = build
CROSS_DIR = cross CROSS_DIR = cross
DISK_IMG = $(BUILD_DIR)/disk.img DISK_IMG = $(BUILD_DIR)/disk.img
STAGE2_ADDR = 0x7e00
STAGE2_SIZE = 2048 STAGE2_SIZE = 2048
# Place the memory map (e820) past stage2 bl in memory
MEMMAP_BASE = $(shell echo $$(($(STAGE2_ADDR) + $(STAGE2_SIZE))))
KERNEL_C_SRC = $(wildcard kernel/*.c) KERNEL_C_SRC = $(wildcard kernel/*.c)
KERNEL_ASM_SRC = $(wildcard kernel/*.asm) KERNEL_ASM_SRC = $(wildcard kernel/*.asm)
KERNEL_OBJ = $(patsubst kernel/%.c, $(BUILD_DIR)/%.o, $(KERNEL_C_SRC)) KERNEL_OBJ = $(patsubst kernel/%.c, $(BUILD_DIR)/%.o, $(KERNEL_C_SRC))
@@ -29,7 +34,7 @@ stage1: $(BUILD_DIR)
# NOTE: Stage2 final size should be checked against `$(STAGE2_SIZE)` by the build system to avoid an overflow. # NOTE: Stage2 final size should be checked against `$(STAGE2_SIZE)` by the build system to avoid an overflow.
# Alternatively, convey the final stage2 size through other means to stage1. # Alternatively, convey the final stage2 size through other means to stage1.
stage2: $(BUILD_DIR) stage2: $(BUILD_DIR)
$(AS) $(ASFLAGS) -o $(BUILD_DIR)/stage2.o bootloader/stage2.asm $(AS) $(ASFLAGS) -DMEMMAP_BASE=$(MEMMAP_BASE) -o $(BUILD_DIR)/stage2.o bootloader/stage2.asm
$(CC) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $(BUILD_DIR)/stage2_load.o bootloader/stage2_load.c $(CC) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $(BUILD_DIR)/stage2_load.o bootloader/stage2_load.c
$(LD) -Tbootloader/stage2.ld -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/stage2.o $(BUILD_DIR)/stage2_load.o $(LD) -Tbootloader/stage2.ld -melf_i386 -o $(BUILD_DIR)/$@.elf $(BUILD_DIR)/stage2.o $(BUILD_DIR)/stage2_load.o
$(OBJCOPY) -O binary $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.bin $(OBJCOPY) -O binary $(BUILD_DIR)/$@.elf $(BUILD_DIR)/$@.bin
@@ -39,7 +44,7 @@ $(BUILD_DIR)/asm_%.o: kernel/%.asm
$(AS) $(ASFLAGS) -o $@ $< $(AS) $(ASFLAGS) -o $@ $<
$(BUILD_DIR)/%.o: kernel/%.c $(BUILD_DIR)/%.o: kernel/%.c
$(CC) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $@ $< $(CC) -DMEMMAP_BASE=$(MEMMAP_BASE) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $@ $<
$(BUILD_DIR)/klibc/%.o: klibc/src/%.c $(BUILD_DIR)/klibc/%.o: klibc/src/%.c
$(CC) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $@ $< $(CC) -std=c11 -ffreestanding -nostdlib -nostdinc -fno-stack-protector -m32 -Iklibc/include -g -c -o $@ $<

View File

@@ -11,16 +11,16 @@ Bootloader documentation for ClassicOS
## Stage 1 (`stage1.asm`) ## Stage 1 (`stage1.asm`)
Responsible for loading the second stage using BIOS routines, and switching to protected mode.
- Queries CHS parameters from BIOS - Queries CHS parameters from BIOS
- Loads the second stage bootloader (2048 B) to `0x7c00` - Loads the second stage bootloader (2048 B) to `0x7c00`
- Sets up a GDT with descriptor entries for code and data both covering the whole 32-bit address space
- Enables A20 - Enables A20
- Set CR0.PE (enable protected mode) and jump to stage 2 - Jumps to stage2
## Stage 2 (`stage2.asm, stage2_load.c`) ## Stage 2 (`stage2.asm, stage2_load.c`)
- Read and store E820 memory map from BIOS
- Sets up a GDT with descriptor entries for code and data both covering the whole 32-bit address space
- Set CR0.PE (enable protected mode)
- Set up segment registers - Set up segment registers
- Load the kernel ELF header - Load the kernel ELF header
- Parse the program headers, and load all `PT_LOAD` segments from disk - Parse the program headers, and load all `PT_LOAD` segments from disk

View File

@@ -40,11 +40,8 @@ _start:
call enable_a20 call enable_a20
jc a20_error ; Jump if A20 enable fails jc a20_error ; Jump if A20 enable fails
; Setup Global Descriptor Table ; Jump to s2
call setup_gdt jmp 0x7e00
; Switch to protected mode and jump to second stage at 0x08:0x7E00
call switch_to_pm
disk_error: disk_error:
mov si, disk_error_msg mov si, disk_error_msg
@@ -241,30 +238,6 @@ check_a20:
clc ; Clear carry flag to indicate success clc ; Clear carry flag to indicate success
ret ret
; ----------------------------------------------------------------
gdt_start:
dq 0x0000000000000000 ; Null descriptor
dq 0x00CF9A000000FFFF ; 32-bit code segment (selector 0x08)
dq 0x00CF92000000FFFF ; 32-bit data segment (selector 0x10)
dq 0x00009A000000FFFF ; 16-bit code segment for real mode (selector 0x18)
gdt_descriptor:
dw gdt_end - gdt_start - 1
dd gdt_start
gdt_end:
setup_gdt:
lgdt [gdt_descriptor]
ret
; ----------------------------------------------------------------
switch_to_pm:
cli
mov eax, cr0
or eax, 1
mov cr0, eax
jmp 0x08:0x7E00 ; jump to S2
; ---------------------------------------------------------------- ; ----------------------------------------------------------------
print_string_16: print_string_16:
.loop: .loop:

View File

@@ -1,10 +1,80 @@
[BITS 32]
global _start global _start
global ata_lba_read
extern load_kernel extern load_kernel
%define e820_magic 0x534d4150 ; "SMAP"
%define e820_entry_size 24
%define e820_max_entries 128
; ----------------------------------------------------------------
; Real mode
; ----------------------------------------------------------------
[BITS 16]
_start: _start:
call read_e820
call setup_gdt
call switch_to_pm
read_e820:
xor ebx, ebx
mov es, bx
mov di, MEMMAP_BASE+4 ; ES=0 DI=MEMMAP_BASE+4
xor bp, bp ; Keeping count in bp
.e820_loop:
mov eax, 0xe820
mov ecx, e820_entry_size
mov edx, e820_magic
int 0x15
jc .done ; Error?
cmp eax, e820_magic ; Verify "SMAP"
jne .done
test ecx, ecx ; Skip 0-sized entries
jz .skip
add di, e820_entry_size ; Advance write addr
inc bp ; Increment count
cmp bp, e820_max_entries ; Stop if we're at capacity
jae .done
.skip:
test ebx, ebx
jne .e820_loop
.done:
mov [MEMMAP_BASE], bp ; Store count
ret
setup_gdt:
lgdt [gdt_descriptor]
ret
switch_to_pm:
cli
mov eax, cr0
or eax, 1
mov cr0, eax
jmp 0x08:pm_entry
e820_count:
dw 0
gdt_start:
dq 0x0000000000000000 ; Null descriptor
dq 0x00CF9A000000FFFF ; 32-bit code segment (selector 0x08)
dq 0x00CF92000000FFFF ; 32-bit data segment (selector 0x10)
dq 0x00009A000000FFFF ; 16-bit code segment for real mode (selector 0x18)
gdt_descriptor:
dw gdt_end - gdt_start - 1
dd gdt_start
gdt_end:
; ----------------------------------------------------------------
; Protected mode
; ----------------------------------------------------------------
[BITS 32]
pm_entry:
; Set up segments ; Set up segments
; Data segments ; Data segments
mov ax, 0x10 mov ax, 0x10
@@ -18,9 +88,8 @@ _start:
mov ax, 0x08 mov ax, 0x08
mov cs, ax mov cs, ax
; Stack (must be identity-mapped) ; Stack
mov esp, 0x90000 mov esp, 0x90000
call load_kernel call load_kernel
jmp eax jmp eax

View File

@@ -1,19 +1,16 @@
#include "memmap.h" #include "memmap.h"
#define BOOTLOADER_MEMMAP_COUNT_ADDR MEMMAP_BASE
#define BOOTLOADER_MEMMAP_ADDR (MEMMAP_BASE + 4)
uint32_t get_memory_map(memory_map_entry_t *map, uint32_t max_entries) { uint32_t get_memory_map(memory_map_entry_t *map, uint32_t max_entries) {
// Read the number of entries found by the bootloader
uint32_t entries_found = *(uint32_t*)BOOTLOADER_MEMMAP_COUNT_ADDR;
memory_map_entry_t *bios_data = (memory_map_entry_t*)BOOTLOADER_MEMMAP_ADDR;
uint32_t count = 0; uint32_t count = 0;
while (count < entries_found && count < max_entries) {
if (max_entries >= 1) { map[count] = bios_data[count];
map[count].base_addr = 0x00000000;
map[count].length = 0x0009FC00;
map[count].type = 1;
count++;
}
if (max_entries >= 2) {
map[count].base_addr = 0x00100000;
map[count].length = 0x1FF00000;
map[count].type = 1;
count++; count++;
} }

View File

@@ -7,6 +7,7 @@ typedef struct {
uint64_t base_addr; uint64_t base_addr;
uint64_t length; uint64_t length;
uint32_t type; uint32_t type;
uint32_t ext;
} __attribute__((packed)) memory_map_entry_t; } __attribute__((packed)) memory_map_entry_t;
uint32_t get_memory_map(memory_map_entry_t *map, uint32_t max_entries); uint32_t get_memory_map(memory_map_entry_t *map, uint32_t max_entries);

130
kernel/parallel.c Normal file
View File

@@ -0,0 +1,130 @@
#include "parallel.h"
#include "io.h"
#include "irq.h"
#include "serial.h" // or your print/terminal for debug
// Standard PC LPT base addresses
static const uint16_t lpt_base_addrs[LPT_MAX_PORTS] = {
0x378, // LPT1
0x278 // LPT2
};
lpt_device_t lpt_devices[LPT_MAX_PORTS];
// Register offsets
#define LPT_DATA(base) (base + 0)
#define LPT_STATUS(base) (base + 1)
#define LPT_CONTROL(base) (base + 2)
// STATUS bits
// bit 7: Busy (inverted), 6: Ack, 5: Paper Out, 4: Select, 3: Error
// CONTROL bits
// bit 0: Strobe, 1: Auto Linefeed, 2: Init, 3: Select In, 5: Bidirectional (PS/2)
// Simple presence check: write/read control & status
static bool lpt_detect(uint16_t base) {
uint8_t orig_ctrl = inb(LPT_CONTROL(base));
outb(LPT_CONTROL(base), orig_ctrl ^ 0x0F);
uint8_t new_ctrl = inb(LPT_CONTROL(base));
outb(LPT_CONTROL(base), orig_ctrl);
// If bits changed as expected, port likely exists
if (((orig_ctrl ^ new_ctrl) & 0x0F) == 0x0F) {
return true;
}
return false;
}
static void lpt_configure_bidir(uint16_t base, bool enable) {
uint8_t ctrl = inb(LPT_CONTROL(base));
if (enable) {
ctrl |= (1 << 5); // Set bidirectional bit (PS/2)
} else {
ctrl &= ~(1 << 5);
}
outb(LPT_CONTROL(base), ctrl);
}
void lpt_set_mode(lpt_port_t port, lpt_mode_t mode) {
if (port < 0 || port >= LPT_MAX_PORTS) return;
if (!lpt_devices[port].present) return;
uint16_t base = lpt_devices[port].base;
switch (mode) {
case LPT_MODE_COMPAT:
lpt_configure_bidir(base, false);
break;
case LPT_MODE_BIDIR:
lpt_configure_bidir(base, true);
break;
case LPT_MODE_EPP:
// TODO: EPP requires chipset support & config
// For now, just enable bidir as a baseline
lpt_configure_bidir(base, true);
break;
case LPT_MODE_ECP:
// TODO: ECP requires FIFO, DMA, and ECR register
// Stub for future implementation
lpt_configure_bidir(base, true);
break;
}
lpt_devices[port].mode = mode;
}
void lpt_write_byte(lpt_port_t port, uint8_t value) {
if (port < 0 || port >= LPT_MAX_PORTS) return;
if (!lpt_devices[port].present) return;
uint16_t base = lpt_devices[port].base;
// Wait until not busy (bit 7 is inverted busy)
while (!(inb(LPT_STATUS(base)) & 0x80))
;
outb(LPT_DATA(base), value);
// Pulse strobe
uint8_t ctrl = inb(LPT_CONTROL(base));
outb(LPT_CONTROL(base), ctrl | 0x01);
outb(LPT_CONTROL(base), ctrl & ~0x01);
}
uint8_t lpt_read_byte(lpt_port_t port) {
if (port < 0 || port >= LPT_MAX_PORTS) return 0xFF;
if (!lpt_devices[port].present) return 0xFF;
uint16_t base = lpt_devices[port].base;
// In bidirectional mode, data register is input
return inb(LPT_DATA(base));
}
// IRQ hook: you wire this into your IRQ handler for the LPT IRQ (usually 7 or 5)
void lpt_irq_handler(lpt_port_t port) {
// For now, just a stub. Later:
// - read status
// - acknowledge interrupt
// - wake waiting writer/reader
(void)port;
}
// Initialize all LPT ports
void lpt_init_all(void) {
for (int i = 0; i < LPT_MAX_PORTS; i++) {
lpt_devices[i].base = lpt_base_addrs[i];
lpt_devices[i].present = lpt_detect(lpt_devices[i].base);
lpt_devices[i].mode = LPT_MODE_COMPAT;
lpt_devices[i].irq = 0; // You can fill this if you parse BIOS/PCI/ACPI
if (lpt_devices[i].present) {
serial_write("LPT detected at base 0x");
// use your print_hex here if you want
}
}
// If you want interrupt-driven I/O:
// - Map LPT IRQ (usually 7 for LPT1, 5 for LPT2) in your PIC/IRQ layer
// - In your IRQ handler, call lpt_irq_handler(port)
}

40
kernel/parallel.h Normal file
View File

@@ -0,0 +1,40 @@
#ifndef PARALLEL_H
#define PARALLEL_H
#include <stdint.h>
#include <stdbool.h>
typedef enum {
LPT_PORT_NONE = -1,
LPT1_PORT = 0,
LPT2_PORT = 1,
LPT_MAX_PORTS = 2
} lpt_port_t;
typedef enum {
LPT_MODE_COMPAT = 0, // Standard (SPP)
LPT_MODE_BIDIR, // PS/2 bidirectional
LPT_MODE_EPP, // IEEE 1284 EPP
LPT_MODE_ECP // IEEE 1284 ECP
} lpt_mode_t;
typedef struct {
uint16_t base; // Base I/O address (e.g., 0x378, 0x278)
bool present; // Detected
lpt_mode_t mode; // Current mode
uint8_t irq; // IRQ line (if known/used)
} lpt_device_t;
extern lpt_device_t lpt_devices[LPT_MAX_PORTS];
void lpt_init_all(void);
void lpt_set_mode(lpt_port_t port, lpt_mode_t mode);
// Simple polled I/O
void lpt_write_byte(lpt_port_t port, uint8_t value);
uint8_t lpt_read_byte(lpt_port_t port);
// IRQ-driven hook (you implement the handler logic)
void lpt_irq_handler(lpt_port_t port);
#endif

109
kernel/pci.c Normal file
View File

@@ -0,0 +1,109 @@
#include "pci.h"
#include "io.h"
/* --- Configuration Access Functions --- */
uint32_t pci_config_read_dword(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
uint32_t address = (uint32_t)((uint32_t)1 << 31) |
((uint32_t)bus << 16) |
((uint32_t)slot << 11) |
((uint32_t)func << 8) |
(offset & 0xFC);
outl(PCI_CONFIG_ADDRESS, address);
return inl(PCI_CONFIG_DATA);
}
void pci_config_write_dword(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint32_t data) {
uint32_t address = (uint32_t)((uint32_t)1 << 31) |
((uint32_t)bus << 16) |
((uint32_t)slot << 11) |
((uint32_t)func << 8) |
(offset & 0xFC);
outl(PCI_CONFIG_ADDRESS, address);
outl(PCI_CONFIG_DATA, data);
}
/* To read a word or byte, we read the Dword and shift/mask */
uint16_t pci_config_read_word(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
uint32_t dword = pci_config_read_dword(bus, slot, func, offset);
return (uint16_t)((dword >> ((offset & 2) * 8)) & 0xFFFF);
}
uint8_t pci_config_read_byte(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset) {
uint32_t dword = pci_config_read_dword(bus, slot, func, offset);
return (uint8_t)((dword >> ((offset & 3) * 8)) & 0xFF);
}
/* --- BAR Decoding Logic --- */
pci_bar_t pci_get_bar(uint8_t bus, uint8_t slot, uint8_t func, uint8_t bar_index) {
pci_bar_t bar = {0};
uint8_t offset = PCI_REG_BAR0 + (bar_index * 4);
uint32_t initial_val = pci_config_read_dword(bus, slot, func, offset);
// The Size Masking Trick
pci_config_write_dword(bus, slot, func, offset, 0xFFFFFFFF);
uint32_t mask = pci_config_read_dword(bus, slot, func, offset);
pci_config_write_dword(bus, slot, func, offset, initial_val); // Restore
if (initial_val & 0x1) {
// I/O Space BAR
bar.is_io = true;
bar.base_address = initial_val & 0xFFFFFFFC;
bar.size = ~(mask & 0xFFFFFFFC) + 1;
} else {
// Memory Space BAR
bar.is_io = false;
bar.base_address = initial_val & 0xFFFFFFF0;
bar.is_prefetchable = (initial_val & 0x8) != 0;
bar.size = ~(mask & 0xFFFFFFF0) + 1;
}
return bar;
}
/* --- Enumeration and Discovery --- */
void pci_check_function(uint8_t bus, uint8_t slot, uint8_t func) {
uint16_t vendor_id = pci_config_read_word(bus, slot, func, PCI_REG_VENDOR_ID);
if (vendor_id == 0xFFFF) return;
uint16_t device_id = pci_config_read_word(bus, slot, func, PCI_REG_DEVICE_ID);
uint8_t class_code = pci_config_read_byte(bus, slot, func, PCI_REG_CLASS);
/* Optional: Set Master Latency Timer if it is 0.
A value of 32 (0x20) or 64 (0x40) is typical.
*/
uint8_t latency = pci_config_read_byte(bus, slot, func, PCI_REG_LATENCY_TIMER);
if (latency == 0) {
// pci_config_write_byte would be needed here, or write a dword with the byte modified
uint32_t reg_0c = pci_config_read_dword(bus, slot, func, 0x0C);
reg_0c |= (0x20 << 8); // Set latency to 32
pci_config_write_dword(bus, slot, func, 0x0C, reg_0c);
}
// Replace with your kernel's print/logging function
// printf("Found PCI Device: %x:%x Class: %x at %d:%d:%d\n", vendor_id, device_id, class_code, bus, slot, func);
}
void pci_init(void) {
for (uint16_t bus = 0; bus < 256; bus++) {
for (uint8_t slot = 0; slot < 32; slot++) {
// Check Function 0 first
uint16_t vendor = pci_config_read_word(bus, slot, 0, PCI_REG_VENDOR_ID);
if (vendor == 0xFFFF) continue;
pci_check_function(bus, slot, 0);
// Check if this is a multi-function device
uint8_t header_type = pci_config_read_byte(bus, slot, 0, PCI_REG_HEADER_TYPE);
if (header_type & 0x80) {
// Check functions 1-7
for (uint8_t func = 1; func < 8; func++) {
pci_check_function(bus, slot, func);
}
}
}
}
}

60
kernel/pci.h Normal file
View File

@@ -0,0 +1,60 @@
#ifndef PCI_H
#define PCI_H
#include <stdint.h>
#include <stdbool.h>
/* I/O Ports for PCI Configuration Mechanism #1 */
#define PCI_CONFIG_ADDRESS 0xCF8
#define PCI_CONFIG_DATA 0xCFC
/* Common PCI Configuration Register Offsets */
#define PCI_REG_VENDOR_ID 0x00
#define PCI_REG_DEVICE_ID 0x02
#define PCI_REG_COMMAND 0x04
#define PCI_REG_STATUS 0x06
#define PCI_REG_REVISION_ID 0x08
#define PCI_REG_PROG_IF 0x09
#define PCI_REG_SUBCLASS 0x0A
#define PCI_REG_CLASS 0x0B
#define PCI_REG_CACHE_LINE_SIZE 0x0C
#define PCI_REG_LATENCY_TIMER 0x0D
#define PCI_REG_HEADER_TYPE 0x0E
#define PCI_REG_BIST 0x0F
#define PCI_REG_BAR0 0x10
#define PCI_REG_BAR1 0x14
#define PCI_REG_BAR2 0x18
#define PCI_REG_BAR3 0x1C
#define PCI_REG_BAR4 0x20
#define PCI_REG_BAR5 0x24
#define PCI_REG_INTERRUPT_LINE 0x3C
typedef struct {
uint32_t base_address;
uint32_t size;
bool is_io;
bool is_prefetchable; // Only for Memory BARs
} pci_bar_t;
typedef struct {
uint8_t bus;
uint8_t device;
uint8_t function;
uint16_t vendor_id;
uint16_t device_id;
uint8_t class_code;
uint8_t subclass;
uint8_t interrupt_line;
} pci_dev_t;
/* Function Prototypes */
uint32_t pci_config_read_dword(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset);
void pci_config_write_dword(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset, uint32_t data);
uint16_t pci_config_read_word(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset);
uint8_t pci_config_read_byte(uint8_t bus, uint8_t slot, uint8_t func, uint8_t offset);
pci_bar_t pci_get_bar(uint8_t bus, uint8_t slot, uint8_t func, uint8_t bar_index);
void pci_init(void);
#endif

107
kernel/ps2.c Normal file
View File

@@ -0,0 +1,107 @@
#include "ps2.h"
#include "io.h"
/* --- Controller Synchronization --- */
// Wait until the controller is ready to receive a byte
static void ps2_wait_write() {
while (inb(PS2_STATUS_REG) & PS2_STATUS_INPUT);
}
// Wait until the controller has a byte for us to read
static void ps2_wait_read() {
while (!(inb(PS2_STATUS_REG) & PS2_STATUS_OUTPUT));
}
/* --- Initialization --- */
void ps2_write_device(uint8_t command) {
ps2_wait_write();
outb(PS2_DATA_PORT, command);
}
void ps2_write_mouse(uint8_t data) {
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_WRITE_MOUSE); // "Next byte goes to mouse"
ps2_wait_write();
outb(PS2_DATA_PORT, data);
}
void ps2_init(void) {
// 1. Disable Devices
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_DISABLE_KB);
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_DISABLE_MS);
// 2. Flush Output Buffer
while (inb(PS2_STATUS_REG) & PS2_STATUS_OUTPUT) {
inb(PS2_DATA_PORT);
}
// 3. Set Controller Configuration Byte
// Bit 0: KB Interrupt, Bit 1: Mouse Interrupt, Bit 6: Translation
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_READ_CONFIG);
ps2_wait_read();
uint8_t status = inb(PS2_DATA_PORT);
status |= (1 << 0) | (1 << 1); // Enable IRQ 1 and IRQ 12
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_WRITE_CONFIG);
ps2_wait_write();
outb(PS2_DATA_PORT, status);
// 4. Enable Devices
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_ENABLE_KB);
ps2_wait_write();
outb(PS2_COMMAND_REG, PS2_CMD_ENABLE_MS);
// 5. Initialize Mouse (The mouse won't send IRQs until you tell it to)
ps2_write_mouse(MOUSE_CMD_SET_DEFAULTS);
ps2_wait_read(); inb(PS2_DATA_PORT); // Read ACK (0xFA)
ps2_write_mouse(MOUSE_CMD_ENABLE_SCAN);
ps2_wait_read(); inb(PS2_DATA_PORT); // Read ACK (0xFA)
}
/* --- IRQ Handlers --- */
// Called from IRQ 1 (Keyboard)
void ps2_keyboard_handler(void) {
uint8_t scancode = inb(PS2_DATA_PORT);
// Process scancode (e.g., put it into a circular buffer)
}
// Called from IRQ 12 (Mouse)
static uint8_t mouse_cycle = 0;
static uint8_t mouse_bytes[3];
void ps2_mouse_handler(void) {
uint8_t status = inb(PS2_STATUS_REG);
// Ensure this is actually mouse data
if (!(status & PS2_STATUS_MOUSE)) return;
mouse_bytes[mouse_cycle++] = inb(PS2_DATA_PORT);
if (mouse_cycle == 3) {
mouse_cycle = 0;
// Byte 0: Flags (Buttons, Signs)
// Byte 1: X Delta
// Byte 2: Y Delta
mouse_state_t state;
state.left_button = (mouse_bytes[0] & 0x01);
state.right_button = (mouse_bytes[0] & 0x02);
state.middle_button = (mouse_bytes[0] & 0x04);
// Handle negative deltas (signed 9-bit logic)
state.x_delta = (int8_t)mouse_bytes[1];
state.y_delta = (int8_t)mouse_bytes[2];
// Update your kernel's internal mouse position here
}
}

45
kernel/ps2.h Normal file
View File

@@ -0,0 +1,45 @@
#ifndef PS2_H
#define PS2_H
#include <stdint.h>
#include <stdbool.h>
/* I/O Ports */
#define PS2_DATA_PORT 0x60
#define PS2_STATUS_REG 0x64
#define PS2_COMMAND_REG 0x64
/* Status Register Bits */
#define PS2_STATUS_OUTPUT 0x01 // 1 = Data ready to be read
#define PS2_STATUS_INPUT 0x02 // 1 = Controller busy, don't write yet
#define PS2_STATUS_SYS 0x04 // System flag
#define PS2_STATUS_CMD_DATA 0x08 // 0 = Data written to 0x60, 1 = Cmd to 0x64
#define PS2_STATUS_MOUSE 0x20 // 1 = Mouse data, 0 = Keyboard data
/* Controller Commands */
#define PS2_CMD_READ_CONFIG 0x20
#define PS2_CMD_WRITE_CONFIG 0x60
#define PS2_CMD_DISABLE_MS 0xA7
#define PS2_CMD_ENABLE_MS 0xA8
#define PS2_CMD_DISABLE_KB 0xAD
#define PS2_CMD_ENABLE_KB 0xAE
#define PS2_CMD_WRITE_MOUSE 0xD4
/* Mouse Commands */
#define MOUSE_CMD_SET_DEFAULTS 0xF6
#define MOUSE_CMD_ENABLE_SCAN 0xF4
typedef struct {
int8_t x_delta;
int8_t y_delta;
bool left_button;
bool right_button;
bool middle_button;
} mouse_state_t;
/* Public API */
void ps2_init(void);
void ps2_keyboard_handler(void);
void ps2_mouse_handler(void);
#endif

View File

@@ -25,7 +25,8 @@ void thread_init(void) {
} }
// Create a new thread // Create a new thread
void thread_create(Thread *thread __attribute__((unused)), void (*start_routine)(void *), void *arg) { void thread_create(Thread* thread __attribute__((unused)),
void (*start_routine)(void*), void* arg) {
if (num_threads >= MAX_THREADS) { if (num_threads >= MAX_THREADS) {
my_printf("Error: Maximum thread count reached.\n"); my_printf("Error: Maximum thread count reached.\n");
return; return;
@@ -40,11 +41,13 @@ void thread_create(Thread *thread __attribute__((unused)), void (*start_routine)
thread_table[index].arg = arg; thread_table[index].arg = arg;
thread_table[index].stack_size = THREAD_STACK_SIZE; thread_table[index].stack_size = THREAD_STACK_SIZE;
thread_table[index].stack = (uint32_t*)malloc(THREAD_STACK_SIZE); thread_table[index].stack = (uint32_t*)malloc(THREAD_STACK_SIZE);
thread_table[index].stack_top = thread_table[index].stack + THREAD_STACK_SIZE / sizeof(uint32_t); thread_table[index].stack_top =
thread_table[index].stack + THREAD_STACK_SIZE / sizeof(uint32_t);
// Initialize the stack (simulate pushing the function's return address) // Initialize the stack (simulate pushing the function's return address)
uint32_t* stack_top = thread_table[index].stack_top; uint32_t* stack_top = thread_table[index].stack_top;
*(--stack_top) = (uint32_t)start_routine; // Return address (the thread's entry point) *(--stack_top) =
(uint32_t)start_routine; // Return address (the thread's entry point)
*(--stack_top) = (uint32_t)arg; // Argument to pass to the thread *(--stack_top) = (uint32_t)arg; // Argument to pass to the thread
// Set the thread's state to ready // Set the thread's state to ready
@@ -60,7 +63,8 @@ void thread_create(Thread *thread __attribute__((unused)), void (*start_routine)
void thread_yield(void) { void thread_yield(void) {
// Find the next thread in a round-robin manner // Find the next thread in a round-robin manner
uint32_t next_thread = (current_thread + 1) % num_threads; uint32_t next_thread = (current_thread + 1) % num_threads;
while (next_thread != current_thread && thread_table[next_thread].state != THREAD_READY) { while (next_thread != current_thread &&
thread_table[next_thread].state != THREAD_READY) {
next_thread = (next_thread + 1) % num_threads; next_thread = (next_thread + 1) % num_threads;
} }
@@ -72,7 +76,8 @@ void thread_yield(void) {
// Exit the current thread // Exit the current thread
void thread_exit(void) { void thread_exit(void) {
thread_table[current_thread].state = THREAD_BLOCKED; // Mark the thread as blocked (finished) thread_table[current_thread].state =
THREAD_BLOCKED; // Mark the thread as blocked (finished)
free(thread_table[current_thread].stack); // Free the thread's stack free(thread_table[current_thread].stack); // Free the thread's stack
num_threads--; // Decrease thread count num_threads--; // Decrease thread count
@@ -94,18 +99,18 @@ void scheduler(void) {
} }
} }
// Context switch to the next thread (assembly would go here to save/load registers) // Context switch to the next thread (assembly would go here to save/load
// registers)
void context_switch(Thread* next) { void context_switch(Thread* next) {
// For simplicity, context switching in this example would involve saving/restoring registers. // For simplicity, context switching in this example would involve
// In a real system, you would need to save the CPU state (registers) and restore the next thread's state. // saving/restoring registers. In a real system, you would need to save the
// CPU state (registers) and restore the next thread's state.
my_printf("Switching to thread...\n"); my_printf("Switching to thread...\n");
next->start_routine(next->arg); // Start running the next thread next->start_routine(next->arg); // Start running the next thread
} }
// Simple mutex functions (spinlock) // Simple mutex functions (spinlock)
void mutex_init(void) { void mutex_init(void) { mutex_locked = 0; }
mutex_locked = 0;
}
void mutex_lock(void) { void mutex_lock(void) {
while (__sync_lock_test_and_set(&mutex_locked, 1)) { while (__sync_lock_test_and_set(&mutex_locked, 1)) {
@@ -113,6 +118,4 @@ void mutex_lock(void) {
} }
} }
void mutex_unlock(void) { void mutex_unlock(void) { __sync_lock_release(&mutex_locked); }
__sync_lock_release(&mutex_locked);
}