justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[fb] Change to embedding PSF file

Browse Source 
Moved old PSF parsing code from kernel, and switched to embedding whole
PSF instead of just glyph data to make font class the same code paths
for both cases.
This commit is contained in:
Justin C. Miller
2021-01-03 00:08:20 -08:00
parent 6af29a7181
commit dccb136c99
16 changed files with 553 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/main.cpp
View File

@@ -45,16 +45,15 @@ run_constructors()
extern void __kernel_assert(const char *, unsigned, const char *);
/// TODO: not this. this is awful.
uintptr_t fb_loc = 0;
size_t fb_size = 0;
/// Bootstrap the memory managers.
void memory_initialize_pre_ctors(kernel::args::header *kargs);
void memory_initialize_post_ctors(kernel::args::header *kargs);
using namespace kernel;
/// TODO: not this. this is awful.
args::framebuffer *fb = nullptr;
void
init_console()
{
@@ -137,8 +136,7 @@ kernel_main(args::header *header)
}
if (header->video.size > 0) {
fb_size = header->video.size;
fb_loc = header->video.phys_addr;
fb = memory::to_virtual<args::framebuffer>(reinterpret_cast<uintptr_t>(&header->video));
}
log::debug(logs::boot, " jsix header is at: %016lx", header);