commit 3590420ca0d1e95e3fb84668827d028a4e2b7e61 · pci.express/frostium

+51 -50

components/ukernel/arch/amd64/boot.zig

···

       241
        
                   const fb = common.aux.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       242
        
                   common.init_data.framebuffer = fb;

     

       243
        
       

     

       244
       -
                   // Set the font scaling depending on screen resolution

     

       245
       -
                   const font_scale_x: usize, const font_scale_y: usize = blk: {

     

       246
       -
                       if (fb.width >= 2560 and fb.height >= 1440) {

     

       247
       -
                           break :blk .{ 2, 2 };

     

       248
       -
                       } else if (fb.width >= 5120 and fb.height >= 2880) {

     

       249
       -
                           break :blk .{ 4, 4 };

     

       250
       -
                       } else {

     

       251
       -
                           break :blk .{ 1, 1 };

     

       252
       -
                       }

     

       253
       -
                   };

     

       254
       -
       

     

       255
       -
                   common.init_data.console = flanterm.init(

     

       256
       -
                       //malloc and free

     

       257
       -
                       null,

     

       258
       -
                       null,

     

       259
       -
                       // fb info

     

       260
       -
                       fb.address,

     

       261
       -
                       fb.width,

     

       262
       -
                       fb.height,

     

       263
       -
                       fb.pitch,

     

       264
       -
                       fb.red_mask_size,

     

       265
       -
                       fb.red_mask_shift,

     

       266
       -
                       fb.green_mask_size,

     

       267
       -
                       fb.green_mask_shift,

     

       268
       -
                       fb.blue_mask_size,

     

       269
       -
                       fb.blue_mask_shift,

     

       270
       -
                       // canvas

     

       271
       -
                       null,

     

       272
       -
                       // colors

     

       273
       -
                       flanterm.ansi_colors,

     

       274
       -
                       flanterm.bold_ansi_colors,

     

       275
       -
                       // default bg and fg

     

       276
       -
                       null,

     

       277
       -
                       null,

     

       278
       -
                       // default bright bg and fg

     

       279
       -
                       null,

     

       280
       -
                       null,

     

       281
       -
                       // font

     

       282
       -
                       null,

     

       283
       -
                       // font width and height

     

       284
       -
                       0,

     

       285
       -
                       0,

     

       286
       -
                       // font spacing

     

       287
       -
                       1,

     

       288
       -
                       // font scale x and y

     

       289
       -
                       font_scale_x,

     

       290
       -
                       font_scale_y,

     

       291
       -
                       // margin

     

       292
       -
                       0,

     

       293
       -
                   );

     

       0
        
       
     

       294
        
               }

     

       295
        
           }

     

       296
        
       }

···

       241
        
                   const fb = common.aux.Framebuffer.from_limine(fb_response.getFramebuffers()[0]);

     

       242
        
                   common.init_data.framebuffer = fb;

     

       243
        
       

     

       244
       +
                   common.init_data.console = flanterm.Context.init(.{

     

       245
       +
                       .fb = fb.address,

     

       246
       +
                       .width = fb.width,

     

       247
       +
                       .height = fb.height,

     

       248
       +
                       .pitch = fb.pitch,

     

       249
       +
                       .red_mask_size = fb.red_mask_size,

     

       250
       +
                       .red_mask_shift = fb.red_mask_shift,

     

       251
       +
                       .green_mask_size = fb.green_mask_size,

     

       252
       +
                       .green_mask_shift = fb.green_mask_shift,

     

       253
       +
                       .blue_mask_size = fb.blue_mask_size,

     

       254
       +
                       .blue_mask_shift = fb.blue_mask_shift,

     

       255
       +
                   });

     

       256
       +
                   // common.init_data.console = flanterm.init(

     

       257
       +
                   //     //malloc and free

     

       258
       +
                   //     null,

     

       259
       +
                   //     null,

     

       260
       +
                   //     // fb info

     

       261
       +
                   //     fb.address,

     

       262
       +
                   //     fb.width,

     

       263
       +
                   //     fb.height,

     

       264
       +
                   //     fb.pitch,

     

       265
       +
                   //     fb.red_mask_size,

     

       266
       +
                   //     fb.red_mask_shift,

     

       267
       +
                   //     fb.green_mask_size,

     

       268
       +
                   //     fb.green_mask_shift,

     

       269
       +
                   //     fb.blue_mask_size,

     

       270
       +
                   //     fb.blue_mask_shift,

     

       271
       +
                   //     // canvas

     

       272
       +
                   //     null,

     

       273
       +
                   //     // colors

     

       274
       +
                   //     flanterm.ansi_colors,

     

       275
       +
                   //     flanterm.bold_ansi_colors,

     

       276
       +
                   //     // default bg and fg

     

       277
       +
                   //     null,

     

       278
       +
                   //     null,

     

       279
       +
                   //     // default bright bg and fg

     

       280
       +
                   //     null,

     

       281
       +
                   //     null,

     

       282
       +
                   //     // font

     

       283
       +
                   //     null,

     

       284
       +
                   //     // font width and height

     

       285
       +
                   //     0,

     

       286
       +
                   //     0,

     

       287
       +
                   //     // font spacing

     

       288
       +
                   //     1,

     

       289
       +
                   //     // font scale x and y

     

       290
       +
                   //     font_scale_x,

     

       291
       +
                   //     font_scale_y,

     

       292
       +
                   //     // margin

     

       293
       +
                   //     0,

     

       294
       +
                   // );

     

       295
        
               }

     

       296
        
           }

     

       297
        
       }

+1 -6

components/ukernel/build.zig

···

       67
        
       

     

       68
        
           const limine_mod = limine_dep.module("limine");

     

       69
        
           const spinlock_mod = spinlock_dep.module("spinlock");

     

       70
       -
           const flanterm_mod = b.createModule(.{

     

       71
       -
               .root_source_file = b.path("common/aux/flanterm.zig"),

     

       72
       -
           });

     

       73
       -
           flanterm_mod.addIncludePath(flanterm_dep.path("src"));

     

       74
       -
           flanterm_mod.addCSourceFile(.{ .file = flanterm_dep.path("src/flanterm.c") });

     

       75
       -
           flanterm_mod.addCSourceFile(.{ .file = flanterm_dep.path("src/flanterm_backends/fb.c") });

     

       76
        
       

     

       77
        
           const common_mod = b.createModule(.{

     

       78
        
               .root_source_file = b.path("common/root.zig"),

···

       67
        
       

     

       68
        
           const limine_mod = limine_dep.module("limine");

     

       69
        
           const spinlock_mod = spinlock_dep.module("spinlock");

     

       70
       +
           const flanterm_mod = flanterm_dep.module("flanterm");

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       71
        
       

     

       72
        
           const common_mod = b.createModule(.{

     

       73
        
               .root_source_file = b.path("common/root.zig"),

+2 -3

components/ukernel/build.zig.zon

···

       6
        
           .dependencies = .{

     

       7
        
               .limine = .{ .path = "deps/limine-zig" },

     

       8
        
               .spinlock = .{ .path = "deps/spinlock" },

     

       9
       -
               .console = .{ .path = "deps/console" },

     

       10
        
               .build_helpers = .{ .path = "../build_helpers" },

     

       11
        
               .flanterm = .{

     

       12
       -
                   .url = "git+https://codeberg.org/Mintsuki/Flanterm.git?ref=trunk#55d228ff16234513b0df0dd12de8bc58160fc196",

     

       13
       -
                   .hash = "N-V-__8AAIPRAQD-ppISTB_g_r_WTCC2e2vDOaJYZc5uhy4w",

     

       14
        
               },

     

       15
        
           },

     

       16
        
           .paths = .{

···

       6
        
           .dependencies = .{

     

       7
        
               .limine = .{ .path = "deps/limine-zig" },

     

       8
        
               .spinlock = .{ .path = "deps/spinlock" },

     

       0
        
       
     

       9
        
               .build_helpers = .{ .path = "../build_helpers" },

     

       10
        
               .flanterm = .{

     

       11
       +
                   .url = "git+https://tangled.sh/@sydney.blue/flanterm.zig?ref=trunk#8071c825750c415b9e5502cdff34efc9c6dfeab7",

     

       12
       +
                   .hash = "flanterm-2.0.0-QnufngHlAQCGtHyca0PrvRvoOldHdJG4DdSz437r9fRr",

     

       13
        
               },

     

       14
        
           },

     

       15
        
           .paths = .{

-54

components/ukernel/common/aux/flanterm.zig

···

       1
       -
       pub const c = @cImport({

     

       2
       -
           @cInclude("flanterm.h");

     

       3
       -
           @cInclude("flanterm_backends/fb.h");

     

       4
       -
       });

     

       5
       -
       

     

       6
       -
       pub const ctx = c.struct_flanterm_context;

     

       7
       -
       

     

       8
       -
       pub const init = c.flanterm_fb_init;

     

       9
       -
       

     

       10
       -
       pub const Color = enum(u8) {

     

       11
       -
           black = 30,

     

       12
       -
           red = 31,

     

       13
       -
           green = 32,

     

       14
       -
           yellow = 33,

     

       15
       -
           blue = 34,

     

       16
       -
           magenta = 35,

     

       17
       -
           cyan = 36,

     

       18
       -
           white = 37,

     

       19
       -
           default = 39,

     

       20
       -
           bright_black = 90,

     

       21
       -
           bright_red = 91,

     

       22
       -
           bright_green = 92,

     

       23
       -
           bright_yellow = 93,

     

       24
       -
           bright_blue = 94,

     

       25
       -
           bright_magenta = 95,

     

       26
       -
           bright_cyan = 96,

     

       27
       -
           bright_white = 97,

     

       28
       -
       };

     

       29
       -
       

     

       30
       -
       var ansi_colors_backing = [8]u32{

     

       31
       -
           0x000000, // Black

     

       32
       -
           0xff0000, // Red

     

       33
       -
           0x37dd21, // Green

     

       34
       -
           0xfee409, // Yellow

     

       35
       -
           0x1460d2, // Blue

     

       36
       -
           0xff005d, // Magenta

     

       37
       -
           0x00bbbb, // Cyan

     

       38
       -
           0xbbbbbb, // White

     

       39
       -
       };

     

       40
       -
       pub const ansi_colors: [*]u32 = @ptrCast(&ansi_colors_backing);

     

       41
       -
       

     

       42
       -
       var bold_ansi_colors_backing = [8]u32{

     

       43
       -
           0x545454, // Black

     

       44
       -
           0xf40d17, // Red

     

       45
       -
           0x3bcf1d, // Green

     

       46
       -
           0xecc809, // Yellow

     

       47
       -
           0x5555ff, // Blue

     

       48
       -
           0xff55ff, // Magenta

     

       49
       -
           0x6ae3f9, // Cyan

     

       50
       -
           0xffffff, // White

     

       51
       -
       };

     

       52
       -
       pub const bold_ansi_colors: [*]u32 = @ptrCast(&ansi_colors_backing);

     

       53
       -
       

     

       54
       -
       pub const esc_end = "\x1b[0m";

+5 -5

components/ukernel/common/aux/root.zig

···

       18
        
       

     

       19
        
       pub const InitState = struct {

     

       20
        
           bootmem: mm.bootmem.BootPmm = .{},

     

       21
       -
           console: ?*flanterm.ctx = null,

     

       22
        
           framebuffer: ?common.aux.Framebuffer = null,

     

       23
        
           hardware_description: HardwareDescription = .none,

     

       24
        
           root_task: []align(4096) u8 = undefined,

     
···

       67
        
           if (common.init_data.console == null) return;

     

       68
        
       

     

       69
        
           // Use the same naming as the default logger

     

       70
       -
           const level, const color: flanterm.Color = switch (message_level) {

     

       71
        
               .debug => .{ "D", .green },

     

       72
        
               .err => .{ "E", .red },

     

       73
        
               .info => .{ "I", .cyan },

     
···

       81
        
           const prefix = std.fmt.comptimePrint("{s}{s}: ", .{ level, scope_text });

     

       82
        
       

     

       83
        
           {

     

       84
       -
               const esc_seq = std.fmt.comptimePrint("\x1b[{}m", .{@intFromEnum(color)});

     

       85
        
               stdout_lock.lock();

     

       86
        
               defer stdout_lock.unlock();

     

       87
        
       

     

       88
        
               var backing_buf = std.mem.zeroes([512]u8);

     

       89
       -
               const buf = std.fmt.bufPrint(backing_buf[0..], esc_seq ++ prefix ++ format ++ flanterm.esc_end ++ "\n", args) catch return;

     

       90
        
       

     

       91
       -
               flanterm.c.flanterm_write(common.init_data.console, buf.ptr, buf.len);

     

       92
        
               // cons.setColor(color, 0);

     

       93
        
               // cons.writer().print(prefix ++ format ++ "\n", args) catch return;

     

       94
        
           }

···

       18
        
       

     

       19
        
       pub const InitState = struct {

     

       20
        
           bootmem: mm.bootmem.BootPmm = .{},

     

       21
       +
           console: ?flanterm.Context = null,

     

       22
        
           framebuffer: ?common.aux.Framebuffer = null,

     

       23
        
           hardware_description: HardwareDescription = .none,

     

       24
        
           root_task: []align(4096) u8 = undefined,

     
···

       67
        
           if (common.init_data.console == null) return;

     

       68
        
       

     

       69
        
           // Use the same naming as the default logger

     

       70
       +
           const level, const color: flanterm.Colors.Color = switch (message_level) {

     

       71
        
               .debug => .{ "D", .green },

     

       72
        
               .err => .{ "E", .red },

     

       73
        
               .info => .{ "I", .cyan },

     
···

       81
        
           const prefix = std.fmt.comptimePrint("{s}{s}: ", .{ level, scope_text });

     

       82
        
       

     

       83
        
           {

     

       84
       +
               const color_default: flanterm.Colors.Color = .default;

     

       85
        
               stdout_lock.lock();

     

       86
        
               defer stdout_lock.unlock();

     

       87
        
       

     

       88
        
               var backing_buf = std.mem.zeroes([512]u8);

     

       89
       +
               const buf = std.fmt.bufPrint(backing_buf[0..], color.esc_seq() ++ prefix ++ format ++ color_default.esc_seq() ++ "\n", args) catch return;

     

       90
        
       

     

       91
       +
               common.init_data.console.?.write_slice(buf);

     

       92
        
               // cons.setColor(color, 0);

     

       93
        
               // cons.writer().print(prefix ++ format ++ "\n", args) catch return;

     

       94
        
           }