refactor mega-commit.
- reorganised the entire project so that the entire kernel is a single codebase rather than a kernel and a libk.
This commit is contained in:
+7
-13
@@ -2,16 +2,11 @@
|
||||
#![no_main]
|
||||
|
||||
extern crate alloc;
|
||||
|
||||
use alloc::vec;
|
||||
use libk::{
|
||||
drivers::{
|
||||
async_io::task::{Executor, Task},
|
||||
io::{self, framebuffer::colour::Colour},
|
||||
},
|
||||
prelude::*,
|
||||
util::shell::shell,
|
||||
};
|
||||
use foundry_os::arch::x86_64::drivers::ascii::screensize_chars;
|
||||
use foundry_os::arch::x86_64::drivers::framebuffer::display::screensize_px;
|
||||
use foundry_os::arch::x86_64::processing::async_io::task::{Executor, Task};
|
||||
use foundry_os::util::shell::shell;
|
||||
use foundry_os::{println, println_log};
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
extern "C" fn kmain() -> ! {
|
||||
@@ -22,8 +17,8 @@ extern "C" fn kmain() -> ! {
|
||||
|
||||
println_log!("[ Kernel Initialised Successfully ] ");
|
||||
|
||||
let dimensions = io::ascii::screensize_chars();
|
||||
let dimensions2 = io::framebuffer::display::screensize_px();
|
||||
let dimensions = screensize_chars();
|
||||
let dimensions2 = screensize_px();
|
||||
|
||||
println!("Dimensions: {}x{} (px)", dimensions2.0, dimensions2.1);
|
||||
println!("Dimensions: {}x{} (chars)", dimensions.0, dimensions.1);
|
||||
@@ -34,7 +29,6 @@ extern "C" fn kmain() -> ! {
|
||||
// println!("{}", somevec.len());
|
||||
// println!("PASSED!");
|
||||
|
||||
|
||||
let mut executor = Executor::new();
|
||||
executor.spawn(Task::new(shell()));
|
||||
executor.run();
|
||||
|
||||
Reference in New Issue
Block a user