Skip to content
This repository was archived by the owner on Jan 4, 2026. It is now read-only.

Commit c31fc77

Browse files
assembler-0assembler-0
authored
Merge pull request #176 from assembler-0/Development
Development
2 parents fb87f81 + 4f6c3bc commit c31fc77

File tree

36 files changed

+111
-117
lines changed

36 files changed

+111
-117
lines changed

‎arch/x86_64/interrupts/Interrupts.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <Interrupts.h>
2-
#include <../../../drivers/APIC/APIC.h>
3-
#include <../../../drivers/storage/Ide.h>
2+
#include <APIC/APIC.h>
3+
#include <storage/Ide.h>
44
#include <Atomics.h>
55
#include <Console.h>
66
#include <Kernel.h>

‎cmake/ccache.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# CCache Configuration for Faster Builds
33
# ============================================================================
44

5-
option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" ON)
5+
option(VF_ENABLE_CCACHE "Enable ccache for faster compilation" OFF)
66

77
if(VF_ENABLE_CCACHE)
88
find_program(CCACHE_PROGRAM ccache)

‎cmake/source.cmake‎

Lines changed: 36 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -144,58 +144,63 @@ set(OBJ_SOURCES)
144144
# ============================================================================
145145
include_directories(
146146
.
147-
include
148-
kernel/atomic
149-
kernel/core
150-
kernel/ipc
151-
kernel/sched
152-
kernel/etc
153-
kernel/execf
154-
kernel/execf/elf
155-
kernel/execf/pe
156-
kernel/execf/aout
147+
arch/x86_64
148+
arch/x86_64/asm
149+
arch/x86_64/features
150+
arch/x86_64/gdt
151+
arch/x86_64/idt
152+
arch/x86_64/interrupts
153+
arch/x86_64/syscall
154+
crypto
157155
drivers
158-
drivers/PCI
156+
drivers/APIC
159157
drivers/ethernet
160158
drivers/ethernet/intel
161159
drivers/ethernet/realtek
162160
drivers/ethernet/interface
163-
drivers/RTC
164-
drivers/xHCI
161+
drivers/input
165162
drivers/ISA
163+
drivers/LPT
164+
drivers/OPIC
165+
drivers/PCI
166+
drivers/RTC
166167
drivers/sound
167168
drivers/storage
168-
drivers/virtio
169-
drivers/vmware
170-
drivers/APIC
171-
drivers/OPIC
172169
drivers/usb
173170
drivers/usb/hid
174-
drivers/input
171+
drivers/virtio
172+
drivers/vmware
173+
drivers/xHCI
175174
fs
176-
fs/FAT
175+
fs/devfs
177176
fs/EXT
177+
fs/FAT
178178
fs/NTFS
179-
fs/devfs
179+
fs/procfs
180+
include
181+
include/Switch
182+
include/Vector
183+
kernel/atomic
184+
kernel/core
185+
kernel/etc
186+
kernel/execf
187+
kernel/execf/elf
188+
kernel/execf/pe
189+
kernel/execf/aout
190+
kernel/execf/macho
191+
kernel/ipc
192+
kernel/sched
180193
mm
194+
mm/asm
181195
mm/dynamic
182196
mm/dynamic/c
183197
mm/dynamic/rust
184-
mm/trace
185198
mm/security
186-
ports/6502
199+
mm/trace
187200
ports
188-
ports/raytracer
189-
arch/x86_64
190-
arch/x86_64/asm
191-
arch/x86_64/features
192-
arch/x86_64/gdt
193-
arch/x86_64/idt
194-
arch/x86_64/interrupts
195-
arch/x86_64/syscall
201+
ports/6502
196202
vfcompositor
197203
vfcompositor/app
198-
crypto
199204
)
200205

201206
# ============================================================================

‎drivers/APIC/APIC.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <APIC.h>
2-
#include <../../include/Io.h>
3-
#include <../../kernel/core/Kernel.h>
4-
#include <../../kernel/etc/Console.h>
5-
#include <../../mm/VMem.h>
6-
#include <../sound/Generic.h>
2+
#include <include/Io.h>
3+
#include <kernel/core/Kernel.h>
4+
#include <kernel/etc/Console.h>
5+
#include <mm/VMem.h>
6+
#include <sound/Generic.h>
77
#include <Panic.h>
88
#include <x64.h>
99

‎drivers/ISA/ISA.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <ISA.h>
2-
#include <../../mm/KernelHeap.h>
2+
#include <mm/KernelHeap.h>
33
#include <Console.h>
44
#include <Io.h>
55
#include <SB16.h>

‎drivers/OPIC/OPIC.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
*/
1111

1212
#include <OPIC.h>
13-
#include <../../include/Io.h>
14-
#include <../../kernel/core/Kernel.h>
15-
#include <../../kernel/etc/Console.h>
16-
#include <../../mm/VMem.h>
13+
#include <include/Io.h>
14+
#include <kernel/core/Kernel.h>
15+
#include <kernel/etc/Console.h>
16+
#include <mm/VMem.h>
1717
#include <x64.h>
1818
#include <Panic.h>
1919

‎drivers/Random.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <Random.h>
2-
#include <../crypto/RNG.h>
3-
#include <../fs/CharDevice.h>
2+
#include <crypto/RNG.h>
3+
#include <fs/CharDevice.h>
44

55
static int RandomDevRead(struct CharDevice* dev, void* buffer, uint32_t size) {
66
uint8_t* buf = (uint8_t*)buffer;

‎drivers/Serial.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <Serial.h>
22
#include <Io.h>
3-
#include <../fs/CharDevice.h>
4-
#include <../kernel/etc/Console.h>
3+
#include <fs/CharDevice.h>
4+
#include <kernel/etc/Console.h>
55

66
// Serial port register offsets
77
#define SERIAL_DATA_REG 0 // Data register (DLAB=0)

‎drivers/Vesa.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include <Vesa.h>
2-
#include <../mm/MemOps.h>
2+
#include <mm/MemOps.h>
33
#include <Font.h>
44
#include <Multiboot2.h>
55
#include <Serial.h>

‎drivers/ethernet/intel/E1000.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <E1000.h>
2-
#include <../interface/Arp.h>
3-
#include <../interface/Ip.h>
2+
#include <interface/Arp.h>
3+
#include <interface/Ip.h>
44
#include <Console.h>
55
#include <TSC.h>
66
#include <Io.h>

0 commit comments

Comments
 (0)