Revert "Split the project into packages."

This reverts commit ab93a33bbd.
This commit is contained in:
Sam Tebbs 2022-10-25 16:27:50 +01:00
parent b1718addde
commit a023fadc24
32 changed files with 85 additions and 124 deletions

View file

@ -1,25 +1,18 @@
const std = @import("std");
const builtin = @import("builtin");
const pluto = @import("pluto");
const arch = @import("arch");
const Allocator = std.mem.Allocator;
const mem = @import("../../../src/kernel/mem.zig");
const MemProfile = mem.MemProfile;
const pci = @import("pci_mock.zig");
const gdt = @import("gdt_mock.zig");
const idt = @import("idt_mock.zig");
const vmm = @import("../../../src/kernel/vmm.zig");
const paging = @import("paging_mock.zig");
pub const cmos_mock = @import("cmos_mock.zig");
pub const vga_mock = @import("vga_mock.zig");
pub const pic_mock = @import("pic_mock.zig");
pub const idt_mock = @import("idt_mock.zig");
pub const pci_mock = @import("pci_mock.zig");
const x86_paging = arch.paging;
const vmm = pluto.vmm;
const mem = pluto.mem;
const Serial = pluto.serial.Serial;
const TTY = pluto.tty.TTY;
const Keyboard = pluto.keyboard.Keyboard;
const task = pluto.task;
const Allocator = std.mem.Allocator;
const MemProfile = mem.MemProfile;
const Serial = @import("../../../src/kernel/serial.zig").Serial;
const TTY = @import("../../../src/kernel/tty.zig").TTY;
const Keyboard = @import("../../../src/kernel/keyboard.zig").Keyboard;
const task = @import("../../../src/kernel/task.zig");
const x86_paging = @import("../../../src/kernel/arch/x86/paging.zig");
pub const Device = pci.PciDeviceInfo;
pub const DateTime = struct {

View file

@ -1,4 +1,6 @@
const src_gdt = @import("arch").gdt;
// Can't do: TODO: https://github.com/SamTebbs33/pluto/issues/77
//const src_gdt = @import("arch").gdt;
const src_gdt = @import("../../../src/kernel/arch/x86/gdt.zig");
const mock_framework = @import("mock_framework.zig");
pub const initTest = mock_framework.initTest;

View file

@ -1,4 +1,4 @@
const src_idt = @import("arch").idt;
const src_idt = @import("../../../src/kernel/arch/x86/idt.zig");
const mock_framework = @import("mock_framework.zig");
pub const initTest = mock_framework.initTest;