diff options
| author | hachem <im@hachem.wtf> | 2026-10-12 23:08:48 +0200 |
|---|---|---|
| committer | hachem <im@hachem.wtf> | 2026-10-12 23:08:48 +0200 |
| commit | 6a5543bb8f1f535ca49737bcd7be0cafca3b2a08 (patch) | |
| tree | bb137b732a1d122aeace46c550733f4793d84601 /boot | |
| parent | 59794d0b999e544a94230d9562bf2b99d2ed74c7 (diff) | |
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/boot.zig | 5 | ||||
| -rw-r--r-- | boot/elf.zig | 9 | ||||
| -rw-r--r-- | boot/fonts.zig | 11 |
3 files changed, 3 insertions, 22 deletions
diff --git a/boot/boot.zig b/boot/boot.zig index 6ead044..891def7 100644 --- a/boot/boot.zig +++ b/boot/boot.zig @@ -8,8 +8,9 @@ const pmm = @import("pmm.zig"); const heap = @import("heap.zig"); const vmm = @import("vmm.zig"); const user = @import("user.zig"); -const elf = @import("elf.zig"); -const fontdata = @import("fonts.zig"); +// fonts + compiled programs, generated from the filesystem by build.zig +const elf = @import("kasset"); +const fontdata = @import("kasset"); const keyboard = @import("keyboard.zig"); const timer = @import("timer.zig"); const sched = @import("sched.zig"); diff --git a/boot/elf.zig b/boot/elf.zig deleted file mode 100644 index 32acbfe..0000000 --- a/boot/elf.zig +++ /dev/null @@ -1,9 +0,0 @@ -pub const Program = struct { name: []const u8, bytes: []const u8 }; -pub const programs = [_]Program{ - .{ .name = "hexview", .bytes = @embedFile("user_hexview") }, - .{ .name = "calc", .bytes = @embedFile("user_calc") }, - .{ .name = "primes", .bytes = @embedFile("user_primes") }, - .{ .name = "save", .bytes = @embedFile("user_save") }, - .{ .name = "chat", .bytes = @embedFile("user_chat") }, - .{ .name = "membrk", .bytes = @embedFile("user_membrk") }, -}; diff --git a/boot/fonts.zig b/boot/fonts.zig deleted file mode 100644 index 5db8123..0000000 --- a/boot/fonts.zig +++ /dev/null @@ -1,11 +0,0 @@ -// js loading fonts from host disk -pub const Font = struct { name: []const u8, bytes: []const u8 }; -pub const fonts = [_]Font{ - .{ .name = "vga16.psf", .bytes = @embedFile("font_vga16") }, - .{ .name = "vga8.psf", .bytes = @embedFile("font_vga8") }, - .{ .name = "sun16.psf", .bytes = @embedFile("font_sun16") }, - .{ .name = "acorn8.psf", .bytes = @embedFile("font_acorn8") }, - .{ .name = "pearl8.psf", .bytes = @embedFile("font_pearl8") }, - .{ .name = "dejavu.ttf", .bytes = @embedFile("font_dejavu") }, - .{ .name = "terminess.ttf", .bytes = @embedFile("font_terminess") }, -}; |
