Trees/ableos_time
1
0
Fork 0
forked from AbleOS/ableos
Code Pull requests Activity

maybe commit

Browse source
This commit is contained in:
Elfein Landers 2022-01-26 23:36:46 -08:00
parent ffdb6c2816
commit 0189236893
2 changed files with 203 additions and 203 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ableos/src/kmain.rs
View file

@ -124,14 +124,14 @@ pub fn kernel_main() -> ! {
let ret = WasmProgram::new_from_bytes(&[0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]); let ret = WasmProgram::new_from_bytes(&[0x00, 0x61, 0x73, 0x6d, 0x01, 0x00, 0x00, 0x00]);
trace!("Binary Valid: {:?}", ret.validate_header()); trace!("Binary Valid: {:?}", ret.validate_header());
if BOOT_CONF.run_tests {
// quick and dirty testing framework // quick and dirty testing framework
// if BOOT_CONF.run_tests {
screen_writer_test(); screen_writer_test();
socket_test(); socket_test();
graphics_pipe_test(); graphics_pipe_test();
socket_startup_rng(); socket_startup_rng();
socket_test_rng(); socket_test_rng();
} // }
if BOOT_CONF.run_demos { if BOOT_CONF.run_demos {
graphics_api_demo(); graphics_api_demo();

2
ableos/src/vga_e.rs
View file

@ -69,7 +69,7 @@ pub fn draw_char(mut x: u32, mut y: u32, character: char, color: Rgba64) {
); );
// elf: I don't know if GLYPH_HEIGHT is in the right units here. I'm just guessing. // elf: I don't know if GLYPH_HEIGHT is in the right units here. I'm just guessing.
if x as usize > SCREEN_BUFFER.lock().size.x { if x as usize > mode.size.x {
x = 0; x = 0;
y += (GLYPH_HEIGHT * FONT_SCALE) as u32; y += (GLYPH_HEIGHT * FONT_SCALE) as u32;
} }