From 9ed7dbb34c29b9b5e34c9a06af038345c9a1e3ae Mon Sep 17 00:00:00 2001
From: Erin <erin@erindesu.cz>
Date: Tue, 12 Apr 2022 00:23:11 +0200
Subject: [PATCH] chore: fmt
---
ableos/src/alias_table/mod.rs | 1 +
ableos/src/allocator/aalloc.rs | 5 +-
ableos/src/allocator/mod.rs | 16 +-
ableos/src/arch/aarch64/drivers/allocator.rs | 1 -
ableos/src/arch/aarch64/drivers/graphics.rs | 6 +
ableos/src/arch/aarch64/drivers/nrf52.rs | 57 +--
ableos/src/arch/aarch64/mod.rs | 9 +-
ableos/src/arch/riscv/drivers/allocator.rs | 1 -
ableos/src/arch/riscv/drivers/graphics.rs | 6 +
ableos/src/arch/riscv/drivers/mmio.rs | 1 -
ableos/src/arch/riscv/drivers/uart.rs | 5 +-
ableos/src/arch/riscv/mod.rs | 14 +-
ableos/src/arch/x86_64/drivers/allocator.rs | 4 +-
ableos/src/arch/x86_64/drivers/graphics.rs | 7 +
ableos/src/arch/x86_64/drivers/mod.rs | 3 +-
ableos/src/arch/x86_64/drivers/serial.rs | 2 +
ableos/src/arch/x86_64/drivers/vga.rs | 25 +-
ableos/src/arch/x86_64/gdt.rs | 11 +-
ableos/src/arch/x86_64/init.rs | 14 +-
ableos/src/arch/x86_64/interrupts.rs | 15 +-
ableos/src/arch/x86_64/memory.rs | 1 -
ableos/src/arch/x86_64/mod.rs | 22 +-
ableos/src/devices/character_devs/dev_null.rs | 2 -
.../src/devices/character_devs/dev_unicode.rs | 1 +
ableos/src/devices/character_devs/dev_zero.rs | 1 -
ableos/src/devices/character_devs/mod.rs | 1 -
ableos/src/devices/dev_vterm.rs | 36 +-
ableos/src/devices/id.rs | 3 +-
ableos/src/devices/mod.rs | 48 +-
ableos/src/devices/pci_inner.rs | 6 +-
ableos/src/driver_traits/graphics.rs | 22 +-
ableos/src/driver_traits/mouse.rs | 2 -
ableos/src/driver_traits/serial.rs | 2 +
ableos/src/experiments/absi.rs | 8 +-
ableos/src/experiments/clip.rs | 7 +-
ableos/src/experiments/futex.rs | 9 +-
ableos/src/experiments/info.rs | 114 +++--
ableos/src/experiments/kinfo.rs | 30 +-
ableos/src/experiments/mail.rs | 4 +
ableos/src/experiments/mod.rs | 2 +-
ableos/src/experiments/notification.rs | 1 -
ableos/src/experiments/pkg.rs | 3 +-
ableos/src/experiments/server.rs | 3 +
ableos/src/experiments/systeminfo.rs | 43 +-
ableos/src/experiments/virtual_memory.rs | 2 +-
.../experiments/y_compositor/compositor.rs | 1 -
ableos/src/experiments/y_compositor/window.rs | 5 +-
ableos/src/experiments/y_compositor/wm.rs | 1 -
ableos/src/filesystem/mod.rs | 18 +-
ableos/src/graphics/mod.rs | 53 +-
.../keyboard/abstractions/custom_layout.rs | 464 ++++++++++++++----
.../abstractions/custom_scancode_set.rs | 7 +
.../src/keyboard/abstractions/layout_entry.rs | 14 +-
ableos/src/keyboard/abstractions/mod.rs | 2 -
ableos/src/keyboard/mod.rs | 23 +-
ableos/src/keyboard/small_types.rs | 15 +
ableos/src/keyboard/traits.rs | 7 +-
ableos/src/kmain.rs | 16 +-
ableos/src/lib.rs | 93 ++--
ableos/src/logger.rs | 11 +-
ableos/src/port_io.rs | 1 +
ableos/src/prelude/rust_2021.rs | 9 +-
ableos/src/print.rs | 6 +-
ableos/src/relib/clparse/mod.rs | 8 +-
ableos/src/relib/encoding/rle.rs | 3 +-
ableos/src/relib/image/mod.rs | 2 -
ableos/src/relib/image/mono_bitmap.rs | 4 +-
.../relib/image/stupid_simple_image/mod.rs | 6 -
ableos/src/relib/network/socket.rs | 12 +-
ableos/src/relib/time/kilotime.rs | 39 +-
ableos/src/relib/time/mod.rs | 7 +-
ableos/src/rhai_shell/mod.rs | 87 ++--
ableos/src/scheduler/capabilities.rs | 1 +
ableos/src/scheduler/mod.rs | 17 +-
ableos/src/scheduler/proc.rs | 2 -
ableos/src/scratchpad.rs | 37 +-
ableos/src/serial_print.rs | 6 +-
ableos/src/stdio.rs | 1 +
ableos/src/tests.rs | 11 +-
ableos/src/time.rs | 5 +-
ableos/src/unicode_utils.rs | 2 +-
ableos/src/usb/mod.rs | 7 +-
ableos/src/utils.rs | 20 +-
ableos/src/vga_e.rs | 7 +-
ableos/src/wasm/mod.rs | 1 +
ableos/src/wasm_jumploader/host_functions.rs | 227 ++++-----
ableos/src/wasm_jumploader/mod.rs | 8 +-
facepalm/src/lib.rs | 2 -
kernel/src/device_interface/character/mod.rs | 5 +
kernel/src/lib.rs | 25 +-
kernel/src/panic.rs | 6 +-
kernel/src/proccess.rs | 3 +-
kernel/src/syscalls.rs | 16 +-
shadeable/shaders/simple.shade | 1 -
shadeable/src/engine_internals.rs | 13 +-
shadeable/src/lib.rs | 5 +-
shadeable/src/pixel_format.rs | 140 +-----
userland/lib_syscalls/C/file_calls.c | 11 +-
userland/rname/src/main.rs | 30 +-
userland/wasm_pk_data/src/lib.rs | 4 +-
100 files changed, 1132 insertions(+), 971 deletions(-)
delete mode 100644 ableos/src/relib/image/stupid_simple_image/mod.rs
diff --git a/ableos/src/alias_table/mod.rs b/ableos/src/alias_table/mod.rs
index 24be09100..f009aeef3 100644
--- a/ableos/src/alias_table/mod.rs
+++ b/ableos/src/alias_table/mod.rs
@@ -15,6 +15,7 @@ impl AliasTable {
table: HashMap::new(),
}
}
+
pub fn add_alias(&mut self, alias: String, path: String) {
self.table.insert(alias, path);
}
diff --git a/ableos/src/allocator/aalloc.rs b/ableos/src/allocator/aalloc.rs
index f67e60f42..7c1b88751 100644
--- a/ableos/src/allocator/aalloc.rs
+++ b/ableos/src/allocator/aalloc.rs
@@ -1,12 +1,9 @@
-/*!
-The allocator to be implemented by ableOS
-*/
+//! The allocator to be implemented by ableOS
use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut;
pub struct AAloc;
-
unsafe impl GlobalAlloc for AAloc {
unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
println!("Allocating memory");
diff --git a/ableos/src/allocator/mod.rs b/ableos/src/allocator/mod.rs
index d58069824..00e263ddc 100644
--- a/ableos/src/allocator/mod.rs
+++ b/ableos/src/allocator/mod.rs
@@ -1,22 +1,16 @@
mod aalloc;
-pub const HEAP_START: usize = 0x_4444_4444_0000;
-/// 131072 bytes
-// pub const HEAP_MULTIPLIER: usize = 1024;
-pub const HEAP_MULTIPLIER: usize = 100000;
-
-pub const HEAP_BASE: usize = 100;
-
-pub const HEAP_SIZE: usize = HEAP_BASE * HEAP_MULTIPLIER;
-
use linked_list_allocator::LockedHeap;
+pub const HEAP_START: usize = 0x_4444_4444_0000;
+pub const HEAP_MULTIPLIER: usize = 100000;
+pub const HEAP_BASE: usize = 100;
+pub const HEAP_SIZE: usize = HEAP_BASE * HEAP_MULTIPLIER;
+
#[global_allocator]
pub static ALLOCATOR: LockedHeap = LockedHeap::empty();
#[alloc_error_handler]
fn alloc_error_handler(layout: alloc::alloc::Layout) -> ! {
- // error!("allocation error: {:?}", layout);
-
panic!("allocation error: {:?}", layout)
}
diff --git a/ableos/src/arch/aarch64/drivers/allocator.rs b/ableos/src/arch/aarch64/drivers/allocator.rs
index 7b5f9d553..cf68c09a9 100644
--- a/ableos/src/arch/aarch64/drivers/allocator.rs
+++ b/ableos/src/arch/aarch64/drivers/allocator.rs
@@ -2,7 +2,6 @@ use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut;
pub struct Dummy;
-
unsafe impl GlobalAlloc for Dummy {
unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
null_mut()
diff --git a/ableos/src/arch/aarch64/drivers/graphics.rs b/ableos/src/arch/aarch64/drivers/graphics.rs
index 66ad297ef..fddd6e228 100644
--- a/ableos/src/arch/aarch64/drivers/graphics.rs
+++ b/ableos/src/arch/aarch64/drivers/graphics.rs
@@ -7,21 +7,27 @@ impl Graphics for GraphicsBuffer {
fn put_line(coords_start: Point, coords_end: Point, thickness: u32, color: Rgb) {
todo!()
}
+
fn put_rect(coords_start: Point, coords_end: Point, color: Rgb) {
todo!()
}
+
fn put_circle(coords: Point, radius: u32) {
todo!()
}
+
fn put_triangle(coords_1: Point, coords_2: Point, coords_3: Point, thickness: u32, color: Rgb) {
todo!();
}
+
fn put_pixel(coords: Point, color: Rgb) {
todo!()
}
+
fn paint_cursor(coords: Point) {
todo!()
}
+
fn hide_cursor() {}
fn show_cursor() {}
fn draw() {}
diff --git a/ableos/src/arch/aarch64/drivers/nrf52.rs b/ableos/src/arch/aarch64/drivers/nrf52.rs
index 1aa8348dd..9675faf25 100644
--- a/ableos/src/arch/aarch64/drivers/nrf52.rs
+++ b/ableos/src/arch/aarch64/drivers/nrf52.rs
@@ -1,36 +1,8 @@
+//! A not-very-useful abstraction of GPIOs in Rust
#![allow(dead_code)]
-// A not-very-useful abstraction of GPIOs in Rust
-
use core::sync::atomic::{AtomicBool, Ordering::SeqCst};
-/// A struct that represents an nRF52 Pin
-pub struct Pin(u8);
-
-/// A struct that represents P0 of the nRF52
-pub struct Pins {
- pub p0_31: Pin,
-}
-
-impl Pins {
- /// A function to obtain a Port 0 singleton structure
- pub fn take() -> Self {
- static TAKEN: AtomicBool = AtomicBool::new(false);
-
- // Enforce this as a singleton
- assert!(!TAKEN.swap(true, SeqCst));
-
- Self { p0_31: Pin(31) }
- }
-}
-
-/// The level of a GPIO
-#[derive(Copy, Clone)]
-pub enum Level {
- Low,
- High,
-}
-
const REG_P0_PIN_CNF_BASE: *mut u32 = 0x5000_0700 as *mut u32;
const REG_P0_OUT_SET: *mut u32 = 0x5000_0508 as *mut u32;
const REG_P0_OUT_CLR: *mut u32 = 0x5000_050C as *mut u32;
@@ -40,7 +12,8 @@ const PIN_CNF_INPUT_CONNECT: u32 = 0x0000_0000;
const PIN_CNF_PULL_DISABLED: u32 = 0x0000_0000;
const PIN_CNF_DRIVE_S0S1: u32 = 0x0000_0000;
const PIN_CNF_SENSE_DISABLED: u32 = 0x0000_0000;
-
+/// A struct that represents an nRF52 Pin
+pub struct Pin(u8);
impl Pin {
/// Set a pin to be a push pull output
pub fn set_push_pull_output(&mut self, level: Level) {
@@ -71,3 +44,27 @@ impl Pin {
unsafe { core::ptr::write_volatile(REG_P0_OUT_CLR, 1 << (self.0 as u32)) }
}
}
+
+/// The level of a GPIO
+#[derive(Copy, Clone)]
+pub enum Level {
+ Low,
+ High,
+}
+
+/// A struct that represents P0 of the nRF52
+pub struct Pins {
+ pub p0_31: Pin,
+}
+
+impl Pins {
+ /// A function to obtain a Port 0 singleton structure
+ pub fn take() -> Self {
+ static TAKEN: AtomicBool = AtomicBool::new(false);
+
+ // Enforce this as a singleton
+ assert!(!TAKEN.swap(true, SeqCst));
+
+ Self { p0_31: Pin(31) }
+ }
+}
diff --git a/ableos/src/arch/aarch64/mod.rs b/ableos/src/arch/aarch64/mod.rs
index 5b045bb82..04aeecbf6 100644
--- a/ableos/src/arch/aarch64/mod.rs
+++ b/ableos/src/arch/aarch64/mod.rs
@@ -1,11 +1,10 @@
-use core::ptr;
-
-// mod panic;
pub mod drivers;
pub mod init;
use crate::arch::drivers::nrf52::{Level, Pins};
+use core::ptr;
use core::ptr::write_volatile;
+
global_asm!(include_str!("boot.s"));
fn delay(ticks: usize) {
@@ -33,7 +32,6 @@ pub extern "C" fn not_main() {
}
}
- //
// let gpios = Pins::take();
// let mut led = gpios.p0_31;
//
@@ -46,14 +44,15 @@ pub extern "C" fn not_main() {
// }
//
// led.set_push_pull_output(Level::Low);
- crate::kmain::kernel_main();
+ crate::kmain::kernel_main();
sloop();
}
pub fn sloop() -> ! {
loop {}
}
+
pub fn print() {
for byte in b"ableOS Arm 64" {
const UART0: *mut u8 = 0x0900_0000 as *mut u8;
diff --git a/ableos/src/arch/riscv/drivers/allocator.rs b/ableos/src/arch/riscv/drivers/allocator.rs
index 7b5f9d553..cf68c09a9 100644
--- a/ableos/src/arch/riscv/drivers/allocator.rs
+++ b/ableos/src/arch/riscv/drivers/allocator.rs
@@ -2,7 +2,6 @@ use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut;
pub struct Dummy;
-
unsafe impl GlobalAlloc for Dummy {
unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
null_mut()
diff --git a/ableos/src/arch/riscv/drivers/graphics.rs b/ableos/src/arch/riscv/drivers/graphics.rs
index 66ad297ef..fddd6e228 100644
--- a/ableos/src/arch/riscv/drivers/graphics.rs
+++ b/ableos/src/arch/riscv/drivers/graphics.rs
@@ -7,21 +7,27 @@ impl Graphics for GraphicsBuffer {
fn put_line(coords_start: Point, coords_end: Point, thickness: u32, color: Rgb) {
todo!()
}
+
fn put_rect(coords_start: Point, coords_end: Point, color: Rgb) {
todo!()
}
+
fn put_circle(coords: Point, radius: u32) {
todo!()
}
+
fn put_triangle(coords_1: Point, coords_2: Point, coords_3: Point, thickness: u32, color: Rgb) {
todo!();
}
+
fn put_pixel(coords: Point, color: Rgb) {
todo!()
}
+
fn paint_cursor(coords: Point) {
todo!()
}
+
fn hide_cursor() {}
fn show_cursor() {}
fn draw() {}
diff --git a/ableos/src/arch/riscv/drivers/mmio.rs b/ableos/src/arch/riscv/drivers/mmio.rs
index c34a29773..a25e766f0 100644
--- a/ableos/src/arch/riscv/drivers/mmio.rs
+++ b/ableos/src/arch/riscv/drivers/mmio.rs
@@ -3,7 +3,6 @@
/// We label the mmio function unsafe since
/// we will be working with raw memory. Rust cannot
/// make any guarantees when we do this.
-///
#[inline(always)]
fn mmio_write(address: usize, offset: usize, value: u8) {
// Set the pointer based off of the address
diff --git a/ableos/src/arch/riscv/drivers/uart.rs b/ableos/src/arch/riscv/drivers/uart.rs
index 2ca6598d5..6751aa8dd 100644
--- a/ableos/src/arch/riscv/drivers/uart.rs
+++ b/ableos/src/arch/riscv/drivers/uart.rs
@@ -1,6 +1,4 @@
-use core::fmt::Write;
-
-use core::fmt::Error;
+use core::fmt::{Error, Write};
/// Initialize the UART driver by setting
/// the word length, FIFOs, and interrupts
@@ -113,6 +111,7 @@ impl Uart {
uart_init(self.base_address);
}
}
+
// This is a slightly different syntax. Write is this "trait", meaning it is much like
// an interface where we're just guaranteeing a certain function signature. In the Write
// trait, one is absolutely required to be implemented, which is write_str. There are other
diff --git a/ableos/src/arch/riscv/mod.rs b/ableos/src/arch/riscv/mod.rs
index 8745d9d6a..445b13bbe 100644
--- a/ableos/src/arch/riscv/mod.rs
+++ b/ableos/src/arch/riscv/mod.rs
@@ -1,5 +1,10 @@
pub mod drivers;
pub mod init;
+
+use crate::print;
+use crate::println;
+use core::arch::asm;
+
#[naked]
#[no_mangle]
unsafe extern "C" fn _boot() -> ! {
@@ -31,9 +36,10 @@ unsafe extern "C" fn _boot() -> ! {
}
extern "C" fn _start() -> ! {
+ use crate::serial_println;
+
let uart = crate::arch::drivers::uart::Uart::new(0x1000_0000);
uart.init();
- use crate::serial_println;
serial_println!("Hello, world!\r");
loop {
@@ -53,7 +59,6 @@ extern "C" fn _start() -> ! {
}
serial_println!("Serial connection closed.\r");
-
sloop()
}
@@ -64,13 +69,8 @@ pub fn sloop() -> ! {
};
}
}
-use core::arch::asm;
pub fn shutdown() {}
-
-use crate::print;
-use crate::println;
-
pub fn generate_process_pass() -> u128 {
123
}
diff --git a/ableos/src/arch/x86_64/drivers/allocator.rs b/ableos/src/arch/x86_64/drivers/allocator.rs
index 353e0e027..b1057be9e 100644
--- a/ableos/src/arch/x86_64/drivers/allocator.rs
+++ b/ableos/src/arch/x86_64/drivers/allocator.rs
@@ -1,6 +1,5 @@
-use alloc::alloc::{GlobalAlloc, Layout};
-
use crate::allocator::{HEAP_SIZE, HEAP_START};
+use alloc::alloc::{GlobalAlloc, Layout};
use core::ptr::null_mut;
use x86_64::{
structures::paging::{
@@ -9,7 +8,6 @@ use x86_64::{
VirtAddr,
};
pub struct Dummy;
-
unsafe impl GlobalAlloc for Dummy {
unsafe fn alloc(&self, _layout: Layout) -> *mut u8 {
null_mut()
diff --git a/ableos/src/arch/x86_64/drivers/graphics.rs b/ableos/src/arch/x86_64/drivers/graphics.rs
index b78999fdc..5933ed637 100644
--- a/ableos/src/arch/x86_64/drivers/graphics.rs
+++ b/ableos/src/arch/x86_64/drivers/graphics.rs
@@ -8,25 +8,32 @@ impl Graphics for GraphicsBuffer {
fn put_line(coords_start: Point, coords_end: Point, thickness: u32, color: Rgb) {
todo!()
}
+
fn put_rect(coords_start: Point, coords_end: Point, color: Rgb) {}
+
fn put_circle(coords: Point, radius: u32) {
todo!()
}
+
fn put_triangle(coords_1: Point, coords_2: Point, coords_3: Point, thickness: u32, color: Rgb) {
todo!();
}
+
fn put_pixel(coords: Point, color: Rgb) {
todo!()
}
+
fn paint_cursor(coords: Point) {
todo!()
}
+
fn hide_cursor() {
unsafe {
outw(0x0A, 0x3D4);
outw(0x20, 0x3D5);
}
}
+
fn show_cursor() {}
fn draw() {}
fn clear() {
diff --git a/ableos/src/arch/x86_64/drivers/mod.rs b/ableos/src/arch/x86_64/drivers/mod.rs
index 3872f6992..75821e2cd 100644
--- a/ableos/src/arch/x86_64/drivers/mod.rs
+++ b/ableos/src/arch/x86_64/drivers/mod.rs
@@ -1,8 +1,7 @@
pub mod allocator;
pub mod graphics;
pub mod serial;
-
pub mod timer;
-// #[deprecated(note = "The use of hardware specific drivers for VGA is discouraged")]
+#[deprecated(note = "The use of hardware specific drivers for VGA is discouraged")]
pub mod vga;
diff --git a/ableos/src/arch/x86_64/drivers/serial.rs b/ableos/src/arch/x86_64/drivers/serial.rs
index dc47c9cf9..fb5eb18f3 100644
--- a/ableos/src/arch/x86_64/drivers/serial.rs
+++ b/ableos/src/arch/x86_64/drivers/serial.rs
@@ -15,6 +15,7 @@ pub fn _print(args: ::core::fmt::Arguments) {
.write_fmt(args)
.expect("Printing to serial failed");
}
+
/// Prints to the host through the serial interface.
#[macro_export]
macro_rules! sprint {
@@ -22,6 +23,7 @@ macro_rules! sprint {
$crate::arch::drivers::serial::_print(format_args!($($arg)*));
};
}
+
/// Prints to the host through the serial interface, appending a newline.
#[macro_export]
macro_rules! sprintln {
diff --git a/ableos/src/arch/x86_64/drivers/vga.rs b/ableos/src/arch/x86_64/drivers/vga.rs
index a157353b1..3fcde9395 100644
--- a/ableos/src/arch/x86_64/drivers/vga.rs
+++ b/ableos/src/arch/x86_64/drivers/vga.rs
@@ -1,3 +1,10 @@
+use core::fmt;
+use spin::{Lazy, Mutex};
+use volatile::Volatile;
+
+const BUFFER_HEIGHT: usize = 25;
+const BUFFER_WIDTH: usize = 80;
+
#[allow(dead_code)]
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[repr(u8)]
@@ -19,6 +26,7 @@ pub enum Color {
Yellow = 14,
White = 15,
}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[repr(transparent)]
struct ColorCode(u8);
@@ -27,23 +35,25 @@ impl ColorCode {
ColorCode((background as u8) << 4 | (foreground as u8))
}
}
+
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
#[repr(C)]
struct ScreenChar {
ascii_character: u8,
color_code: ColorCode,
}
-const BUFFER_HEIGHT: usize = 25;
-const BUFFER_WIDTH: usize = 80;
+
#[repr(transparent)]
struct Buffer {
chars: [[Volatile<ScreenChar>; BUFFER_WIDTH]; BUFFER_HEIGHT],
}
+
pub struct Writer {
column_position: usize,
color_code: ColorCode,
buffer: &'static mut Buffer,
}
+
impl Writer {
pub fn write_byte(&mut self, byte: u8) {
match byte {
@@ -63,6 +73,7 @@ impl Writer {
}
}
}
+
pub fn write_string(&mut self, s: &str) {
for byte in s.bytes() {
match byte {
@@ -73,6 +84,7 @@ impl Writer {
}
}
}
+
fn new_line(&mut self) {
for row in 1..BUFFER_HEIGHT {
for col in 0..BUFFER_WIDTH {
@@ -83,6 +95,7 @@ impl Writer {
self.clear_row(BUFFER_HEIGHT - 1);
self.column_position = 0;
}
+
fn clear_row(&mut self, row: usize) {
let blank = ScreenChar {
ascii_character: b' ',
@@ -108,6 +121,7 @@ impl Writer {
}
}
}
+
impl fmt::Write for Writer {
fn write_str(&mut self, s: &str) -> fmt::Result {
self.write_string(s);
@@ -123,20 +137,17 @@ pub static WRITER: Lazy<Mutex<Writer>> = Lazy::new(|| {
})
});
-use core::fmt;
-use spin::{Lazy, Mutex};
-
-use volatile::Volatile;
-
#[macro_export]
macro_rules! kprint {
($($arg:tt)*) => ($crate::arch::drivers::vga::_kprint(format_args!($($arg)*)));
}
+
#[macro_export]
macro_rules! kprintln {
() => ($crate::kprint!("\n"));
($($arg:tt)*) => ($crate::kprint!("{}\n", format_args!($($arg)*)));
}
+
#[doc(hidden)]
pub fn _kprint(args: fmt::Arguments) {
use core::fmt::Write;
diff --git a/ableos/src/arch/x86_64/gdt.rs b/ableos/src/arch/x86_64/gdt.rs
index 96b7c42f9..575811741 100644
--- a/ableos/src/arch/x86_64/gdt.rs
+++ b/ableos/src/arch/x86_64/gdt.rs
@@ -2,8 +2,14 @@ use spin::Lazy;
use x86_64::structures::gdt::{Descriptor, GlobalDescriptorTable, SegmentSelector};
use x86_64::structures::tss::TaskStateSegment;
use x86_64::VirtAddr;
+
pub const DOUBLE_FAULT_IST_INDEX: u16 = 0;
+struct Selectors {
+ code_selector: SegmentSelector,
+ tss_selector: SegmentSelector,
+}
+
static TSS: Lazy<TaskStateSegment> = Lazy::new(|| {
let mut tss = TaskStateSegment::new();
tss.interrupt_stack_table[DOUBLE_FAULT_IST_INDEX as usize] = {
@@ -29,11 +35,6 @@ static GDT: Lazy<(GlobalDescriptorTable, Selectors)> = Lazy::new(|| {
)
});
-struct Selectors {
- code_selector: SegmentSelector,
- tss_selector: SegmentSelector,
-}
-
pub fn init() {
use x86_64::instructions::segmentation::{Segment, CS};
use x86_64::instructions::tables::load_tss;
diff --git a/ableos/src/arch/x86_64/init.rs b/ableos/src/arch/x86_64/init.rs
index cd228fa71..4da5aebcb 100644
--- a/ableos/src/arch/x86_64/init.rs
+++ b/ableos/src/arch/x86_64/init.rs
@@ -1,16 +1,17 @@
// #![allow(clippy::print_literal)]
+use super::{gdt, interrupts};
use crate::{
logger,
scheduler::{capabilities::Capabilities, SCHEDULER},
serial_println,
};
-use super::{gdt, interrupts};
-
/// x86_64 initialization
pub fn init() {
- use crate::network::socket::SimpleSock;
- use crate::relib::network::socket::Socket;
+ use crate::{
+ network::socket::SimpleSock, relib::network::socket::Socket,
+ scheduler::priority::Priority::High, stdio::StdIO,
+ };
let mut log_socket_id = SimpleSock::new();
log_socket_id.register_protocol("Logger".to_string());
@@ -22,10 +23,9 @@ pub fn init() {
}
Err(err) => error!("{}", err),
}
+
gdt::init();
- use crate::scheduler::priority::Priority::High;
- use crate::stdio::StdIO;
let mut scheduler = SCHEDULER.lock();
let process_0 = scheduler.new_process(
Capabilities::empty(),
@@ -34,11 +34,9 @@ pub fn init() {
StdIO::new("null".to_string()),
);
scheduler.add_process(process_0);
-
drop(scheduler);
interrupts::init_idt();
-
unsafe { interrupts::PICS.lock().initialize() };
x86_64::instructions::interrupts::enable();
}
diff --git a/ableos/src/arch/x86_64/interrupts.rs b/ableos/src/arch/x86_64/interrupts.rs
index 28c482267..fd31b7f29 100644
--- a/ableos/src/arch/x86_64/interrupts.rs
+++ b/ableos/src/arch/x86_64/interrupts.rs
@@ -4,13 +4,14 @@ use crate::{
print, println,
rhai_shell::KEYBUFF,
};
-
use cpuio::outb;
use pic8259::ChainedPics;
use spin::Lazy;
use x86_64::structures::idt::{InterruptDescriptorTable, InterruptStackFrame};
+
pub const PIC_1_OFFSET: u8 = 32;
pub const PIC_2_OFFSET: u8 = PIC_1_OFFSET + 8;
+
pub static PICS: spin::Mutex<ChainedPics> =
spin::Mutex::new(unsafe { ChainedPics::new(PIC_1_OFFSET, PIC_2_OFFSET) });
@@ -23,6 +24,7 @@ pub enum InterruptIndex {
// SecondInterrupt = PIC_2_OFFSET,
Cmos = 0x70,
}
+
impl InterruptIndex {
fn as_u8(self) -> u8 {
self as u8
@@ -31,9 +33,6 @@ impl InterruptIndex {
usize::from(self.as_u8())
}
}
-pub fn init_idt() {
- IDT.load();
-}
static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
let mut idt = InterruptDescriptorTable::new();
@@ -58,7 +57,7 @@ static IDT: Lazy<InterruptDescriptorTable> = Lazy::new(|| {
extern "x86-interrupt" fn breakpoint_handler(stack_frame: InterruptStackFrame) {
println!("EXCEPTION: BREAKPOINT\n{:#?}", stack_frame);
}
-// new
+
extern "x86-interrupt" fn double_fault_handler(
stack_frame: InterruptStackFrame,
error_code: u64,
@@ -68,6 +67,7 @@ extern "x86-interrupt" fn double_fault_handler(
error_code, stack_frame
);
}
+
extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFrame) {
kernel::tick();
unsafe {
@@ -75,6 +75,7 @@ extern "x86-interrupt" fn timer_interrupt_handler(_stack_frame: InterruptStackFr
.notify_end_of_interrupt(InterruptIndex::Timer.as_u8());
}
}
+
extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStackFrame) {
use crate::keyboard::{
CustomLayout, CustomScancodeSet, DecodedKey, DecodedKeyKind, HandleControl, KeyCode,
@@ -146,6 +147,10 @@ extern "x86-interrupt" fn floppy_disk_interrupt_handler(_stack_frame: InterruptS
println!("EXCEPTION: FLOPPY DISK");
}
+pub fn init_idt() {
+ IDT.load();
+}
+
fn set_pit_frequency(freq: u32) {
let divisor: u16 = (1193180 / freq).try_into().unwrap();
diff --git a/ableos/src/arch/x86_64/memory.rs b/ableos/src/arch/x86_64/memory.rs
index 10725d02f..338daae00 100644
--- a/ableos/src/arch/x86_64/memory.rs
+++ b/ableos/src/arch/x86_64/memory.rs
@@ -74,7 +74,6 @@ pub fn create_example_mapping(
}
pub struct EmptyFrameAllocator;
-
unsafe impl FrameAllocator<Size4KiB> for EmptyFrameAllocator {
fn allocate_frame(&mut self) -> Option<PhysFrame<Size4KiB>> {
None
diff --git a/ableos/src/arch/x86_64/mod.rs b/ableos/src/arch/x86_64/mod.rs
index 94dfd80f8..35e70c769 100644
--- a/ableos/src/arch/x86_64/mod.rs
+++ b/ableos/src/arch/x86_64/mod.rs
@@ -1,16 +1,13 @@
-use crate::arch::drivers::allocator;
-use bootloader::{entry_point, BootInfo};
-use x86_64::{
- instructions::hlt,
- {structures::paging::Page, VirtAddr},
-};
-
pub mod drivers;
pub mod gdt;
pub mod init;
pub mod interrupts;
pub mod memory;
+use crate::arch::drivers::allocator;
+use bootloader::{entry_point, BootInfo};
+use x86_64::{instructions::hlt, VirtAddr};
+
entry_point![start];
#[no_mangle]
pub fn start(boot_info: &'static BootInfo) -> ! {
@@ -19,13 +16,12 @@ pub fn start(boot_info: &'static BootInfo) -> ! {
let mut mapper = unsafe { memory::init(phys_mem_offset) };
let mut frame_allocator =
unsafe { memory::BootInfoFrameAllocator::init(&boot_info.memory_map) };
- if false {
- let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000));
- memory::create_example_mapping(page, &mut mapper, &mut frame_allocator);
- let page_ptr: *mut u64 = page.start_address().as_mut_ptr();
- unsafe { page_ptr.offset(400).write_volatile(0xf021_f077_f065_804e) };
- }
+ // let page = Page::containing_address(VirtAddr::new(0xdeadbeaf000));
+ // memory::create_example_mapping(page, &mut mapper, &mut frame_allocator);
+ //
+ // let page_ptr: *mut u64 = page.start_address().as_mut_ptr();
+ // unsafe { page_ptr.offset(400).write_volatile(0xf021_f077_f065_804e) };
allocator::init_heap(&mut mapper, &mut frame_allocator).expect("heap initialization failed");
diff --git a/ableos/src/devices/character_devs/dev_null.rs b/ableos/src/devices/character_devs/dev_null.rs
index cb9dff76a..eef0d3bb9 100644
--- a/ableos/src/devices/character_devs/dev_null.rs
+++ b/ableos/src/devices/character_devs/dev_null.rs
@@ -1,9 +1,7 @@
use kernel::device_interface::character::CharacterDevice;
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-
pub struct DevNull;
-
impl CharacterDevice for DevNull {
fn can_read(&self) -> bool {
true
diff --git a/ableos/src/devices/character_devs/dev_unicode.rs b/ableos/src/devices/character_devs/dev_unicode.rs
index 0ba031909..839c1b793 100644
--- a/ableos/src/devices/character_devs/dev_unicode.rs
+++ b/ableos/src/devices/character_devs/dev_unicode.rs
@@ -44,5 +44,6 @@ fn add1_char(c: char) -> char {
if c == char::MAX {
return 0x00 as char;
}
+
char::from_u32(c as u32 + 1).unwrap()
}
diff --git a/ableos/src/devices/character_devs/dev_zero.rs b/ableos/src/devices/character_devs/dev_zero.rs
index f5cc3b6ca..ad26d1d8d 100644
--- a/ableos/src/devices/character_devs/dev_zero.rs
+++ b/ableos/src/devices/character_devs/dev_zero.rs
@@ -2,7 +2,6 @@ use kernel::device_interface::character::CharacterDevice;
#[derive(Debug)]
pub struct DevZero;
-
impl CharacterDevice for DevZero {
fn can_read(&self) -> bool {
true
diff --git a/ableos/src/devices/character_devs/mod.rs b/ableos/src/devices/character_devs/mod.rs
index 50c916913..9a2f29485 100644
--- a/ableos/src/devices/character_devs/mod.rs
+++ b/ableos/src/devices/character_devs/mod.rs
@@ -1,6 +1,5 @@
pub mod dev_null;
pub mod dev_unicode;
-
pub mod dev_zero;
pub use kernel::device_interface::character::CharacterDevice;
diff --git a/ableos/src/devices/dev_vterm.rs b/ableos/src/devices/dev_vterm.rs
index 123738f47..2825c84e2 100644
--- a/ableos/src/devices/dev_vterm.rs
+++ b/ableos/src/devices/dev_vterm.rs
@@ -1,13 +1,19 @@
// ! A virtual terminal device.
-use kernel::device_interface::character::CharacterDevice;
-
use core::ops::Not;
+use core::sync::atomic::AtomicU32;
+use core::sync::atomic::Ordering;
+use kernel::device_interface::character::CharacterDevice;
use shadeable::pixel_format::Rgba64;
+
pub const VTERM_HEIGHT: u32 = 40;
pub const VTERM_WIDTH: u32 = 100;
+
+pub static VIRTUAL_TERMINAL_COUNT: AtomicU32 = AtomicU32::new(0);
+
/// Fg and bg colors for vterm
pub type ColorCharacter = (Rgba64, Rgba64);
+
/// A vterm representation of a character
#[derive(Debug, Clone, Copy)]
pub struct VtermCharacter {
@@ -25,21 +31,27 @@ impl Style {
pub fn bold(&self) -> bool {
(self.0 & 0x01) > 0
}
+
pub fn underlined(&self) -> bool {
(self.0 & 0x02) > 0
}
+
pub fn italic(&self) -> bool {
(self.0 & 0x04) > 0
}
+
pub fn blinking(&self) -> bool {
(self.0 & 0x08) > 0
}
+
pub fn reversed(&self) -> bool {
(self.0 & 0x10) > 0
}
+
pub fn struck(&self) -> bool {
(self.0 & 0x20) > 0
}
+
#[must_use]
pub fn set_bold(mut self, v: bool) -> Self {
if v {
@@ -49,6 +61,7 @@ impl Style {
}
self
}
+
#[must_use]
pub fn set_underlined(mut self, v: bool) -> Self {
if v {
@@ -58,6 +71,7 @@ impl Style {
}
self
}
+
#[must_use]
pub fn set_italic(mut self, v: bool) -> Self {
if v {
@@ -67,6 +81,7 @@ impl Style {
}
self
}
+
#[must_use]
pub fn set_blinking(mut self, v: bool) -> Self {
if v {
@@ -76,6 +91,7 @@ impl Style {
}
self
}
+
#[must_use]
pub fn set_reversed(mut self, v: bool) -> Self {
if v {
@@ -85,6 +101,7 @@ impl Style {
}
self
}
+
#[must_use]
pub fn set_struck(mut self, v: bool) -> Self {
if v {
@@ -95,18 +112,23 @@ impl Style {
self
}
}
+
#[derive(Debug)]
pub struct VTerm {
+ pub characters: [[VtermCharacter; VTERM_WIDTH as usize]; VTERM_HEIGHT as usize],
+ pub cursor_visible: bool,
+
/// Internal ID of the vterm
iid: u32,
- pub characters: [[VtermCharacter; VTERM_WIDTH as usize]; VTERM_HEIGHT as usize],
+
/// The internal representation of the vterm
style: Style,
+
/// The cursor position in layout x,y
cursor_position: (u32, u32),
- pub cursor_visible: bool,
key_buff: Vec<char>,
}
+
impl Default for VTerm {
fn default() -> Self {
VTerm {
@@ -150,6 +172,7 @@ impl VTerm {
self.cursor_position.1 = y;
}
}
+
/// Set the vterm style
pub fn set_vterm_style(&mut self, style: Style) {
self.style = style;
@@ -229,6 +252,7 @@ impl CharacterDevice for VTerm {
char_color: (0xff_ff_ff_ff, 0x00_00_00_00),
style: Style::default(),
}; VTERM_WIDTH as usize]; VTERM_HEIGHT as usize];
+
self.cursor_position = (0, 0);
self.cursor_visible = true;
self.style = Style::default();
@@ -238,7 +262,3 @@ impl CharacterDevice for VTerm {
true
}
}
-
-pub static VIRTUAL_TERMINAL_COUNT: AtomicU32 = AtomicU32::new(0);
-use core::sync::atomic::AtomicU32;
-use core::sync::atomic::Ordering;
diff --git a/ableos/src/devices/id.rs b/ableos/src/devices/id.rs
index f2f286ddb..cfff8a28c 100644
--- a/ableos/src/devices/id.rs
+++ b/ableos/src/devices/id.rs
@@ -1,15 +1,14 @@
#[derive(Debug)]
pub enum Vendor {
Unknown = 0,
-
Ati = 1002,
}
pub fn match_vendor(id: u16) -> Vendor {
use Vendor::*;
+
match id {
1002 => Ati,
-
_ => Unknown,
}
}
diff --git a/ableos/src/devices/mod.rs b/ableos/src/devices/mod.rs
index 42705408b..d97c8df36 100644
--- a/ableos/src/devices/mod.rs
+++ b/ableos/src/devices/mod.rs
@@ -2,39 +2,52 @@ pub mod character_devs;
pub mod id;
pub mod pci_inner;
-use hashbrown::HashMap;
-use spin::Lazy;
mod dev_vterm;
+
+pub use self::Device::*;
+
use crate::devices::dev_vterm::VTerm;
+use character_devs::{dev_null::DevNull, dev_unicode::DevUnicode, dev_zero::DevZero};
+use hashbrown::HashMap;
use kernel::device_interface::character::CharacterDevice;
+use spin::Lazy;
+
+pub static DEVICE_TABLE: Lazy<spin::Mutex<DeviceTable>> =
+ Lazy::new(|| spin::Mutex::new(DeviceTable::new()));
+
// FIXME: This is a hack to hold a device.
// #[derive(Debug)]
pub enum Device {
Character(Box<dyn CharacterDevice>),
Vterm(Box<VTerm>),
}
+
unsafe impl Sync for Device {}
unsafe impl Send for Device {}
pub struct DeviceTable {
pub devices: HashMap<String, Device>,
}
-use self::character_devs::{dev_null::DevNull, dev_unicode::DevUnicode, dev_zero::DevZero};
-pub use self::Device::*;
+
impl DeviceTable {
pub fn new() -> Self {
- let mut table: HashMap<String, Device> = HashMap::new();
- table.insert("null".to_string(), Character(Box::new(DevNull)));
- table.insert("zero".to_string(), Character(Box::new(DevZero)));
- table.insert(
- "unicode".to_string(),
- Character(Box::new(DevUnicode {
- next_write_char: 0x00 as char,
- next_read_char: 0x00 as char,
- })),
- );
- table.insert("kvterm".to_string(), Vterm(Box::new(VTerm::new())));
- DeviceTable { devices: table }
+ DeviceTable {
+ devices: [
+ ("null", Character(Box::new(DevNull))),
+ ("zero", Character(Box::new(DevZero))),
+ (
+ "unicode",
+ Character(Box::new(DevUnicode {
+ next_write_char: 0x00 as char,
+ next_read_char: 0x00 as char,
+ })),
+ ),
+ ("kvterm", Vterm(Box::new(VTerm::new()))),
+ ]
+ .into_iter()
+ .map(|(k, v)| (k.to_string(), v))
+ .collect(),
+ }
}
}
@@ -43,6 +56,3 @@ impl Default for DeviceTable {
Self::new()
}
}
-
-pub static DEVICE_TABLE: Lazy<spin::Mutex<DeviceTable>> =
- Lazy::new(|| spin::Mutex::new(DeviceTable::new()));
diff --git a/ableos/src/devices/pci_inner.rs b/ableos/src/devices/pci_inner.rs
index a85c83252..3884885ab 100644
--- a/ableos/src/devices/pci_inner.rs
+++ b/ableos/src/devices/pci_inner.rs
@@ -2,9 +2,6 @@
//!
//!
-#[allow(dead_code)]
-fn scan_pci_bus() {}
-
pub enum Vendors {
ThreeDfxInteractiveInc = 0x121a,
ThreeDLabs = 0x3d3d,
@@ -53,3 +50,6 @@ pub enum Vendors {
pub struct PciDevice {
pub vendor: Vendors,
}
+
+#[allow(dead_code)]
+fn scan_pci_bus() {}
diff --git a/ableos/src/driver_traits/graphics.rs b/ableos/src/driver_traits/graphics.rs
index 88fde1a96..8d171e23d 100644
--- a/ableos/src/driver_traits/graphics.rs
+++ b/ableos/src/driver_traits/graphics.rs
@@ -1,16 +1,21 @@
#![allow(unused)]
+
+pub const REFRESH_RATE: u8 = 60;
+
+pub type RefreshRate = u8;
+pub type Resolution = (usize, usize);
+pub type Point = (GCoord, GCoord);
+pub type GCoord = usize;
+
pub enum GModes {
Vga800x600,
Custom(u16, u16),
}
-pub type GCoord = usize;
// TODO remap to a bitmasked u32
-/* REASON: More effecient memory wise so less overhead on the wasm memory
-Current: u32+u32+u32
-Proposed: u32 with bitmaps
-*/
-
+// REASON: More effecient memory wise so less overhead on the wasm memory
+// Current: u32+u32+u32
+// Proposed: u32 with bitmaps
pub struct Rgb {
pub r: u32,
pub g: u32,
@@ -22,13 +27,8 @@ impl Rgb {
todo!();
}
}
-pub type RefreshRate = u8;
-pub const REFRESH_RATE: u8 = 60;
-pub type Resolution = (usize, usize);
-pub type Point = (GCoord, GCoord);
pub struct FrameBuffer;
-// [[Rgb; 5]; 5]
pub trait Graphics {
fn put_line(coords_start: Point, coords_end: Point, thickness: u32, color: Rgb);
fn put_rect(coords_start: Point, coords_end: Point, color: Rgb);
diff --git a/ableos/src/driver_traits/mouse.rs b/ableos/src/driver_traits/mouse.rs
index ec624dcb3..89e0f07bb 100644
--- a/ableos/src/driver_traits/mouse.rs
+++ b/ableos/src/driver_traits/mouse.rs
@@ -1,5 +1,3 @@
-
-
// TODO: Bitmasking
pub enum Mouse {
Button1,
diff --git a/ableos/src/driver_traits/serial.rs b/ableos/src/driver_traits/serial.rs
index 56f87ac88..8e7aa15fd 100644
--- a/ableos/src/driver_traits/serial.rs
+++ b/ableos/src/driver_traits/serial.rs
@@ -3,6 +3,7 @@ use kernel::device_interface::character::CharacterDevice;
pub struct Serial {
pub base: usize,
}
+
impl CharacterDevice for Serial {
fn can_read(&self) -> bool {
true
@@ -28,6 +29,7 @@ impl CharacterDevice for Serial {
false
}
}
+
pub fn new_serial_test() {
let mut serial = Serial { base: 0x3F8 };
serial.initialize();
diff --git a/ableos/src/experiments/absi.rs b/ableos/src/experiments/absi.rs
index 36cbfa1df..6c63f81c2 100644
--- a/ableos/src/experiments/absi.rs
+++ b/ableos/src/experiments/absi.rs
@@ -1,5 +1,6 @@
-// TODO improve tokenizer/parser
+use logos::{Lexer, Logos};
+// TODO improve tokenizer/parser
pub fn colorify(eval: &str) {
let y = eval.split('$');
for z in y {
@@ -62,8 +63,6 @@ pub fn colorify(eval: &str) {
}
}
-use logos::Logos;
-
#[derive(Logos, Debug, PartialEq)]
pub enum Token {
// Hex(u32),
@@ -80,6 +79,7 @@ pub enum Token {
#[regex(r"[ \t\n\f]+", logos::skip)]
Error,
}
+
pub fn colorify_2(eval: &str) {
let lexer = Token::lexer(eval);
for token in lexer {
@@ -100,9 +100,7 @@ pub fn colorify_2(eval: &str) {
}
}
}
-use logos::Lexer;
-// use crate::kprint;
fn parse_text(lex: &mut Lexer<Token>) -> Option<String> {
let slice = lex.slice();
Some(String::from(slice))
diff --git a/ableos/src/experiments/clip.rs b/ableos/src/experiments/clip.rs
index 6a72587b3..9dd3eb717 100644
--- a/ableos/src/experiments/clip.rs
+++ b/ableos/src/experiments/clip.rs
@@ -1,6 +1,6 @@
use alloc::{string::String, vec, vec::Vec};
-// use crate::String;
-// use crate::Vec;
+
+pub static CLIPBOARD: spin::Mutex<Clipboard> = spin::Mutex::new(Clipboard::new());
#[derive(Debug)]
pub enum Mime {
@@ -8,8 +8,6 @@ pub enum Mime {
Text(String),
}
-pub static CLIPBOARD: spin::Mutex<Clipboard> = spin::Mutex::new(Clipboard::new());
-
// ctrl+v paste but not pop and pastes
// ctrl+shift+v pops from the stack and pastes
// ctrl+c pushes to the stack
@@ -20,6 +18,7 @@ pub struct Clipboard {
pub index: usize,
pub pages: Vec<Mime>,
}
+
impl Clipboard {
pub const fn new() -> Clipboard {
Clipboard {
diff --git a/ableos/src/experiments/futex.rs b/ableos/src/experiments/futex.rs
index 6453a5f50..3252d6f6f 100644
--- a/ableos/src/experiments/futex.rs
+++ b/ableos/src/experiments/futex.rs
@@ -1,9 +1,6 @@
use core::time::Duration;
-// pub struct Duration {}
-
pub struct AtomicU32(u32);
-
impl AtomicU32 {
//if v != current value
pub fn wait(&self, _v: u32) {
@@ -21,9 +18,8 @@ impl AtomicU32 {
}
}
/*
-
-SUPER HANDWAVEY
-YOU WILL NEED LOCKING THAT I DIDNT WRITE OUT (you == zuurr#9735)
+// SUPER HANDWAVEY
+// YOU WILL NEED LOCKING THAT I DIDNT WRITE OUT (you == zuurr#9735)
// all the red is by design
pub fn futex_wait(atom: &AtomicU32, value: usize, current_thread: ThreadID) {
@@ -44,7 +40,6 @@ pub fn futex_wake(atom: &AtomicU32, threads_to_wake: usize) {
waiting_thread.wake()
}
}
-
*/
struct FutexWaitlist {
diff --git a/ableos/src/experiments/info.rs b/ableos/src/experiments/info.rs
index be9ede07f..b5b8ff24f 100644
--- a/ableos/src/experiments/info.rs
+++ b/ableos/src/experiments/info.rs
@@ -1,8 +1,3 @@
-#![cfg_attr(
- not(any(target_arch = "x86_64", target_arch = "x86")),
- allow(dead_code)
-)]
-
//! ```
//! extern crate cupid;
//!
@@ -17,10 +12,50 @@
//! }
//! ```
+#![cfg_attr(
+ not(any(target_arch = "x86_64", target_arch = "x86")),
+ allow(dead_code)
+)]
+
use core::arch::asm;
use core::ops::Deref;
use core::{fmt, slice, str};
+// 3 calls of 4 registers of 4 bytes
+const BRAND_STRING_LENGTH: usize = 3 * 4 * 4;
+
+macro_rules! bit {
+ ($reg:ident, {$($idx:expr => $name:ident),+ $(,)?}) => {
+ $(pub fn $name(self) -> bool {
+ ((self.$reg >> $idx) & 1) != 0
+ })+
+ }
+}
+
+macro_rules! dump {
+ ($me:expr, $f: expr, $sname:expr, {$($name:ident),+ $(,)?}) => {
+ $f.debug_struct($sname)
+ $(.field(stringify!($name), &$me.$name()))+
+ .finish()
+ }
+}
+
+macro_rules! delegate_flag {
+ ($item:ident, {$($name:ident),+ $(,)?}) => {
+ $(pub fn $name(&self) -> bool {
+ self.$item.map(|i| i.$name()).unwrap_or(false)
+ })+
+ }
+}
+
+macro_rules! master_attr_reader {
+ ($name:ident, $kind:ty) => {
+ pub fn $name(&self) -> Option<&$kind> {
+ self.$name.as_ref()
+ }
+ };
+}
+
#[repr(u32)]
pub enum RequestType {
BasicInformation = 0x00000000,
@@ -32,7 +67,7 @@ pub enum RequestType {
BrandString1 = 0x80000002,
BrandString2 = 0x80000003,
BrandString3 = 0x80000004,
- // reserved = 0x80000005,
+ // reserved = 0x80000005,
CacheLine = 0x80000006,
TimeStampCounter = 0x80000007,
PhysicalAddressSize = 0x80000008,
@@ -70,7 +105,6 @@ pub fn master() -> Option<Master> {
// The bit positions are inclusive.
fn bits_of(val: u32, start_bit: u8, end_bit: u8) -> u32 {
let mut silly = 0;
-
for _ in start_bit..end_bit + 1 {
silly <<= 1;
silly |= 1;
@@ -85,38 +119,6 @@ pub fn as_bytes(v: &u32) -> &[u8] {
unsafe { slice::from_raw_parts(start, 4) }
}
-macro_rules! bit {
- ($reg:ident, {$($idx:expr => $name:ident),+}) => {
- $(pub fn $name(self) -> bool {
- ((self.$reg >> $idx) & 1) != 0
- })+
- }
-}
-
-macro_rules! dump {
- ($me:expr, $f: expr, $sname:expr, {$($name:ident),+}) => {
- $f.debug_struct($sname)
- $(.field(stringify!($name), &$me.$name()))+
- .finish()
- }
-}
-
-macro_rules! delegate_flag {
- ($item:ident, {$($name:ident),+}) => {
- $(pub fn $name(&self) -> bool {
- self.$item.map(|i| i.$name()).unwrap_or(false)
- })+
- }
-}
-
-macro_rules! master_attr_reader {
- ($name:ident, $kind:ty) => {
- pub fn $name(&self) -> Option<&$kind> {
- self.$name.as_ref()
- }
- };
-}
-
#[derive(Copy, Clone)]
pub struct VersionInformation {
eax: u32,
@@ -246,8 +248,8 @@ impl VersionInformation {
27 => osxsave,
28 => avx,
29 => f16c,
- 30 => rdrand
- // 31 - unused
+ 30 => rdrand,
+ // 31 - unused,
});
bit!(edx, {
@@ -282,7 +284,7 @@ impl VersionInformation {
28 => htt,
29 => tm,
// 30 -reserved
- 31 => pbe
+ 31 => pbe,
});
}
@@ -357,7 +359,7 @@ impl fmt::Debug for VersionInformation {
ss,
htt,
tm,
- pbe
+ pbe,
})
}
}
@@ -379,7 +381,7 @@ impl ExtendedProcessorSignature {
// 1-4 reserved
5 => lzcnt,
// 6-7 reserved
- 8 => prefetchw
+ 8 => prefetchw,
// 9-31 reserved
});
@@ -392,7 +394,7 @@ impl ExtendedProcessorSignature {
26 => gigabyte_pages,
27 => rdtscp_and_ia32_tsc_aux,
// 28 reserved
- 29 => intel_64_bit_architecture
+ 29 => intel_64_bit_architecture,
// 30-31 reserved
});
}
@@ -407,14 +409,11 @@ impl fmt::Debug for ExtendedProcessorSignature {
execute_disable,
gigabyte_pages,
rdtscp_and_ia32_tsc_aux,
- intel_64_bit_architecture
+ intel_64_bit_architecture,
})
}
}
-// 3 calls of 4 registers of 4 bytes
-const BRAND_STRING_LENGTH: usize = 3 * 4 * 4;
-
pub struct BrandString {
bytes: [u8; BRAND_STRING_LENGTH],
}
@@ -507,7 +506,7 @@ impl ThermalPowerManagementInformation {
9 => hwp_activity_window,
10 => hwp_energy_performance_preference,
// 12 - reserved
- 13 => hdc
+ 13 => hdc,
});
pub fn number_of_interrupt_thresholds(self) -> u32 {
@@ -535,9 +534,7 @@ impl fmt::Debug for ThermalPowerManagementInformation {
hwp_activity_window,
hwp_energy_performance_preference,
hdc,
-
number_of_interrupt_thresholds,
-
hardware_coordination_feedback,
performance_energy_bias
})
@@ -578,7 +575,7 @@ impl StructuredExtendedInformation {
19 => adx,
20 => smap,
// 21-24 - reserved
- 25 => intel_processor_trace
+ 25 => intel_processor_trace,
// 26-31 - reserved
});
@@ -607,7 +604,7 @@ impl fmt::Debug for StructuredExtendedInformation {
adx,
smap,
intel_processor_trace,
- prefetchwt1
+ prefetchwt1,
})
}
}
@@ -625,7 +622,6 @@ pub enum CacheLineAssociativity {
#[derive(Copy, Clone)]
pub struct CacheLine(u32);
-
impl CacheLine {
fn new() -> CacheLine {
let (_, _, c, _) = cpuid(RequestType::CacheLine);
@@ -690,7 +686,6 @@ impl fmt::Debug for TimeStampCounter {
#[derive(Copy, Clone)]
pub struct PhysicalAddressSize(u32);
-
impl PhysicalAddressSize {
fn new() -> PhysicalAddressSize {
let (a, _, _, _) = cpuid(RequestType::PhysicalAddressSize);
@@ -874,7 +869,7 @@ impl Master {
ss,
htt,
tm,
- pbe
+ pbe,
});
delegate_flag!(thermal_power_management_information, {
@@ -890,7 +885,7 @@ impl Master {
hwp_energy_performance_preference,
hdc,
hardware_coordination_feedback,
- performance_energy_bias
+ performance_energy_bias,
});
delegate_flag!(structured_extended_information, {
@@ -922,7 +917,7 @@ impl Master {
execute_disable,
gigabyte_pages,
rdtscp_and_ia32_tsc_aux,
- intel_64_bit_architecture
+ intel_64_bit_architecture,
});
delegate_flag!(time_stamp_counter, { invariant_tsc });
@@ -933,6 +928,7 @@ impl Default for Master {
Self::new()
}
}
+
/*
cfg_if! {
if #[cfg(any(target_arch = "x86_64", target_arch = "x86"))] {
diff --git a/ableos/src/experiments/kinfo.rs b/ableos/src/experiments/kinfo.rs
index 039201db9..fd31a804e 100644
--- a/ableos/src/experiments/kinfo.rs
+++ b/ableos/src/experiments/kinfo.rs
@@ -1,15 +1,5 @@
-// Can be standardized
-// NOTE: Move this to relib
-pub struct SemanticVersion {
- pub major: u8,
- pub minor: u8,
- pub patch: u8,
-}
-impl core::fmt::Display for SemanticVersion {
- fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
- write!(f, "v{}.{}.{}", self.major, self.minor, self.patch)
- }
-}
+use super::systeminfo::SystemMemory;
+
// NOTE: Move to somewhere else
pub static KINFO: KernelInfo = KernelInfo {
kernel_version: SemanticVersion {
@@ -19,6 +9,21 @@ pub static KINFO: KernelInfo = KernelInfo {
},
memory: SystemMemory { used: 0, total: 0 },
};
+
+// Can be standardized
+// NOTE: Move this to relib
+pub struct SemanticVersion {
+ pub major: u8,
+ pub minor: u8,
+ pub patch: u8,
+}
+
+impl core::fmt::Display for SemanticVersion {
+ fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+ write!(f, "v{}.{}.{}", self.major, self.minor, self.patch)
+ }
+}
+
/// simple info you would want to know in a neofetch like program
pub struct KernelInfo {
// os: String,
@@ -28,4 +33,3 @@ pub struct KernelInfo {
// gpu: String,
pub memory: SystemMemory,
}
-use super::systeminfo::SystemMemory;
diff --git a/ableos/src/experiments/mail.rs b/ableos/src/experiments/mail.rs
index 061349895..06bdfda67 100644
--- a/ableos/src/experiments/mail.rs
+++ b/ableos/src/experiments/mail.rs
@@ -5,6 +5,7 @@ pub struct MailBoxes {
flags: u8,
mailboxes: [u64; 4],
}
+
impl MailBoxes {
pub fn new() -> Self {
Self {
@@ -12,15 +13,18 @@ impl MailBoxes {
mailboxes: [0; 4],
}
}
+
pub fn reset(&mut self) {
self.flags = 0b0000_0000;
self.mailboxes = [0; 4];
}
+
pub fn set_mailbox(&mut self, mailbox_num: u8, mailbox_data: u64) {
if let 0..=3 = mailbox_num {
self.mailboxes[mailbox_num as usize] = mailbox_data
}
}
+
pub fn set_flag(&mut self, flag_num: u8) {
match flag_num {
0 => {
diff --git a/ableos/src/experiments/mod.rs b/ableos/src/experiments/mod.rs
index f05b28cb8..f1c8bf546 100644
--- a/ableos/src/experiments/mod.rs
+++ b/ableos/src/experiments/mod.rs
@@ -3,7 +3,6 @@
pub mod absi;
pub mod clip;
pub mod futex;
-// pub mod info;
pub mod info;
pub mod kinfo;
pub mod mail;
@@ -11,4 +10,5 @@ pub mod server;
pub mod systeminfo;
pub mod virtual_memory;
pub mod y_compositor;
+
pub const BANNER: &str = include_str!("banner.txt");
diff --git a/ableos/src/experiments/notification.rs b/ableos/src/experiments/notification.rs
index 51a08de89..fc498250f 100644
--- a/ableos/src/experiments/notification.rs
+++ b/ableos/src/experiments/notification.rs
@@ -5,4 +5,3 @@ pub struct Notification {
text_body: String,
time: u64,
}
-impl Notification {}
diff --git a/ableos/src/experiments/pkg.rs b/ableos/src/experiments/pkg.rs
index ef3f54e9e..a0f95122b 100644
--- a/ableos/src/experiments/pkg.rs
+++ b/ableos/src/experiments/pkg.rs
@@ -1,8 +1,9 @@
-pub type PackageName = String;
use crate::experiments::kinfo::SemanticVersion;
// Scuffed
pub type Hash = u8;
+pub type PackageName = String;
+
pub struct MetaPackage {
pub name: u8,
pub version: SemanticVersion,
diff --git a/ableos/src/experiments/server.rs b/ableos/src/experiments/server.rs
index c8576064c..4e8f217bb 100644
--- a/ableos/src/experiments/server.rs
+++ b/ableos/src/experiments/server.rs
@@ -1,10 +1,13 @@
pub trait Server {
/// Initialize the server and return a number
fn initialize() -> u32;
+
/// kill the server
fn kill() -> bool;
+
// put data in the servers outbox
fn send();
+
// put data in the servers inbox and notify it
fn recieve();
}
diff --git a/ableos/src/experiments/systeminfo.rs b/ableos/src/experiments/systeminfo.rs
index cb7de27a4..1e815d426 100644
--- a/ableos/src/experiments/systeminfo.rs
+++ b/ableos/src/experiments/systeminfo.rs
@@ -1,36 +1,6 @@
// Can be standardized
// NOTE: move the file to the src/ dir
-pub struct SystemMemory {
- pub used: u64,
- pub total: u64,
-}
-impl core::fmt::Display for SystemMemory {
- fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
- write!(f, "{} Bytes / {} Bytes", self.used, self.total)
- }
-}
-/*
-pub fn format_system_info() -> core::string::String {
- let x = format!(
- "{}
-OS: AbleOS
-Host: ComputAble
-Kernel: {}
-Uptime: 0:0:0
-Packages: 0
-Shell: Ashell
-Gpu: MIPS32 R4000 R4k
-Cpu: {}
-Memory: {}
-",
- crate::experiments::BANNER,
- crate::experiments::kinfo::KINFO.kernel_version,
- crate::arch::ARCH,
- crate::experiments::kinfo::KINFO.memory
- );
- return x;
-}
-// */
+
pub const KERNEL_VERSION: &str = env!("CARGO_PKG_VERSION");
#[cfg(debug_assertions)]
/// A constant to check if the kernel is in debug mode
@@ -38,3 +8,14 @@ pub const RELEASE_TYPE: &str = "debug";
#[cfg(not(debug_assertions))]
/// A constant to check if the kernel is in release mode
pub const RELEASE_TYPE: &str = "release";
+
+pub struct SystemMemory {
+ pub used: u64,
+ pub total: u64,
+}
+
+impl core::fmt::Display for SystemMemory {
+ fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
+ write!(f, "{} Bytes / {} Bytes", self.used, self.total)
+ }
+}
diff --git a/ableos/src/experiments/virtual_memory.rs b/ableos/src/experiments/virtual_memory.rs
index dd791e4e2..7cbf37a7b 100644
--- a/ableos/src/experiments/virtual_memory.rs
+++ b/ableos/src/experiments/virtual_memory.rs
@@ -4,4 +4,4 @@ pub struct Scheduler {
executables: usize,
}
-pub struct RunQueue {}
+pub struct RunQueue;
diff --git a/ableos/src/experiments/y_compositor/compositor.rs b/ableos/src/experiments/y_compositor/compositor.rs
index 03fb0bea5..ee5e63bf7 100644
--- a/ableos/src/experiments/y_compositor/compositor.rs
+++ b/ableos/src/experiments/y_compositor/compositor.rs
@@ -1,5 +1,4 @@
pub struct Compositor;
-
impl Compositor {
pub fn new() -> Self {
Self
diff --git a/ableos/src/experiments/y_compositor/window.rs b/ableos/src/experiments/y_compositor/window.rs
index 6e4a44f78..82301e392 100644
--- a/ableos/src/experiments/y_compositor/window.rs
+++ b/ableos/src/experiments/y_compositor/window.rs
@@ -1,16 +1,17 @@
use crate::driver_traits::graphics::Point;
+pub type MenuBar = Vec<MenuOption>;
+
pub struct MenuOption {
symbol: char,
}
-pub type MenuBar = Vec<MenuOption>;
-
pub struct Window {
title: String,
position: Point,
fullscreen: bool,
}
+
// all of these should return a result
impl Window {
pub fn new(title: String, position: Point, fullscreen: bool) -> Self {
diff --git a/ableos/src/experiments/y_compositor/wm.rs b/ableos/src/experiments/y_compositor/wm.rs
index 8b1378917..e69de29bb 100644
--- a/ableos/src/experiments/y_compositor/wm.rs
+++ b/ableos/src/experiments/y_compositor/wm.rs
@@ -1 +0,0 @@
-
diff --git a/ableos/src/filesystem/mod.rs b/ableos/src/filesystem/mod.rs
index f564f185a..b712e6838 100644
--- a/ableos/src/filesystem/mod.rs
+++ b/ableos/src/filesystem/mod.rs
@@ -8,14 +8,8 @@ use ext2::{
};
use spin::Lazy;
-fn load_fs() -> Synced<Ext2<Size1024, Vec<u8>>> {
- let mut volume = Vec::new();
- volume.extend_from_slice(include_bytes!("../../../userland/root_fs/ext2.img"));
-
- Synced::<Ext2<Size1024, _>>::new(volume).unwrap()
-}
-
-// use serde::__private::from_utf8_lossy;
+pub static FILE_SYSTEM: Lazy<spin::Mutex<Synced<Ext2<Size1024, Vec<u8>>>>> =
+ Lazy::new(|| spin::Mutex::new(load_fs()));
pub fn walk<S: SectorSize, V: Volume<u8, S>>(
fs: &Synced<Ext2<S, V>>,
@@ -40,5 +34,9 @@ pub fn walk<S: SectorSize, V: Volume<u8, S>>(
}
}
-pub static FILE_SYSTEM: Lazy<spin::Mutex<Synced<Ext2<Size1024, Vec<u8>>>>> =
- Lazy::new(|| spin::Mutex::new(load_fs()));
+fn load_fs() -> Synced<Ext2<Size1024, Vec<u8>>> {
+ let mut volume = Vec::new();
+ volume.extend_from_slice(include_bytes!("../../../userland/root_fs/ext2.img"));
+
+ Synced::<Ext2<Size1024, _>>::new(volume).unwrap()
+}
diff --git a/ableos/src/graphics/mod.rs b/ableos/src/graphics/mod.rs
index 2275124ff..c7dbd8b50 100644
--- a/ableos/src/graphics/mod.rs
+++ b/ableos/src/graphics/mod.rs
@@ -1,9 +1,13 @@
-// use crate::vga_e::VGAE;
use ab_glyph::{Font, FontRef, Glyph};
-
use shadeable::{evaluate_shader, pixel_format::Rgba64};
use spin::Lazy;
-// use vga::{colors::Color16, writers::GraphicsWriter};
+
+pub static SCREEN_BUFFER: Lazy<spin::Mutex<ScreenBuffer>> =
+ Lazy::new(|| spin::Mutex::new(ScreenBuffer::new(640, 480)));
+
+const FONT_SCALE: f32 = 1.6;
+const GLYPH_HEIGHT: f32 = 18.0;
+const GLYPH_WIDTH: f32 = 10.0;
#[derive(Debug)]
pub struct ScreenSize {
@@ -11,13 +15,6 @@ pub struct ScreenSize {
pub y: usize,
}
-const FONT_SCALE: f32 = 1.6;
-const GLYPH_HEIGHT: f32 = 18.0;
-const GLYPH_WIDTH: f32 = 10.0;
-
-pub static SCREEN_BUFFER: Lazy<spin::Mutex<ScreenBuffer>> =
- Lazy::new(|| spin::Mutex::new(ScreenBuffer::new(640, 480)));
-
impl ScreenSize {
pub fn new(x: usize, y: usize) -> Self {
Self { x, y }
@@ -32,7 +29,7 @@ pub enum GraphicsReturn {
pub struct ScreenBuffer {
pub size: ScreenSize,
pub clear_color: Rgba64,
- pub buff: Box<[Rgba64]>, // Vec<Rgba64>,
+ pub buff: Box<[Rgba64]>,
}
impl ScreenBuffer {
@@ -69,6 +66,7 @@ impl ScreenBuffer {
}
pub fn blit(&mut self, _width: usize, _height: usize) {}
+
pub fn draw_filled_rect(&mut self, x1: usize, y1: usize, x2: usize, y2: usize, color: Rgba64) {
for y in y1..y2 {
for x in x1..x2 {
@@ -198,38 +196,6 @@ impl ScreenBuffer {
}
}
}
-/*
-
-pub trait VgaBuffer {
- fn copy_to_buffer(&self) -> GraphicsReturn;
-}
-impl VgaBuffer for ScreenBuffer {
- fn copy_to_buffer(&self) -> GraphicsReturn {
- let mode = VGAE.lock();
- for y in 0..self.size.y {
- for x in 0..self.size.x {
-
- use shadeable::pixel_format::into_vga_16;
- let vga_color = into_vga_16(self.buff[y * self.size.x + x]);
- // let vga_color = vga::colors::Color16::Cyan;
-
- if Color16::Cyan != vga_color {
- mode.set_pixel(x, y, vga_color);
- }
-
-
-
-
-
- }
- }
-
- GraphicsReturn::Ok
- }
-}
-
-
-*/
pub fn get_coordinates(x1: i32, y1: i32, x2: i32, y2: i32) -> Vec<(usize, usize)> {
let mut coordinates: Vec<(usize, usize)> = vec![];
@@ -271,5 +237,6 @@ pub fn get_coordinates(x1: i32, y1: i32, x2: i32, y2: i32) -> Vec<(usize, usize)
current_y += sy;
}
}
+
coordinates
}
diff --git a/ableos/src/keyboard/abstractions/custom_layout.rs b/ableos/src/keyboard/abstractions/custom_layout.rs
index 9939c2438..956be8872 100644
--- a/ableos/src/keyboard/abstractions/custom_layout.rs
+++ b/ableos/src/keyboard/abstractions/custom_layout.rs
@@ -2,104 +2,382 @@ use crate::{
DecodedKey, HandleControl, KeyCode, KeyboardLayout, LayoutEntry, LayoutEntryKind, Modifiers,
};
-// Do not edit this file directly. Instead, create a `Keyboard` and modify that.
-
pub struct CustomLayout {
mapping: [LayoutEntry; 256],
}
+
impl Default for CustomLayout {
fn default() -> Self {
Self::new_us104key()
}
}
-#[rustfmt::skip]
+
impl CustomLayout {
- pub fn new_us104key() -> Self {
- let mut mapping = Self {
- mapping: [LayoutEntry::default(); 256],
- };
- mapping.set(KeyCode::BackTick, LayoutEntry::regular().unshifted('`').shifted('`'));
- mapping.set(KeyCode::Escape, LayoutEntry::regular().unshifted('\x1B'));
- mapping.set(KeyCode::Key0, LayoutEntry::regular().unshifted('0').shifted(')'));
- mapping.set(KeyCode::Key1, LayoutEntry::regular().unshifted('1').shifted('!'));
- mapping.set(KeyCode::Key2, LayoutEntry::regular().unshifted('2').shifted('@'));
- mapping.set(KeyCode::Key3, LayoutEntry::regular().unshifted('3').shifted('#'));
- mapping.set(KeyCode::Key4, LayoutEntry::regular().unshifted('4').shifted('$'));
- mapping.set(KeyCode::Key5, LayoutEntry::regular().unshifted('5').shifted('%'));
- mapping.set(KeyCode::Key6, LayoutEntry::regular().unshifted('6').shifted('^'));
- mapping.set(KeyCode::Key7, LayoutEntry::regular().unshifted('7').shifted('&'));
- mapping.set(KeyCode::Key8, LayoutEntry::regular().unshifted('8').shifted('*'));
- mapping.set(KeyCode::Key9, LayoutEntry::regular().unshifted('9').shifted('('));
- mapping.set(KeyCode::Minus, LayoutEntry::regular().unshifted('-').shifted('_'));
- mapping.set(KeyCode::Equals, LayoutEntry::regular().unshifted('=').shifted('+'));
- mapping.set(KeyCode::Backspace, LayoutEntry::regular().all('\x08'));
- mapping.set(KeyCode::Tab, LayoutEntry::regular().all('\x09'));
- mapping.set(KeyCode::Q, LayoutEntry::alphabet().low('q').high('Q').raw_unicode('\u{0011}'));
- mapping.set(KeyCode::W, LayoutEntry::alphabet().low('w').high('W').raw_unicode('\u{0017}'));
- mapping.set(KeyCode::E, LayoutEntry::alphabet().low('e').high('E').raw_unicode('\u{0005}'));
- mapping.set(KeyCode::R, LayoutEntry::alphabet().low('r').high('R').raw_unicode('\u{0012}'));
- mapping.set(KeyCode::T, LayoutEntry::alphabet().low('t').high('T').raw_unicode('\u{0014}'));
- mapping.set(KeyCode::Y, LayoutEntry::alphabet().low('y').high('Y').raw_unicode('\u{0019}'));
- mapping.set(KeyCode::U, LayoutEntry::alphabet().low('u').high('U').raw_unicode('\u{0015}'));
- mapping.set(KeyCode::I, LayoutEntry::alphabet().low('i').high('I').raw_unicode('\u{0009}'));
- mapping.set(KeyCode::O, LayoutEntry::alphabet().low('o').high('O').raw_unicode('\u{000F}'));
- mapping.set(KeyCode::P, LayoutEntry::alphabet().low('p').high('P').raw_unicode('\u{0010}'));
- mapping.set(KeyCode::A, LayoutEntry::alphabet().low('a').high('A').raw_unicode('\u{0001}'));
- mapping.set(KeyCode::S, LayoutEntry::alphabet().low('s').high('S').raw_unicode('\u{0013}'));
- mapping.set(KeyCode::D, LayoutEntry::alphabet().low('d').high('D').raw_unicode('\u{0004}'));
- mapping.set(KeyCode::F, LayoutEntry::alphabet().low('f').high('F').raw_unicode('\u{0006}'));
- mapping.set(KeyCode::G, LayoutEntry::alphabet().low('g').high('G').raw_unicode('\u{0007}'));
- mapping.set(KeyCode::H, LayoutEntry::alphabet().low('h').high('H').raw_unicode('\u{0008}'));
- mapping.set(KeyCode::J, LayoutEntry::alphabet().low('j').high('J').raw_unicode('\u{000A}'));
- mapping.set(KeyCode::K, LayoutEntry::alphabet().low('k').high('K').raw_unicode('\u{000B}'));
- mapping.set(KeyCode::L, LayoutEntry::alphabet().low('l').high('L').raw_unicode('\u{000C}'));
- mapping.set(KeyCode::Z, LayoutEntry::alphabet().low('z').high('Z').raw_unicode('\u{001A}'));
- mapping.set(KeyCode::X, LayoutEntry::alphabet().low('x').high('X').raw_unicode('\u{0018}'));
- mapping.set(KeyCode::C, LayoutEntry::alphabet().low('c').high('C').raw_unicode('\u{0003}'));
- mapping.set(KeyCode::V, LayoutEntry::alphabet().low('v').high('V').raw_unicode('\u{0016}'));
- mapping.set(KeyCode::B, LayoutEntry::alphabet().low('b').high('B').raw_unicode('\u{0002}'));
- mapping.set(KeyCode::N, LayoutEntry::alphabet().low('n').high('N').raw_unicode('\u{000E}'));
- mapping.set(KeyCode::M, LayoutEntry::alphabet().low('m').high('M').raw_unicode('\u{000D}'));
- mapping.set(KeyCode::BracketSquareLeft, LayoutEntry::regular().unshifted('{').shifted('['));
- mapping.set(KeyCode::BracketSquareRight, LayoutEntry::regular().unshifted('}').shifted(']'));
- mapping.set(KeyCode::BackSlash, LayoutEntry::regular().unshifted('|').shifted('\\'));
- mapping.set(KeyCode::SemiColon, LayoutEntry::regular().unshifted(';').shifted(':'));
- mapping.set(KeyCode::Quote, LayoutEntry::regular().unshifted('\'').shifted('"'));
- mapping.set(KeyCode::Enter, LayoutEntry::regular().all('\x0A'));
- mapping.set(KeyCode::Comma, LayoutEntry::regular().unshifted(',').shifted('<'));
- mapping.set(KeyCode::Fullstop, LayoutEntry::regular().unshifted('.').shifted('>'));
- mapping.set(KeyCode::Slash, LayoutEntry::regular().unshifted('/').shifted('?'));
- mapping.set(KeyCode::Spacebar, LayoutEntry::regular().all(' '));
- mapping.set(KeyCode::Delete, LayoutEntry::regular().all('\x7F'));
- mapping.set(KeyCode::NumpadSlash, LayoutEntry::numpad().all('/'));
- mapping.set(KeyCode::NumpadStar, LayoutEntry::numpad().all('*'));
- mapping.set(KeyCode::NumpadMinus, LayoutEntry::numpad().all('-'));
- mapping.set(KeyCode::Numpad7, LayoutEntry::numpad().low('7').high(KeyCode::Home));
- mapping.set(KeyCode::Numpad8, LayoutEntry::numpad().low('8').high(KeyCode::ArrowUp));
- mapping.set(KeyCode::Numpad9, LayoutEntry::numpad().low('9').high(KeyCode::PageUp));
- mapping.set(KeyCode::NumpadPlus, LayoutEntry::numpad().all('+'));
- mapping.set(KeyCode::Numpad4, LayoutEntry::numpad().low('4').high(KeyCode::ArrowLeft));
- mapping.set(KeyCode::Numpad5, LayoutEntry::numpad().all('5'));
- mapping.set(KeyCode::Numpad6, LayoutEntry::numpad().low('6').high(KeyCode::ArrowRight));
- mapping.set(KeyCode::Numpad1, LayoutEntry::numpad().low('1').high(KeyCode::End));
- mapping.set(KeyCode::Numpad2, LayoutEntry::numpad().low('2').high(KeyCode::ArrowDown));
- mapping.set(KeyCode::Numpad3, LayoutEntry::numpad().low('3').high(KeyCode::PageDown));
- mapping.set(KeyCode::Numpad0, LayoutEntry::numpad().low('0').high(KeyCode::Insert));
- mapping.set(KeyCode::NumpadPeriod, LayoutEntry::numpad().low('.').high('\x7F'));
- mapping.set(KeyCode::NumpadEnter, LayoutEntry::numpad().all('\x0A'));
- mapping
- }
- pub fn new_us105key() -> Self {
- let mut mapping = Self::new_us104key();
- mapping.set(KeyCode::BackTick, LayoutEntry::regular().unshifted('`').shifted('¬').altgr('|'));
- mapping.set(KeyCode::Key2, LayoutEntry::regular().unshifted('2').shifted('"'));
- mapping.set(KeyCode::Quote, LayoutEntry::regular().unshifted('\'').shifted('@'));
- mapping.set(KeyCode::Key3, LayoutEntry::regular().unshifted('3').shifted('£'));
- mapping.set(KeyCode::BackTick, LayoutEntry::regular().unshifted('4').shifted('$').altgr('€'));
- mapping.set(KeyCode::HashTilde, LayoutEntry::regular().unshifted('#').shifted('~'));
- mapping
- }
+ pub fn new_us104key() -> Self {
+ let mut mapping = Self {
+ mapping: [LayoutEntry::default(); 256],
+ };
+
+ mapping.set(
+ KeyCode::BackTick,
+ LayoutEntry::regular().unshifted('`').shifted('`'),
+ );
+ mapping.set(KeyCode::Escape, LayoutEntry::regular().unshifted('\x1B'));
+ mapping.set(
+ KeyCode::Key0,
+ LayoutEntry::regular().unshifted('0').shifted(')'),
+ );
+ mapping.set(
+ KeyCode::Key1,
+ LayoutEntry::regular().unshifted('1').shifted('!'),
+ );
+ mapping.set(
+ KeyCode::Key2,
+ LayoutEntry::regular().unshifted('2').shifted('@'),
+ );
+ mapping.set(
+ KeyCode::Key3,
+ LayoutEntry::regular().unshifted('3').shifted('#'),
+ );
+ mapping.set(
+ KeyCode::Key4,
+ LayoutEntry::regular().unshifted('4').shifted('$'),
+ );
+ mapping.set(
+ KeyCode::Key5,
+ LayoutEntry::regular().unshifted('5').shifted('%'),
+ );
+ mapping.set(
+ KeyCode::Key6,
+ LayoutEntry::regular().unshifted('6').shifted('^'),
+ );
+ mapping.set(
+ KeyCode::Key7,
+ LayoutEntry::regular().unshifted('7').shifted('&'),
+ );
+ mapping.set(
+ KeyCode::Key8,
+ LayoutEntry::regular().unshifted('8').shifted('*'),
+ );
+ mapping.set(
+ KeyCode::Key9,
+ LayoutEntry::regular().unshifted('9').shifted('('),
+ );
+ mapping.set(
+ KeyCode::Minus,
+ LayoutEntry::regular().unshifted('-').shifted('_'),
+ );
+ mapping.set(
+ KeyCode::Equals,
+ LayoutEntry::regular().unshifted('=').shifted('+'),
+ );
+ mapping.set(KeyCode::Backspace, LayoutEntry::regular().all('\x08'));
+ mapping.set(KeyCode::Tab, LayoutEntry::regular().all('\x09'));
+ mapping.set(
+ KeyCode::Q,
+ LayoutEntry::alphabet()
+ .low('q')
+ .high('Q')
+ .raw_unicode('\u{0011}'),
+ );
+ mapping.set(
+ KeyCode::W,
+ LayoutEntry::alphabet()
+ .low('w')
+ .high('W')
+ .raw_unicode('\u{0017}'),
+ );
+ mapping.set(
+ KeyCode::E,
+ LayoutEntry::alphabet()
+ .low('e')
+ .high('E')
+ .raw_unicode('\u{0005}'),
+ );
+ mapping.set(
+ KeyCode::R,
+ LayoutEntry::alphabet()
+ .low('r')
+ .high('R')
+ .raw_unicode('\u{0012}'),
+ );
+ mapping.set(
+ KeyCode::T,
+ LayoutEntry::alphabet()
+ .low('t')
+ .high('T')
+ .raw_unicode('\u{0014}'),
+ );
+ mapping.set(
+ KeyCode::Y,
+ LayoutEntry::alphabet()
+ .low('y')
+ .high('Y')
+ .raw_unicode('\u{0019}'),
+ );
+ mapping.set(
+ KeyCode::U,
+ LayoutEntry::alphabet()
+ .low('u')
+ .high('U')
+ .raw_unicode('\u{0015}'),
+ );
+ mapping.set(
+ KeyCode::I,
+ LayoutEntry::alphabet()
+ .low('i')
+ .high('I')
+ .raw_unicode('\u{0009}'),
+ );
+ mapping.set(
+ KeyCode::O,
+ LayoutEntry::alphabet()
+ .low('o')
+ .high('O')
+ .raw_unicode('\u{000F}'),
+ );
+ mapping.set(
+ KeyCode::P,
+ LayoutEntry::alphabet()
+ .low('p')
+ .high('P')
+ .raw_unicode('\u{0010}'),
+ );
+ mapping.set(
+ KeyCode::A,
+ LayoutEntry::alphabet()
+ .low('a')
+ .high('A')
+ .raw_unicode('\u{0001}'),
+ );
+ mapping.set(
+ KeyCode::S,
+ LayoutEntry::alphabet()
+ .low('s')
+ .high('S')
+ .raw_unicode('\u{0013}'),
+ );
+ mapping.set(
+ KeyCode::D,
+ LayoutEntry::alphabet()
+ .low('d')
+ .high('D')
+ .raw_unicode('\u{0004}'),
+ );
+ mapping.set(
+ KeyCode::F,
+ LayoutEntry::alphabet()
+ .low('f')
+ .high('F')
+ .raw_unicode('\u{0006}'),
+ );
+ mapping.set(
+ KeyCode::G,
+ LayoutEntry::alphabet()
+ .low('g')
+ .high('G')
+ .raw_unicode('\u{0007}'),
+ );
+ mapping.set(
+ KeyCode::H,
+ LayoutEntry::alphabet()
+ .low('h')
+ .high('H')
+ .raw_unicode('\u{0008}'),
+ );
+ mapping.set(
+ KeyCode::J,
+ LayoutEntry::alphabet()
+ .low('j')
+ .high('J')
+ .raw_unicode('\u{000A}'),
+ );
+ mapping.set(
+ KeyCode::K,
+ LayoutEntry::alphabet()
+ .low('k')
+ .high('K')
+ .raw_unicode('\u{000B}'),
+ );
+ mapping.set(
+ KeyCode::L,
+ LayoutEntry::alphabet()
+ .low('l')
+ .high('L')
+ .raw_unicode('\u{000C}'),
+ );
+ mapping.set(
+ KeyCode::Z,
+ LayoutEntry::alphabet()
+ .low('z')
+ .high('Z')
+ .raw_unicode('\u{001A}'),
+ );
+ mapping.set(
+ KeyCode::X,
+ LayoutEntry::alphabet()
+ .low('x')
+ .high('X')
+ .raw_unicode('\u{0018}'),
+ );
+ mapping.set(
+ KeyCode::C,
+ LayoutEntry::alphabet()
+ .low('c')
+ .high('C')
+ .raw_unicode('\u{0003}'),
+ );
+ mapping.set(
+ KeyCode::V,
+ LayoutEntry::alphabet()
+ .low('v')
+ .high('V')
+ .raw_unicode('\u{0016}'),
+ );
+ mapping.set(
+ KeyCode::B,
+ LayoutEntry::alphabet()
+ .low('b')
+ .high('B')
+ .raw_unicode('\u{0002}'),
+ );
+ mapping.set(
+ KeyCode::N,
+ LayoutEntry::alphabet()
+ .low('n')
+ .high('N')
+ .raw_unicode('\u{000E}'),
+ );
+ mapping.set(
+ KeyCode::M,
+ LayoutEntry::alphabet()
+ .low('m')
+ .high('M')
+ .raw_unicode('\u{000D}'),
+ );
+ mapping.set(
+ KeyCode::BracketSquareLeft,
+ LayoutEntry::regular().unshifted('{').shifted('['),
+ );
+ mapping.set(
+ KeyCode::BracketSquareRight,
+ LayoutEntry::regular().unshifted('}').shifted(']'),
+ );
+ mapping.set(
+ KeyCode::BackSlash,
+ LayoutEntry::regular().unshifted('|').shifted('\\'),
+ );
+ mapping.set(
+ KeyCode::SemiColon,
+ LayoutEntry::regular().unshifted(';').shifted(':'),
+ );
+ mapping.set(
+ KeyCode::Quote,
+ LayoutEntry::regular().unshifted('\'').shifted('"'),
+ );
+ mapping.set(KeyCode::Enter, LayoutEntry::regular().all('\x0A'));
+ mapping.set(
+ KeyCode::Comma,
+ LayoutEntry::regular().unshifted(',').shifted('<'),
+ );
+ mapping.set(
+ KeyCode::Fullstop,
+ LayoutEntry::regular().unshifted('.').shifted('>'),
+ );
+ mapping.set(
+ KeyCode::Slash,
+ LayoutEntry::regular().unshifted('/').shifted('?'),
+ );
+ mapping.set(KeyCode::Spacebar, LayoutEntry::regular().all(' '));
+ mapping.set(KeyCode::Delete, LayoutEntry::regular().all('\x7F'));
+ mapping.set(KeyCode::NumpadSlash, LayoutEntry::numpad().all('/'));
+ mapping.set(KeyCode::NumpadStar, LayoutEntry::numpad().all('*'));
+ mapping.set(KeyCode::NumpadMinus, LayoutEntry::numpad().all('-'));
+ mapping.set(
+ KeyCode::Numpad7,
+ LayoutEntry::numpad().low('7').high(KeyCode::Home),
+ );
+ mapping.set(
+ KeyCode::Numpad8,
+ LayoutEntry::numpad().low('8').high(KeyCode::ArrowUp),
+ );
+ mapping.set(
+ KeyCode::Numpad9,
+ LayoutEntry::numpad().low('9').high(KeyCode::PageUp),
+ );
+ mapping.set(KeyCode::NumpadPlus, LayoutEntry::numpad().all('+'));
+ mapping.set(
+ KeyCode::Numpad4,
+ LayoutEntry::numpad().low('4').high(KeyCode::ArrowLeft),
+ );
+ mapping.set(KeyCode::Numpad5, LayoutEntry::numpad().all('5'));
+ mapping.set(
+ KeyCode::Numpad6,
+ LayoutEntry::numpad().low('6').high(KeyCode::ArrowRight),
+ );
+ mapping.set(
+ KeyCode::Numpad1,
+ LayoutEntry::numpad().low('1').high(KeyCode::End),
+ );
+ mapping.set(
+ KeyCode::Numpad2,
+ LayoutEntry::numpad().low('2').high(KeyCode::ArrowDown),
+ );
+ mapping.set(
+ KeyCode::Numpad3,
+ LayoutEntry::numpad().low('3').high(KeyCode::PageDown),
+ );
+ mapping.set(
+ KeyCode::Numpad0,
+ LayoutEntry::numpad().low('0').high(KeyCode::Insert),
+ );
+ mapping.set(
+ KeyCode::NumpadPeriod,
+ LayoutEntry::numpad().low('.').high('\x7F'),
+ );
+ mapping.set(KeyCode::NumpadEnter, LayoutEntry::numpad().all('\x0A'));
+ mapping
+ }
+ pub fn new_us105key() -> Self {
+ let mut mapping = Self::new_us104key();
+ mapping.set(
+ KeyCode::BackTick,
+ LayoutEntry::regular()
+ .unshifted('`')
+ .shifted('¬')
+ .altgr('|'),
+ );
+ mapping.set(
+ KeyCode::Key2,
+ LayoutEntry::regular().unshifted('2').shifted('"'),
+ );
+ mapping.set(
+ KeyCode::Quote,
+ LayoutEntry::regular().unshifted('\'').shifted('@'),
+ );
+ mapping.set(
+ KeyCode::Key3,
+ LayoutEntry::regular().unshifted('3').shifted('£'),
+ );
+ mapping.set(
+ KeyCode::BackTick,
+ LayoutEntry::regular()
+ .unshifted('4')
+ .shifted('$')
+ .altgr('€'),
+ );
+ mapping.set(
+ KeyCode::HashTilde,
+ LayoutEntry::regular().unshifted('#').shifted('~'),
+ );
+ mapping
+ }
+
+ pub fn set(&mut self, pos: KeyCode, entry: LayoutEntry) {
+ self.mapping[pos as usize] = entry;
+ }
}
+
impl KeyboardLayout for CustomLayout {
fn map_keycode(
&self,
@@ -164,13 +442,3 @@ impl KeyboardLayout for CustomLayout {
}
}
}
-
-// Note(elfein) Not super hard to get right, but still- DO NOT TOUCH
-impl CustomLayout {
- // See how hard this is to get right?
- // See the complexity of all the methods?
- // Yeah- if you don't know what you're doing, ask before you touch!
- pub fn set(&mut self, pos: KeyCode, entry: LayoutEntry) {
- self.mapping[pos as usize] = entry;
- }
-}
diff --git a/ableos/src/keyboard/abstractions/custom_scancode_set.rs b/ableos/src/keyboard/abstractions/custom_scancode_set.rs
index 8cb6950af..25b08e229 100644
--- a/ableos/src/keyboard/abstractions/custom_scancode_set.rs
+++ b/ableos/src/keyboard/abstractions/custom_scancode_set.rs
@@ -6,17 +6,20 @@ pub struct CustomScancodeSet {
single_byte: [Option<KeyCode>; 256],
extended: [Option<KeyCode>; 256],
}
+
impl Default for CustomScancodeSet {
fn default() -> Self {
Self::scancode_set1()
}
}
+
impl CustomScancodeSet {
pub fn scancode_set1() -> Self {
let mut scancode_set = Self {
single_byte: [None; 256],
extended: [None; 256],
};
+
scancode_set.single_byte[0x01] = Some(KeyCode::Escape); // 01
scancode_set.single_byte[0x02] = Some(KeyCode::Key1); // 02
scancode_set.single_byte[0x03] = Some(KeyCode::Key2); // 03
@@ -181,6 +184,7 @@ impl CustomScancodeSet {
}
scancode_set
}
+
pub fn scancode_set2() -> Self {
Self {
single_byte: [None; 256],
@@ -188,6 +192,7 @@ impl CustomScancodeSet {
}
}
}
+
impl ScancodeSet for CustomScancodeSet {
fn advance_state(&self, state: &mut DecodeState, code: u8) -> Result<Option<KeyEvent>, Error> {
match *state {
@@ -238,6 +243,7 @@ impl ScancodeSet for CustomScancodeSet {
}
}
}
+
fn map_scancode(&self, code: u8) -> Result<KeyCode, Error> {
if let Some(kc) = self.single_byte[code as usize] {
Ok(kc)
@@ -245,6 +251,7 @@ impl ScancodeSet for CustomScancodeSet {
Err(Error::UnknownKeyCode)
}
}
+
fn map_extended_scancode(&self, code: u8) -> Result<KeyCode, Error> {
if let Some(kc) = self.extended[code as usize] {
Ok(kc)
diff --git a/ableos/src/keyboard/abstractions/layout_entry.rs b/ableos/src/keyboard/abstractions/layout_entry.rs
index a24af3a7e..e338def4d 100644
--- a/ableos/src/keyboard/abstractions/layout_entry.rs
+++ b/ableos/src/keyboard/abstractions/layout_entry.rs
@@ -1,4 +1,4 @@
-use super::DecodedKey;
+use crate::DecodedKey;
#[derive(Debug, Clone, Copy)]
pub enum LayoutEntryKind {
@@ -32,6 +32,7 @@ impl LayoutEntry {
..Default::default()
}
}
+
#[must_use]
pub fn numpad() -> Self {
Self {
@@ -39,6 +40,7 @@ impl LayoutEntry {
..Default::default()
}
}
+
#[must_use]
pub fn alphabet() -> Self {
Self {
@@ -46,36 +48,43 @@ impl LayoutEntry {
..Default::default()
}
}
+
#[must_use]
pub fn unshifted(mut self, c: impl Into<DecodedKey>) -> Self {
self.unshifted = Some(c.into());
self
}
+
#[must_use]
pub fn shifted(mut self, c: impl Into<DecodedKey>) -> Self {
self.shifted = Some(c.into());
self
}
+
#[must_use]
pub fn altgr(mut self, c: impl Into<DecodedKey>) -> Self {
self.altgr = Some(c.into());
self
}
+
#[must_use]
pub fn raw_unicode(mut self, c: impl Into<DecodedKey>) -> Self {
self.raw_unicode = Some(c.into());
self
}
+
#[must_use]
pub fn locked(mut self, c: impl Into<DecodedKey>) -> Self {
self.locked = Some(c.into());
self
}
+
#[must_use]
pub fn locked_shifted(mut self, c: impl Into<DecodedKey>) -> Self {
self.locked_shifted = Some(c.into());
self
}
+
#[must_use]
pub fn common(self, c: impl Into<DecodedKey> + Clone) -> Self {
self.unshifted(c.clone())
@@ -83,14 +92,17 @@ impl LayoutEntry {
.locked(c.clone())
.locked_shifted(c)
}
+
#[must_use]
pub fn low(self, c: impl Into<DecodedKey> + Clone) -> Self {
self.unshifted(c.clone()).locked_shifted(c)
}
+
#[must_use]
pub fn high(self, c: impl Into<DecodedKey> + Clone) -> Self {
self.shifted(c.clone()).locked(c)
}
+
#[must_use]
pub fn all(self, c: impl Into<DecodedKey> + Clone) -> Self {
self.unshifted(c.clone())
diff --git a/ableos/src/keyboard/abstractions/mod.rs b/ableos/src/keyboard/abstractions/mod.rs
index 38f49fa3a..d80e687d0 100644
--- a/ableos/src/keyboard/abstractions/mod.rs
+++ b/ableos/src/keyboard/abstractions/mod.rs
@@ -1,5 +1,3 @@
-use super::*;
-
mod custom_layout;
mod custom_scancode_set;
mod layout_entry;
diff --git a/ableos/src/keyboard/mod.rs b/ableos/src/keyboard/mod.rs
index c669dc67c..5ca5bcae6 100644
--- a/ableos/src/keyboard/mod.rs
+++ b/ableos/src/keyboard/mod.rs
@@ -1,13 +1,17 @@
#![allow(dead_code)]
+
mod abstractions;
mod small_types;
mod traits;
+
pub use abstractions::*;
pub use small_types::*;
pub use traits::*;
-const KEYCODE_BITS: u8 = 11;
+
const EXTENDED_KEY_CODE: u8 = 0xE0;
+const KEYCODE_BITS: u8 = 11;
const KEY_RELEASE_CODE: u8 = 0xF0;
+
#[derive(Debug)]
pub struct Keyboard<T, S>
where
@@ -22,6 +26,7 @@ where
layout: T,
set: S,
}
+
impl<T, S> Keyboard<T, S>
where
T: KeyboardLayout + Default,
@@ -47,14 +52,17 @@ where
set: S::default(),
}
}
- // /// Change the Ctrl key mapping.
+
+ /// Change the Ctrl key mapping.
pub fn set_ctrl_handling(&mut self, new_value: HandleControl) {
self.handle_ctrl = new_value;
}
- // /// Get the current Ctrl key mapping.
+
+ /// Get the current Ctrl key mapping.
pub fn get_ctrl_handling(&self) -> HandleControl {
self.handle_ctrl
}
+
/// Clears the bit register.
///
/// Call this when there is a timeout reading data from the keyboard.
@@ -63,6 +71,7 @@ where
self.num_bits = 0;
self.decode_state = DecodeState::Start;
}
+
/// Processes a 16-bit word from the keyboard.
///
/// * The start bit (0) must be in bit 0.
@@ -74,6 +83,7 @@ where
let byte = self.check_word(word)?;
self.add_byte(byte)
}
+
/// Processes an 8-bit byte from the keyboard.
///
/// We assume the start, stop and parity bits have been processed and
@@ -81,6 +91,7 @@ where
pub fn add_byte(&mut self, byte: u8) -> Result<Option<KeyEvent>, Error> {
self.set.advance_state(&mut self.decode_state, byte)
}
+
/// Shift a bit into the register.
///
/// Call this /or/ call `add_word` - don't call both.
@@ -97,6 +108,7 @@ where
Ok(None)
}
}
+
/// Processes a `KeyEvent` returned from `add_bit`, `add_byte` or `add_word`
/// and produces a decoded key.
///
@@ -199,12 +211,15 @@ where
_ => None,
}
}
+
fn get_bit(&self, word: u16, offset: usize) -> bool {
((word >> offset) & 0x0001) != 0
}
+
fn has_even_number_bits(&self, data: u8) -> bool {
(data.count_ones() % 2) == 0
}
+
/// Check 11-bit word has 1 start bit, 1 stop bit and an odd parity bit.
fn check_word(&self, word: u16) -> Result<u8, Error> {
let start_bit = self.get_bit(word, 0);
@@ -222,9 +237,11 @@ where
if need_parity != parity_bit {
return Err(Error::ParityError);
}
+
Ok(data)
}
}
+
pub fn parse_format() {
let test = include_str!("../../keymaps/qwerty.keymap").lines();
// r#"0-NONE\n1-HI#Says HI"#
diff --git a/ableos/src/keyboard/small_types.rs b/ableos/src/keyboard/small_types.rs
index 1ab5bfea1..31661a67b 100644
--- a/ableos/src/keyboard/small_types.rs
+++ b/ableos/src/keyboard/small_types.rs
@@ -1,4 +1,5 @@
#![allow(non_snake_case)]
+
#[derive(Debug)]
pub struct Modifiers {
pub lshift: bool,
@@ -9,17 +10,21 @@ pub struct Modifiers {
pub capslock: bool,
pub alt_gr: bool,
}
+
impl Modifiers {
pub fn is_shifted(&self) -> bool {
self.lshift | self.rshift
}
+
pub fn is_ctrl(&self) -> bool {
self.lctrl | self.rctrl
}
+
pub fn is_caps(&self) -> bool {
self.capslock
}
}
+
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
pub enum KeyState {
Up,
@@ -30,11 +35,13 @@ pub struct KeyEvent {
pub code: KeyCode,
pub state: KeyState,
}
+
impl KeyEvent {
pub fn new(code: KeyCode, state: KeyState) -> KeyEvent {
KeyEvent { code, state }
}
}
+
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
pub enum HandleControl {
/// If either Ctrl key is held down, convert the letters A through Z into
@@ -45,6 +52,7 @@ pub enum HandleControl {
/// and leave the letters as letters.
Ignore,
}
+
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub enum DecodeState {
Start,
@@ -52,6 +60,7 @@ pub enum DecodeState {
Release,
ExtendedRelease,
}
+
/// Indicates different error conditions.
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
pub enum Error {
@@ -61,6 +70,7 @@ pub enum Error {
UnknownKeyCode,
InvalidState,
}
+
#[derive(Debug, PartialEq, Eq, Copy, Clone)]
#[repr(u8)]
pub enum DecodedKeyKind {
@@ -73,6 +83,7 @@ pub struct DecodedKey {
pub kind: DecodedKeyKind,
pub value: u32,
}
+
impl From<char> for DecodedKey {
fn from(ch: char) -> Self {
Self {
@@ -81,6 +92,7 @@ impl From<char> for DecodedKey {
}
}
}
+
impl From<KeyCode> for DecodedKey {
fn from(kc: KeyCode) -> Self {
Self {
@@ -89,6 +101,7 @@ impl From<KeyCode> for DecodedKey {
}
}
}
+
impl DecodedKey {
pub const ZERO: Self = Self {
kind: DecodedKeyKind::Unicode,
@@ -107,6 +120,7 @@ impl DecodedKey {
}
}
}
+
macro_rules! keycode_enum {
(@get_last $Variant:ident) => {
Self::$Variant
@@ -134,6 +148,7 @@ macro_rules! keycode_enum {
keycode_enum!($($Variant=$Value,)* );
};
}
+
// This will be a way to map keys to other keys / keyyngs / macros
keycode_enum! {
AltLeft = 0x00,
diff --git a/ableos/src/keyboard/traits.rs b/ableos/src/keyboard/traits.rs
index 789464e4f..9be9296b6 100644
--- a/ableos/src/keyboard/traits.rs
+++ b/ableos/src/keyboard/traits.rs
@@ -1,13 +1,18 @@
-use super::*;
+use super::Error;
+use crate::{DecodeState, DecodedKey, HandleControl, KeyCode, KeyEvent, Modifiers};
+
pub trait ScancodeSet {
/// Handles the state logic for the decoding of scan codes into key events.
fn advance_state(&self, state: &mut DecodeState, code: u8) -> Result<Option<KeyEvent>, Error>;
+
/// Convert a Scan Code set X byte to our 'KeyType' enum
fn map_scancode(&self, code: u8) -> Result<KeyCode, Error>;
+
/// Convert a Scan Code Set X extended byte (prefixed E0) to our `KeyType`
/// enum.
fn map_extended_scancode(&self, code: u8) -> Result<KeyCode, Error>;
}
+
pub trait KeyboardLayout {
/// Convert a `KeyType` enum to a Unicode character, if possible.
/// `KeyType::A` maps to `Some('a')` (or `Some('A')` if shifted), while
diff --git a/ableos/src/kmain.rs b/ableos/src/kmain.rs
index 567c039cb..5f2850a95 100644
--- a/ableos/src/kmain.rs
+++ b/ableos/src/kmain.rs
@@ -1,15 +1,14 @@
#![allow(clippy::empty_loop)]
-// use acpi::AcpiTables;
-// use x86_64::instructions::interrupts::{disable, enable};
-
-// use crate::{scratchpad, SCHEDULER, SCREEN_BUFFER};
-
+use crate::info::master;
+use crate::scheduler::SCHEDULER;
use crate::{
arch::{init, sloop},
relib::network::socket::{SimpleSock, Socket},
scratchpad,
};
+use crate::{boot_conf::KernelConfig, systeminfo::RELEASE_TYPE};
+use kernel::KERNEL_VERSION;
use spin::Lazy;
// TODO: Change this structure to allow for multiple cores loaded
@@ -53,10 +52,3 @@ pub fn log_version_data() {
master().unwrap().brand_string().unwrap()
);
}
-
-use crate::info::master;
-
-use kernel::KERNEL_VERSION;
-
-use crate::scheduler::SCHEDULER;
-use crate::{boot_conf::KernelConfig, systeminfo::RELEASE_TYPE};
diff --git a/ableos/src/lib.rs b/ableos/src/lib.rs
index ff09163c0..bf46f74bc 100644
--- a/ableos/src/lib.rs
+++ b/ableos/src/lib.rs
@@ -4,109 +4,80 @@
//!
#![no_std]
-#![feature(
- abi_x86_interrupt,
- asm_sym,
- alloc_error_handler,
- core_intrinsics,
- exclusive_range_pattern,
- lang_items,
- naked_functions,
- slice_pattern,
- prelude_import
-)]
+#![feature(abi_x86_interrupt)]
+#![feature(alloc_error_handler)]
+#![feature(prelude_import)]
+
+#[macro_use]
+pub extern crate log;
+
+pub extern crate alloc;
+pub extern crate externc_libm as libm;
/// Contains architecture specific code for aarch64.
#[cfg(target_arch = "aarch64")]
#[path = "arch/aarch64/mod.rs"]
pub mod arch;
-/// Contains architecture specific code for x86_64.
-#[cfg(target_arch = "x86_64")]
-#[path = "arch/x86_64/mod.rs"]
-pub mod arch;
-
/// Contains architecture specific code for riscv64.
#[cfg(target_arch = "riscv64")]
#[path = "arch/riscv/mod.rs"]
pub mod arch;
-#[macro_use]
-pub mod print;
-pub mod devices;
-pub mod rhai_shell;
-pub mod wasm_jumploader;
+/// Contains architecture specific code for x86_64.
+#[cfg(target_arch = "x86_64")]
+#[path = "arch/x86_64/mod.rs"]
+pub mod arch;
#[cfg(target_arch = "x86_64")]
pub mod port_io;
#[macro_use]
-pub mod serial_print;
-pub mod time;
+pub mod print;
#[macro_use]
-pub extern crate log;
+pub mod serial_print;
-/////////////
-// Modules //
-/////////////
pub mod allocator;
+pub mod boot_conf;
+pub mod devices;
pub mod driver_traits;
pub mod experiments;
+pub mod filesystem;
pub mod graphics;
pub mod kernel_state;
pub mod keyboard;
pub mod kmain;
pub mod logger;
+pub mod prelude;
pub mod relib;
+pub mod rhai_shell;
pub mod scheduler;
-mod unicode_utils;
+pub mod scratchpad;
+pub mod stdio;
+pub mod time;
pub mod utils;
-// pub mod vga_e;
+pub mod virtio;
pub mod wasm;
+pub mod wasm_jumploader;
-pub extern crate alloc;
-pub extern crate externc_libm as libm;
+mod unicode_utils;
-//////////////////
-// Re-exports ///
-////////////////
pub use allocator::*;
pub use driver_traits::*;
pub use experiments::*;
pub use graphics::*;
+pub use kernel;
+pub use kernel::messaging;
+pub use kernel::panic;
pub use kernel_state::*;
pub use keyboard::*;
pub use logger::*;
pub use relib::*;
-// pub use scheduler::*;
-pub use utils::*;
-// pub use vga_e::*;
-pub use wasm::*;
-pub mod boot_conf;
-pub mod virtio;
-pub use virtio::*;
-
-// pub mod alias_table;
-// pub use alias_table::*;
-
-// pub mod tests;
-// pub use tests::*;
-
-pub mod scratchpad;
pub use scratchpad::*;
-pub mod filesystem;
-
-///////////////
-/// Kernel ///
-/////////////
-pub use kernel;
-pub use kernel::messaging;
-pub use kernel::panic;
-
-pub mod prelude;
+pub use utils::*;
+pub use virtio::*;
+pub use wasm::*;
#[prelude_import]
pub use prelude::rust_2021::*;
-
-pub mod stdio;
diff --git a/ableos/src/logger.rs b/ableos/src/logger.rs
index da830e241..a42b0f872 100644
--- a/ableos/src/logger.rs
+++ b/ableos/src/logger.rs
@@ -1,14 +1,15 @@
use crate::kmain::KERNEL_CONF;
use crate::network::socket::{SimpleSock, Socket};
use crate::time::fetch_time;
-
use lliw::{Fg, Reset};
use log::{Level, Metadata, Record};
+use log::{LevelFilter, SetLoggerError};
-struct SimpleLogger;
+static LOGGER: SimpleLogger = SimpleLogger;
// TODO: Rebuild this to take advantage of sockets
// DETAIL: Log to a socket instead of the screen
-// So that we can log in the kernel and display it in userland
+// So that we can log in the kernel and display it in userland
+struct SimpleLogger;
impl log::Log for SimpleLogger {
fn enabled(&self, metadata: &Metadata) -> bool {
metadata.level() <= Level::Trace
@@ -62,10 +63,6 @@ impl log::Log for SimpleLogger {
fn flush(&self) {}
}
-use log::{LevelFilter, SetLoggerError};
-
-static LOGGER: SimpleLogger = SimpleLogger;
-
pub fn init() -> Result<(), SetLoggerError> {
log::set_logger(&LOGGER).map(|()| log::set_max_level(LevelFilter::Trace))
}
diff --git a/ableos/src/port_io.rs b/ableos/src/port_io.rs
index 15b6d6669..ad5fcc658 100644
--- a/ableos/src/port_io.rs
+++ b/ableos/src/port_io.rs
@@ -3,6 +3,7 @@ use cpuio::{inb, inl, outb, outl};
pub fn read32(reg: u16) -> u32 {
unsafe { inl(reg) }
}
+
pub fn read8(reg: u16) -> u8 {
unsafe { inb(reg) }
}
diff --git a/ableos/src/prelude/rust_2021.rs b/ableos/src/prelude/rust_2021.rs
index 502037fb9..1bfe654cd 100644
--- a/ableos/src/prelude/rust_2021.rs
+++ b/ableos/src/prelude/rust_2021.rs
@@ -1,10 +1,7 @@
+pub use crate::print::*;
+pub use crate::serial_print::*;
+pub use alloc::{boxed::Box, format, string::*, vec, vec::*};
pub use core::arch::asm;
pub use core::prelude::rust_2021::*;
pub use core::prelude::v1::*;
-
-pub use crate::print::*;
-pub use crate::serial_print::*;
-
pub use log::{debug, info, trace, warn};
-
-pub use alloc::{boxed::Box, format, string::*, vec, vec::*};
diff --git a/ableos/src/print.rs b/ableos/src/print.rs
index c87e7dfe5..b2fd0b00f 100644
--- a/ableos/src/print.rs
+++ b/ableos/src/print.rs
@@ -1,8 +1,10 @@
// TODO: refactor this file
// TODO: make STDOUT redirect to a socket owned
// by the process named "stdout"
-pub struct Stdout;
+
use core::fmt::{Arguments, Error};
+
+pub struct Stdout;
impl Stdout {
pub fn write_fmt(&mut self, arg: Arguments<'_>) /*-> Result<(), Error> */
{
@@ -10,6 +12,7 @@ impl Stdout {
// Ok(())
}
}
+
impl core::fmt::Write for Stdout {
#[cfg(target_arch = "aarch64")]
fn write_str(&mut self, s: &str) -> Result<(), Error> {
@@ -33,6 +36,7 @@ impl core::fmt::Write for Stdout {
core::fmt::write(&mut self, args)
}
}
+
#[macro_export]
macro_rules! print {
() => {
diff --git a/ableos/src/relib/clparse/mod.rs b/ableos/src/relib/clparse/mod.rs
index ef4b37058..d280f2fd5 100644
--- a/ableos/src/relib/clparse/mod.rs
+++ b/ableos/src/relib/clparse/mod.rs
@@ -1,9 +1,6 @@
-/*
-clparse
-* A simple command line parser for ableOS
-*/
+/// # clparse
+/// simple command line parser for ableOS
-// use std::collections::HashMap;
#[derive(Debug, Clone)]
pub struct Argument {
key: String,
@@ -53,6 +50,7 @@ impl Command {
}
}
}
+
pub fn test() {
let x = Command::parse("hi?there=uwu&hi=abc".to_string());
diff --git a/ableos/src/relib/encoding/rle.rs b/ableos/src/relib/encoding/rle.rs
index abcd2163e..f1d49537c 100644
--- a/ableos/src/relib/encoding/rle.rs
+++ b/ableos/src/relib/encoding/rle.rs
@@ -17,13 +17,12 @@ pub fn encode(bytes: &[u8]) -> Vec<u8> {
}
encoding.push(occurrences);
-
encoding
}
/// Read a run-length encoding and return its decoded contents.
///
-/// * `bytes` - The bytes to be decoded.
+/// - `bytes` - The bytes to be decoded.
pub fn decode(bytes: &[u8]) -> Vec<u8> {
let mut decoding = Vec::<u8>::new();
diff --git a/ableos/src/relib/image/mod.rs b/ableos/src/relib/image/mod.rs
index bd47023f5..51c18fa2f 100644
--- a/ableos/src/relib/image/mod.rs
+++ b/ableos/src/relib/image/mod.rs
@@ -1,3 +1 @@
pub mod mono_bitmap;
-
-pub mod stupid_simple_image;
diff --git a/ableos/src/relib/image/mono_bitmap.rs b/ableos/src/relib/image/mono_bitmap.rs
index 4186c15f1..dea1e93e6 100644
--- a/ableos/src/relib/image/mono_bitmap.rs
+++ b/ableos/src/relib/image/mono_bitmap.rs
@@ -1,10 +1,8 @@
-use shadeable::pixel_format::new_rgba64;
-
use crate::{
graphics::SCREEN_BUFFER,
relib::encoding::rle::{decode, encode},
};
-// use super::qoi;
+use shadeable::pixel_format::new_rgba64;
pub fn bruh() {
#[rustfmt::skip]
diff --git a/ableos/src/relib/image/stupid_simple_image/mod.rs b/ableos/src/relib/image/stupid_simple_image/mod.rs
deleted file mode 100644
index fd6b2a0a1..000000000
--- a/ableos/src/relib/image/stupid_simple_image/mod.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
-r[255,0,0]
-g[0,0,0]
-b[0,0,0]
-a[0,0,0]
-*/
diff --git a/ableos/src/relib/network/socket.rs b/ableos/src/relib/network/socket.rs
index 0a546f04d..b1187e23b 100644
--- a/ableos/src/relib/network/socket.rs
+++ b/ableos/src/relib/network/socket.rs
@@ -1,3 +1,6 @@
+pub static SOCKETS: spin::Mutex<SocketState> = spin::Mutex::new(vec![]);
+
+pub type SocketState = Vec<SimpleSock>;
pub type Stream = Vec<u8>;
#[derive(Debug)]
@@ -32,9 +35,6 @@ impl Socket for SocketID {
}
}
-pub type SocketState = Vec<SimpleSock>;
-pub static SOCKETS: spin::Mutex<SocketState> = spin::Mutex::new(vec![]);
-
pub trait Socket {
fn peek(&mut self) -> SocketReturns;
@@ -47,6 +47,7 @@ pub trait Socket {
fn close(&mut self) {}
}
+
#[derive(Debug)]
pub enum SocketReturns {
ReadOk(Stream),
@@ -113,6 +114,7 @@ impl Socket for SimpleSock {
}
SocketReturns::ReadOk(return_vec)
}
+
fn read(&mut self, length: usize) -> SocketReturns {
let mut return_vec = vec![];
if length > self.stream.len() {
@@ -125,9 +127,11 @@ impl Socket for SimpleSock {
SocketReturns::ReadOk(return_vec)
}
}
+
fn register_protocol(&mut self, protocol_name: String) {
self.protocol = Some(protocol_name);
}
+
fn check_protocol(&mut self, protocol_name: String) -> bool {
if self.protocol == Some(protocol_name) {
return true;
@@ -135,11 +139,13 @@ impl Socket for SimpleSock {
false
}
+
fn write(&mut self, stream: Stream) -> SocketReturns {
for byte in stream {
self.stream.push(byte);
}
SocketReturns::WriteOk
}
+
fn close(&mut self) {}
}
diff --git a/ableos/src/relib/time/kilotime.rs b/ableos/src/relib/time/kilotime.rs
index c180f9fb9..7774a6167 100644
--- a/ableos/src/relib/time/kilotime.rs
+++ b/ableos/src/relib/time/kilotime.rs
@@ -1,8 +1,27 @@
use super::Time;
use core::fmt::{Display, Error, Formatter};
+
#[derive(Debug, Clone, Copy)]
#[repr(transparent)]
pub struct Kilosecond(usize);
+impl Kilosecond {
+ pub fn from_ms(ms: usize) -> Self {
+ Self(ms)
+ }
+ pub fn from_sec(sec: usize) -> Self {
+ Self(sec * 1000)
+ }
+ pub fn from_minutes(min: usize) -> Self {
+ Self(min * 60 * 1000)
+ }
+ pub fn from_hours(hrs: usize) -> Self {
+ Self(hrs * 60 * 60 * 1000)
+ }
+ pub fn from_days(days: usize) -> Self {
+ Self(days * 24 * 60 * 60 * 1000)
+ }
+}
+
impl Display for Kilosecond {
fn fmt(&self, f: &mut Formatter) -> Result<(), Error> {
let mut reg = self.0;
@@ -36,37 +55,23 @@ impl Display for Kilosecond {
Ok(())
}
}
+
impl core::ops::Add for Kilosecond {
type Output = Self;
fn add(self, rhs: Self) -> Self {
Self(self.0 + rhs.0)
}
}
+
impl core::ops::Sub for Kilosecond {
type Output = Self;
fn sub(self, rhs: Self) -> Self {
Self(self.0 - rhs.0)
}
}
+
impl From<Time> for Kilosecond {
fn from(t: Time) -> Self {
Self((t.hour as usize * 3600 + t.minutes as usize * 60 + t.seconds as usize) * 1000)
}
}
-impl Kilosecond {
- pub fn from_ms(ms: usize) -> Self {
- Self(ms)
- }
- pub fn from_sec(sec: usize) -> Self {
- Self(sec * 1000)
- }
- pub fn from_minutes(min: usize) -> Self {
- Self(min * 60 * 1000)
- }
- pub fn from_hours(hrs: usize) -> Self {
- Self(hrs * 60 * 60 * 1000)
- }
- pub fn from_days(days: usize) -> Self {
- Self(days * 24 * 60 * 60 * 1000)
- }
-}
diff --git a/ableos/src/relib/time/mod.rs b/ableos/src/relib/time/mod.rs
index b4327e156..ff00de823 100644
--- a/ableos/src/relib/time/mod.rs
+++ b/ableos/src/relib/time/mod.rs
@@ -1,3 +1,7 @@
+pub mod kilotime;
+
+use core::fmt;
+
pub struct Time {
pub year: u16,
pub month: u16,
@@ -7,6 +11,7 @@ pub struct Time {
pub seconds: u16,
pub microseconds: u32,
}
+
impl fmt::Display for Time {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(
@@ -16,5 +21,3 @@ impl fmt::Display for Time {
)
}
}
-pub mod kilotime;
-use core::fmt;
diff --git a/ableos/src/rhai_shell/mod.rs b/ableos/src/rhai_shell/mod.rs
index 74e157bf6..31346520b 100644
--- a/ableos/src/rhai_shell/mod.rs
+++ b/ableos/src/rhai_shell/mod.rs
@@ -1,4 +1,20 @@
+use crate::filesystem::FILE_SYSTEM;
+use crate::info::master;
+use crate::time::fetch_time;
+use crate::wasm_jumploader::interp;
+use crate::ALLOCATOR;
+use crate::{
+ arch::{shutdown, sloop},
+ systeminfo::{KERNEL_VERSION, RELEASE_TYPE},
+ KERNEL_STATE,
+};
+use genfs::{Fs, OpenOptions};
+use rhai::Engine;
use spin::Lazy;
+use x86_64::instructions::interrupts::{disable, enable};
+
+pub static KEYBUFF: spin::Mutex<Vec<char>> = spin::Mutex::new(Vec::new());
+pub static CURRENT_DIR: Lazy<spin::Mutex<String>> = Lazy::new(|| spin::Mutex::new("/".to_string()));
#[cfg(target_arch = "riscv64")]
pub fn shell() {}
@@ -41,22 +57,6 @@ pub fn shell() {
}
}
-pub static KEYBUFF: spin::Mutex<Vec<char>> = spin::Mutex::new(Vec::new());
-pub static CURRENT_DIR: Lazy<spin::Mutex<String>> = Lazy::new(|| spin::Mutex::new("/".to_string()));
-
-use rhai::Engine;
-use x86_64::instructions::interrupts::{disable, enable};
-
-use crate::info::master;
-use crate::time::fetch_time;
-use crate::wasm_jumploader::interp;
-use crate::ALLOCATOR;
-use crate::{
- arch::{shutdown, sloop},
- systeminfo::{KERNEL_VERSION, RELEASE_TYPE},
- KERNEL_STATE,
-};
-
pub fn afetch() {
let kstate = KERNEL_STATE.lock();
@@ -82,37 +82,12 @@ pub fn afetch() {
);
drop(kstate);
}
+
pub fn set_hostname(name: String) {
let mut kstate = KERNEL_STATE.lock();
kstate.hostname = name;
}
-fn engine_construction() -> Engine {
- let mut engine = rhai::Engine::new();
-
- engine.on_print(|x| println!("{}", x));
-
- engine.on_debug(|x, src, pos| {
- let src = src.unwrap_or("unknown");
- println!("DEBUG: {} at {:?}: {}", src, pos, x);
- debug!("{} at {:?}: {}", src, pos, x);
- });
-
- engine.register_fn("ls", ls);
- engine.register_fn("cat", echo_file);
- engine.register_fn("cd", change_directory);
- engine.register_fn("afetch", afetch);
- engine.register_fn("set_hostname", set_hostname);
- engine.register_fn("shutdown", shutdown);
- engine.register_fn("peek", peek_memory);
- engine.register_fn("poke", poke_memory);
- engine.register_fn("sloop", sloop);
- engine.register_fn("wasm", interp);
- engine.register_fn("log_dump", log_dump);
-
- engine
-}
-
/// Examine a memory pointer
pub fn peek_memory(ptr: i64) -> u8 {
let ptr: usize = ptr.unsigned_abs() as _;
@@ -166,9 +141,6 @@ pub fn log_dump() {
}
}
-use crate::filesystem::FILE_SYSTEM;
-use genfs::{Fs, OpenOptions};
-
pub fn echo_file(path: String) {
let mut current_dir = CURRENT_DIR.lock();
@@ -218,3 +190,28 @@ pub fn change_directory(path: String) {
current_dir.push_str(&path);
}
}
+
+fn engine_construction() -> Engine {
+ let mut engine = rhai::Engine::new();
+
+ engine.on_print(|x| println!("{}", x));
+ engine.on_debug(|x, src, pos| {
+ let src = src.unwrap_or("unknown");
+ println!("DEBUG: {} at {:?}: {}", src, pos, x);
+ debug!("{} at {:?}: {}", src, pos, x);
+ });
+
+ engine.register_fn("ls", ls);
+ engine.register_fn("cat", echo_file);
+ engine.register_fn("cd", change_directory);
+ engine.register_fn("afetch", afetch);
+ engine.register_fn("set_hostname", set_hostname);
+ engine.register_fn("shutdown", shutdown);
+ engine.register_fn("peek", peek_memory);
+ engine.register_fn("poke", poke_memory);
+ engine.register_fn("sloop", sloop);
+ engine.register_fn("wasm", interp);
+ engine.register_fn("log_dump", log_dump);
+
+ engine
+}
diff --git a/ableos/src/scheduler/capabilities.rs b/ableos/src/scheduler/capabilities.rs
index a490f50b7..2d0bf87e1 100644
--- a/ableos/src/scheduler/capabilities.rs
+++ b/ableos/src/scheduler/capabilities.rs
@@ -54,6 +54,7 @@ pub struct Capabilities {
pub sound_cards: SoundCardAccess,
pub network_access: NetworkAccess,
}
+
impl Capabilities {
/// Generate a set of empty capabilities
pub fn empty() -> Self {
diff --git a/ableos/src/scheduler/mod.rs b/ableos/src/scheduler/mod.rs
index 97d6bc4dc..0b10232b1 100644
--- a/ableos/src/scheduler/mod.rs
+++ b/ableos/src/scheduler/mod.rs
@@ -1,13 +1,15 @@
-use crate::{arch::generate_process_pass, stdio::StdIO};
-
-use crate::scheduler::capabilities::Capabilities;
-
-use kernel::proccess::PID;
pub mod capabilities;
pub mod priority;
pub mod proc;
+
+use crate::scheduler::capabilities::Capabilities;
+use crate::{arch::generate_process_pass, stdio::StdIO};
+use kernel::proccess::PID;
use priority::Priority;
use proc::Process;
+
+pub static SCHEDULER: spin::Mutex<Scheduler> = spin::Mutex::new(Scheduler::new());
+
/// Add additional wake conditions to the list
#[derive(Clone, Debug)]
pub enum WakeCondition {
@@ -34,8 +36,9 @@ pub struct Scheduler {
pub execution_queue: Vec<Process>,
pub sleeping_queue: Vec<BlockedProcess>,
pub blocked_queue: Vec<BlockedProcess>,
- // / All timed processes sorted by wake time
+ // All timed processes sorted by wake time
}
+
impl Scheduler {
/// Create a new scheduler
pub const fn new() -> Self {
@@ -89,5 +92,3 @@ impl Scheduler {
self.execution_queue.remove(0);
}
}
-
-pub static SCHEDULER: spin::Mutex<Scheduler> = spin::Mutex::new(Scheduler::new());
diff --git a/ableos/src/scheduler/proc.rs b/ableos/src/scheduler/proc.rs
index a41239b89..225331b65 100644
--- a/ableos/src/scheduler/proc.rs
+++ b/ableos/src/scheduler/proc.rs
@@ -22,5 +22,3 @@ pub struct Process {
pub working_dir: String,
pub stdio: StdIO,
}
-
-impl Process {}
diff --git a/ableos/src/scratchpad.rs b/ableos/src/scratchpad.rs
index 835db955f..698f6b506 100644
--- a/ableos/src/scratchpad.rs
+++ b/ableos/src/scratchpad.rs
@@ -1,6 +1,23 @@
+use crate::rhai_shell::shell;
use acpi::AcpiTables;
-use crate::rhai_shell::shell;
+// TODO: move to a better place
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct AcpiStruct {}
+impl acpi::AcpiHandler for AcpiStruct {
+ unsafe fn map_physical_region<T>(
+ &self,
+ physical_address: usize,
+ size: usize,
+ ) -> acpi::PhysicalMapping<Self, T> {
+ info!("PHYS ADDR: {:?}", physical_address);
+ info!("Size: {:?}", size);
+ todo!("map_physical_region");
+ }
+ fn unmap_physical_region<T>(_region: &acpi::PhysicalMapping<Self, T>) {
+ todo!("unmap_physical_region");
+ }
+}
/// Experimental scratchpad for testing.
pub fn scratchpad() {
@@ -28,21 +45,3 @@ pub fn acpi() {
_table = AcpiTables::search_for_rsdp_bios(acpi_handler);
}
}
-
-// TODO: move to a better place
-#[derive(Clone, Copy, Debug, PartialEq, Eq)]
-pub struct AcpiStruct {}
-impl acpi::AcpiHandler for AcpiStruct {
- unsafe fn map_physical_region<T>(
- &self,
- physical_address: usize,
- size: usize,
- ) -> acpi::PhysicalMapping<Self, T> {
- info!("PHYS ADDR: {:?}", physical_address);
- info!("Size: {:?}", size);
- todo!("map_physical_region");
- }
- fn unmap_physical_region<T>(_region: &acpi::PhysicalMapping<Self, T>) {
- todo!("unmap_physical_region");
- }
-}
diff --git a/ableos/src/serial_print.rs b/ableos/src/serial_print.rs
index 6b7f7d3f6..aec8c6625 100644
--- a/ableos/src/serial_print.rs
+++ b/ableos/src/serial_print.rs
@@ -1,5 +1,6 @@
-pub struct Serialout;
use core::fmt::{Arguments, Error};
+
+pub struct Serialout;
impl Serialout {
pub fn write_fmt(&mut self, arg: Arguments<'_>) /*-> Result<(), Error> */
{
@@ -7,6 +8,7 @@ impl Serialout {
// Ok(())
}
}
+
impl core::fmt::Write for Serialout {
#[cfg(target_arch = "aarch64")]
fn write_str(&mut self, s: &str) -> Result<(), Error> {
@@ -30,6 +32,7 @@ impl core::fmt::Write for Serialout {
core::fmt::write(&mut self, args)
}
}
+
#[macro_export]
macro_rules! serial_print {
() => {
@@ -39,6 +42,7 @@ macro_rules! serial_print {
::core::write!($crate::serial_print::Serialout, $($tt)*)
};
}
+
#[macro_export]
macro_rules! serial_println {
($($tt:tt)*) => {
diff --git a/ableos/src/stdio.rs b/ableos/src/stdio.rs
index de819781c..7d243c249 100644
--- a/ableos/src/stdio.rs
+++ b/ableos/src/stdio.rs
@@ -37,6 +37,7 @@ impl StdIO {
}
}
}
+
pub fn read(&mut self) {
todo!();
}
diff --git a/ableos/src/tests.rs b/ableos/src/tests.rs
index 07ce4401c..aa1f62bdc 100644
--- a/ableos/src/tests.rs
+++ b/ableos/src/tests.rs
@@ -1,15 +1,14 @@
-use picorand::PicoRandGenerate;
-use rkyv::{ser::serializers::AllocSerializer, Deserialize};
-use shadeable::pixel_format::from_vga_16;
-use vga::colors::Color16;
-use y_compositor_protocol::Version;
-
use crate::{
kmain::KERNEL_CONF,
network::socket::{SimpleSock, Socket, SocketReturns},
num_to_vga16, VgaBuffer, SCREEN_BUFFER,
};
use kernel::TICK;
+use picorand::PicoRandGenerate;
+use rkyv::{ser::serializers::AllocSerializer, Deserialize};
+use shadeable::pixel_format::from_vga_16;
+use vga::colors::Color16;
+use y_compositor_protocol::Version;
pub fn run_tests() {
if KERNEL_CONF.tests.run_tests {
diff --git a/ableos/src/time.rs b/ableos/src/time.rs
index e0cf60f0e..d0f232f82 100644
--- a/ableos/src/time.rs
+++ b/ableos/src/time.rs
@@ -1,3 +1,6 @@
+use core::sync::atomic::Ordering;
+use kernel::TICK;
+
#[cfg(target_arch = "x86_64")]
pub fn fetch_time() -> f64 {
use x86_64::instructions::interrupts::{disable, enable};
@@ -8,8 +11,6 @@ pub fn fetch_time() -> f64 {
time
}
-use core::sync::atomic::Ordering;
-use kernel::TICK;
#[cfg(target_arch = "riscv64")]
pub fn fetch_time() -> f64 {
let time = TICK.load(Ordering::Relaxed) as f64;
diff --git a/ableos/src/unicode_utils.rs b/ableos/src/unicode_utils.rs
index fb9d21f49..22369a2db 100644
--- a/ableos/src/unicode_utils.rs
+++ b/ableos/src/unicode_utils.rs
@@ -1,2 +1,2 @@
-pub const POWER_SIGN: &str = "\u{23FB}";
pub const CONSOLE: &str = "\u{E795}";
+pub const POWER_SIGN: &str = "\u{23FB}";
diff --git a/ableos/src/usb/mod.rs b/ableos/src/usb/mod.rs
index b7a222421..2feda21e4 100644
--- a/ableos/src/usb/mod.rs
+++ b/ableos/src/usb/mod.rs
@@ -1,16 +1,15 @@
//!
-//!
-//!
-//!
-//!
pub enum UsbSpeed {
/// Super-speed functions operate at up to 5 Gb/s.
Super,
+
/// High-speed functions operate at up to 480 Mb/s.
High,
+
/// Full-speed functions operate at up to 12 Mb/s.
Full,
+
/// Low-speed functions operate at up to 1.5 Mb/s.
Low,
}
diff --git a/ableos/src/utils.rs b/ableos/src/utils.rs
index d8de1fa03..b3e9e26dd 100644
--- a/ableos/src/utils.rs
+++ b/ableos/src/utils.rs
@@ -1,12 +1,18 @@
//! Small generic utilities
-//!
-//!
-//!
+
#[inline]
pub fn type_of<T>(_: &T) -> &str {
core::any::type_name::<T>()
}
+#[no_mangle]
+#[allow(unconditional_recursion)]
+pub extern "C" fn stack_overflow() -> u8 {
+ stack_overflow();
+ // meme number
+ 69 // NOTE: Any specific reason for this number aside from memes?
+}
+
#[cfg(test)]
mod tests {
use super::*;
@@ -16,11 +22,3 @@ mod tests {
assert_eq!(type_of(&1), "i32");
}
}
-
-#[no_mangle]
-#[allow(unconditional_recursion)]
-pub extern "C" fn stack_overflow() -> u8 {
- stack_overflow();
- // meme number
- 69 // NOTE: Any specific reason for this number aside from memes?
-}
diff --git a/ableos/src/vga_e.rs b/ableos/src/vga_e.rs
index cf2b584ae..3d41cea14 100644
--- a/ableos/src/vga_e.rs
+++ b/ableos/src/vga_e.rs
@@ -3,17 +3,18 @@ use vga::{
writers::{Graphics640x480x16, GraphicsWriter},
};
+pub static VGAE_BUFF_OFFSET_X: spin::Mutex<u8> = spin::Mutex::new(0);
+pub static VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0);
pub static VGAE: spin::Mutex<Graphics640x480x16> = {
let xyz = Graphics640x480x16::new();
xyz.set_mode();
spin::Mutex::new(xyz)
};
-pub static VGAE_BUFF_OFFSET_X: spin::Mutex<u8> = spin::Mutex::new(0);
-pub static VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0);
/// Converts a number to ... i forgor 💀
-pub fn num_to_vga16(num: u8) -> Color16 {
+pub const fn num_to_vga16(num: u8) -> Color16 {
use Color16::*;
+
match num {
0 => Black,
1 => Blue,
diff --git a/ableos/src/wasm/mod.rs b/ableos/src/wasm/mod.rs
index 4122f4f30..fbc9a869a 100644
--- a/ableos/src/wasm/mod.rs
+++ b/ableos/src/wasm/mod.rs
@@ -1,5 +1,6 @@
/// `NULL a s m` as an array of 4 bytes
pub const WASM_BINARY_MAGIC: [u8; 4] = [0x00, 0x61, 0x73, 0x6d];
+
/// `1 0 0 0` as an array of 4 bytes
pub const WASM_VERSION: [u8; 4] = [0x01, 0x00, 0x00, 0x00];
diff --git a/ableos/src/wasm_jumploader/host_functions.rs b/ableos/src/wasm_jumploader/host_functions.rs
index 6e3db9090..a0c3c43eb 100644
--- a/ableos/src/wasm_jumploader/host_functions.rs
+++ b/ableos/src/wasm_jumploader/host_functions.rs
@@ -1,18 +1,124 @@
+use crate::{arch::generate_process_pass, rhai_shell::KEYBUFF};
use wasmi::{
Error, Externals, FuncInstance, FuncRef, ModuleImportResolver, RuntimeArgs, RuntimeValue,
Signature, Trap, ValueType,
};
-pub struct HostExternals {}
-
const ADD_FUNC_INDEX: usize = 0;
-const SEND_SIGNAL_INDEX: usize = 1;
const GET_TIME_INDEX: usize = 2;
const GET_RANDOM_INDEX: usize = 3;
-
const GET_INPUT_INDEX: usize = 4;
-
const PRINT_CLEVER_HACK: usize = 5;
+const SEND_SIGNAL_INDEX: usize = 1;
+
+pub struct HostExternals;
+impl HostExternals {
+ fn check_signature(&self, index: usize, signature: &Signature) -> bool {
+ match index {
+ ADD_FUNC_INDEX => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) =
+ (&[ValueType::I32, ValueType::I32], Some(ValueType::I32));
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+
+ SEND_SIGNAL_INDEX => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) =
+ (&[ValueType::I32, ValueType::I32], Some(ValueType::I32));
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+
+ GET_TIME_INDEX => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) =
+ (&[], Some(ValueType::I32));
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+
+ GET_RANDOM_INDEX => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) =
+ (&[], Some(ValueType::I32));
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+
+ GET_INPUT_INDEX => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) =
+ (&[], Some(ValueType::I32));
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+
+ PRINT_CLEVER_HACK => {
+ let (params, ret_ty): (&[ValueType], Option<ValueType>) = (&[ValueType::I64], None);
+ if params.len() != signature.params().len() {
+ return false;
+ }
+ if ret_ty != signature.return_type() {
+ return false;
+ }
+ for (ty, param) in params.iter().zip(signature.params()) {
+ if *ty != *param {
+ return false;
+ }
+ }
+ true
+ }
+ _ => false,
+ }
+ }
+}
impl Externals for HostExternals {
fn invoke_index(
@@ -28,6 +134,7 @@ impl Externals for HostExternals {
trace!("SYSCALL: {} + {} = {}", a, b, result);
Ok(Some(RuntimeValue::I32(result as i32)))
}
+
SEND_SIGNAL_INDEX => {
let pid: u32 = args.nth_checked(0)?;
let signal: u32 = args.nth_checked(1)?;
@@ -47,6 +154,7 @@ impl Externals for HostExternals {
let ret = RuntimeValue::I32(tick_time.try_into().unwrap());
Ok(Some(ret))
}
+
GET_RANDOM_INDEX => {
trace!("SYSCALL: get random");
let rand = generate_process_pass();
@@ -91,113 +199,6 @@ impl Externals for HostExternals {
}
}
-use crate::rhai_shell::KEYBUFF;
-
-use crate::arch::generate_process_pass;
-impl HostExternals {
- fn check_signature(&self, index: usize, signature: &Signature) -> bool {
- match index {
- ADD_FUNC_INDEX => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) =
- (&[ValueType::I32, ValueType::I32], Some(ValueType::I32));
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
- SEND_SIGNAL_INDEX => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) =
- (&[ValueType::I32, ValueType::I32], Some(ValueType::I32));
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
- GET_TIME_INDEX => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) =
- (&[], Some(ValueType::I32));
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
- GET_RANDOM_INDEX => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) =
- (&[], Some(ValueType::I32));
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
- GET_INPUT_INDEX => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) =
- (&[], Some(ValueType::I32));
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
-
- PRINT_CLEVER_HACK => {
- let (params, ret_ty): (&[ValueType], Option<ValueType>) = (&[ValueType::I64], None);
- if params.len() != signature.params().len() {
- return false;
- }
- if ret_ty != signature.return_type() {
- return false;
- }
- for (ty, param) in params.iter().zip(signature.params()) {
- if *ty != *param {
- return false;
- }
- }
- true
- }
- _ => false,
- }
- }
-}
-
impl ModuleImportResolver for HostExternals {
fn resolve_func(&self, field_name: &str, signature: &Signature) -> Result<FuncRef, Error> {
let index = match field_name {
@@ -221,8 +222,8 @@ impl ModuleImportResolver for HostExternals {
field_name, signature
)));
}
- trace!("Resolved export {} as func {}", field_name, index);
+ trace!("Resolved export {} as func {}", field_name, index);
Ok(FuncInstance::alloc_host(signature.clone(), index))
}
}
diff --git a/ableos/src/wasm_jumploader/mod.rs b/ableos/src/wasm_jumploader/mod.rs
index aca74b449..12d740fec 100644
--- a/ableos/src/wasm_jumploader/mod.rs
+++ b/ableos/src/wasm_jumploader/mod.rs
@@ -1,13 +1,9 @@
pub mod host_functions;
-extern crate wasmi;
-// extern crate wabt;
-
+use crate::{filesystem::FILE_SYSTEM, wasm_jumploader::host_functions::HostExternals};
use genfs::{Fs, OpenOptions};
use wasmi::{ImportsBuilder, ModuleInstance};
-use crate::{filesystem::FILE_SYSTEM, wasm_jumploader::host_functions::HostExternals};
-
pub fn interp() {
trace!("Interpreting...");
let fs = &*FILE_SYSTEM.lock();
@@ -36,10 +32,8 @@ pub fn interp() {
match instance {
Ok(inst) => {
let instance = inst.assert_no_start();
-
let mut is_driver = false;
let _is_program = false;
-
let mut has_driver_entry = false;
let mut has_driver_exit = false;
let mut has_start = false;
diff --git a/facepalm/src/lib.rs b/facepalm/src/lib.rs
index db88bc3bd..1d140a159 100644
--- a/facepalm/src/lib.rs
+++ b/facepalm/src/lib.rs
@@ -1,7 +1,5 @@
#![no_std]
-// extern crate alloc;
-
use log::*;
pub const VERSION: &str = env!("CARGO_PKG_VERSION");
diff --git a/kernel/src/device_interface/character/mod.rs b/kernel/src/device_interface/character/mod.rs
index 443d12a52..97d405082 100644
--- a/kernel/src/device_interface/character/mod.rs
+++ b/kernel/src/device_interface/character/mod.rs
@@ -4,14 +4,19 @@
pub trait CharacterDevice {
/// Returns true if the device can be read from.
fn can_read(&self) -> bool;
+
/// Returns true if the device can be written to
fn can_write(&self) -> bool;
+
/// Reads a single character from the device
fn read_char(&mut self) -> Option<char>;
+
/// Writes a single character to the device and returns true if the write was successful
fn write_char(&mut self, c: char) -> bool;
+
/// Reset the device to its initial state
fn reset(&mut self);
+
/// initializes the device, returns true if successful
fn initialize(&mut self) -> bool;
}
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index 35cc2605d..55a56b295 100644
--- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs
@@ -1,9 +1,9 @@
+//! The ableOS kernel.
+
#![deny(missing_docs)]
#![no_std]
#![feature(prelude_import)]
-//! The ableOS kernel.
-
pub mod device_interface;
pub mod messaging;
pub mod panic;
@@ -12,9 +12,18 @@ pub mod syscalls;
pub mod time;
use core::sync::atomic::{AtomicU64, Ordering::Relaxed};
-
use versioning::Version;
+/// The number of ticks since the first CPU was started
+pub static TICK: AtomicU64 = AtomicU64::new(0);
+
+/// Kernel's version
+pub const KERNEL_VERSION: Version = Version {
+ major: 0,
+ minor: 1,
+ patch: 2,
+};
+
/// called by arch specific timers to tick up all kernel related functions
pub fn tick() {
let mut data = TICK.load(Relaxed);
@@ -22,13 +31,3 @@ pub fn tick() {
TICK.store(data, Relaxed)
}
-
-/// The number of ticks since the first CPU was started
-pub static TICK: AtomicU64 = AtomicU64::new(0);
-
-///
-pub const KERNEL_VERSION: Version = Version {
- major: 0,
- minor: 1,
- patch: 2,
-};
diff --git a/kernel/src/panic.rs b/kernel/src/panic.rs
index 95c9d989f..98e650309 100644
--- a/kernel/src/panic.rs
+++ b/kernel/src/panic.rs
@@ -1,12 +1,10 @@
-//!
-use core::panic::PanicInfo;
+//! Panic-related stuff
-// #[macro_use]
+use core::panic::PanicInfo;
use log::error;
#[panic_handler]
fn panic_handler(info: &PanicInfo) -> ! {
error!("{}", info);
-
loop {}
}
diff --git a/kernel/src/proccess.rs b/kernel/src/proccess.rs
index 90b9266ae..e8f94ce08 100644
--- a/kernel/src/proccess.rs
+++ b/kernel/src/proccess.rs
@@ -3,11 +3,12 @@
/// A process ID
pub type PID = u64;
-#[repr(C)]
/// Signals that can be sent to a process
+#[repr(C)]
pub enum Signals {
/// Terminate the process
Terminate,
+
/// Shutdown the process and allow it to shutdown cleanly
Quit,
}
diff --git a/kernel/src/syscalls.rs b/kernel/src/syscalls.rs
index 1dd242f32..924201da9 100644
--- a/kernel/src/syscalls.rs
+++ b/kernel/src/syscalls.rs
@@ -1,24 +1,26 @@
//!
use crate::proccess::{Signals, PID};
+
/// All possible system calls
pub enum Syscall {
/// Create a new process and return its PID
CreateProcess,
+
/// Send a signal to a process
SendSignal(PID, Signals),
/// Get the current process ID
GetPID,
+
/// Get the current time
GetTime,
+
/// Set the time
SetTime,
- /*
- ListInodes,
- CreateInode,
- RemoveInode,
- OpenInode,
- CloseInode,
- */
+ // ListInodes,
+ // CreateInode,
+ // RemoveInode,
+ // OpenInode,
+ // CloseInode,
}
diff --git a/shadeable/shaders/simple.shade b/shadeable/shaders/simple.shade
index 2cd1c557a..48e8b2dea 100644
--- a/shadeable/shaders/simple.shade
+++ b/shadeable/shaders/simple.shade
@@ -1,6 +1,5 @@
const VERSION = 0.5;
-
fn main(){
let abcd = RGBA(255, 255, 0, 0);
//print("hi");
diff --git a/shadeable/src/engine_internals.rs b/shadeable/src/engine_internals.rs
index 960a25451..6339c63ed 100644
--- a/shadeable/src/engine_internals.rs
+++ b/shadeable/src/engine_internals.rs
@@ -1,8 +1,8 @@
use crate::pixel_format::{get_a, get_b, get_g, get_r, set_a, set_b, set_g, set_r};
use crate::pixel_format::{rgba_div, Rgba64};
-
use log::{debug, info};
use rhai::Engine;
+use rhai::INT;
pub fn engine_startup() -> Engine {
let mut engine = Engine::new();
@@ -21,17 +21,16 @@ pub fn engine_startup() -> Engine {
.register_fn("RGBA", get_rgba_rhai)
.register_fn("RGBA", get_rgba_from_int)
.register_fn("RGBA", get_rgba_from_int)
- .register_fn("/", rgba_div)
- // .register_fn("*", rgba_mult)
- // .register_fn("+", rgba_add)
- // .register_fn("-", rgba_sub)
- ;
+ .register_fn("/", rgba_div);
+ // .register_fn("*", rgba_mult)
+ // .register_fn("+", rgba_add)
+ // .register_fn("-", rgba_sub)
// engine.register_global_module(RandomPackage::new().as_shared_module());
engine
}
-use rhai::INT;
+
pub fn get_rgba_rhai(r: INT, g: INT, b: INT, a: INT) -> Rgba64 {
let mut pixel = 0;
diff --git a/shadeable/src/lib.rs b/shadeable/src/lib.rs
index e016073fb..12a4dd0be 100644
--- a/shadeable/src/lib.rs
+++ b/shadeable/src/lib.rs
@@ -17,12 +17,9 @@ pub fn evaluate_shader(x: usize, y: usize, pixel: Rgba64) -> Result<Rgba64, Box<
let ast = engine.compile(SHADER)?;
let mut scope = Scope::new();
-
scope.push("PIXEL_RGBA", pixel);
scope.push("PIXEL_X", x);
scope.push("PIXEL_Y", y);
- let result: Rgba64 = engine.call_fn(&mut scope, &ast, "main", ())?;
-
- Ok(result)
+ engine.call_fn(&mut scope, &ast, "main", ())
}
diff --git a/shadeable/src/pixel_format.rs b/shadeable/src/pixel_format.rs
index 8c4bf8bbd..cdff7ac31 100644
--- a/shadeable/src/pixel_format.rs
+++ b/shadeable/src/pixel_format.rs
@@ -1,8 +1,26 @@
use core::ops::{BitAnd, BitOr, Shr};
-// use vga::colors::Color16;
pub type Rgba64 = u64;
+enum ChannelValue {
+ Dark,
+ Low,
+ Mid,
+ High,
+}
+
+impl From<u8> for ChannelValue {
+ fn from(b: u8) -> Self {
+ use ChannelValue::*;
+ match b {
+ 0x00..=0x3f => Dark,
+ 0x40..=0x7f => Low,
+ 0x80..=0xbf => Mid,
+ 0xc0..=0xff => High,
+ }
+ }
+}
+
pub fn get_r(rgba: Rgba64) -> u8 {
rgba.bitand(0xff_00_00_00).shr(0o30) as u8
}
@@ -47,123 +65,3 @@ pub fn rgba_div(a: Rgba64, b: Rgba64) -> Rgba64 {
pub fn new_rgba64(r: u8, g: u8, b: u8, a: u8) -> Rgba64 {
set_r(0, r) | set_g(0, g) | set_b(0, b) | set_a(0, a)
}
-
-enum ChannelValue {
- Dark,
- Low,
- Mid,
- High,
-}
-
-impl From<u8> for ChannelValue {
- fn from(b: u8) -> Self {
- use ChannelValue::*;
- match b {
- 0x00..=0x3f => Dark,
- 0x40..=0x7f => Low,
- 0x80..=0xbf => Mid,
- 0xc0..=0xff => High,
- }
- }
-}
-/*
-
-pub fn into_vga_16(rgba_64: Rgba64) -> Color16 {
- use ChannelValue::*;
- use Color16::*;
- match (
- get_r(rgba_64).into(),
- get_g(rgba_64).into(),
- get_b(rgba_64).into(),
- ) {
- (Dark, Dark, Dark) => Black,
- (Dark, Dark, Low) => Black,
- (Dark, Dark, Mid) => Blue,
- (Dark, Dark, High) => Blue,
- (Dark, Low, Dark) => Black,
- (Dark, Low, Low) => Black,
- (Dark, Low, Mid) => Blue,
- (Dark, Low, High) => Blue,
- (Dark, Mid, Dark) => Green,
- (Dark, Mid, Low) => Green,
- (Dark, Mid, Mid) => Cyan,
- (Dark, Mid, High) => Cyan,
- (Dark, High, Dark) => Green,
- (Dark, High, Low) => Green,
- (Dark, High, Mid) => Green,
- (Dark, High, High) => Cyan,
- (Low, Dark, Dark) => Black,
- (Low, Dark, Low) => Black,
- (Low, Dark, Mid) => Blue,
- (Low, Dark, High) => Blue,
- (Low, Low, Dark) => Black,
- (Low, Low, Low) => DarkGrey,
- (Low, Low, Mid) => LightGrey,
- (Low, Low, High) => Blue,
- (Low, Mid, Dark) => DarkGrey,
- (Low, Mid, Low) => LightGrey,
- (Low, Mid, Mid) => Cyan,
- (Low, Mid, High) => Cyan,
- (Low, High, Dark) => Green,
- (Low, High, Low) => Green,
- (Low, High, Mid) => Cyan,
- (Low, High, High) => Cyan,
- (Mid, Dark, Dark) => Red,
- (Mid, Dark, Low) => Red,
- (Mid, Dark, Mid) => Magenta,
- (Mid, Dark, High) => Magenta,
- (Mid, Low, Dark) => Brown,
- (Mid, Low, Low) => Red,
- (Mid, Low, Mid) => DarkGrey,
- (Mid, Low, High) => LightBlue,
- (Mid, Mid, Dark) => Brown,
- (Mid, Mid, Low) => Brown,
- (Mid, Mid, Mid) => LightGrey,
- (Mid, Mid, High) => LightBlue,
- (Mid, High, Dark) => Green,
- (Mid, High, Low) => Green,
- (Mid, High, Mid) => LightGreen,
- (Mid, High, High) => LightCyan,
- (High, Dark, Dark) => Red,
- (High, Dark, _) => Magenta,
- (High, Low, Dark) => Red,
- (High, Low, Low) => LightRed,
- (High, Low, Mid) => Pink,
- (High, Low, High) => Magenta,
- (High, Mid, Dark) => Yellow,
- (High, Mid, Low) => Yellow,
- (High, Mid, Mid) => LightRed,
- (High, Mid, High) => Pink,
- (High, High, Dark) => Yellow,
- (High, High, Low) => White,
- (High, High, Mid) => White,
- (High, High, High) => White,
- }
-}
-
-pub fn from_vga_16(color: Color16) -> Rgba64 {
- use Color16::*;
- match color {
- Black => new_rgba64(0, 0, 0, 0),
- DarkGrey => new_rgba64(105, 105, 105, 0),
- LightGrey => new_rgba64(211, 211, 211, 0),
- //
- Blue => new_rgba64(0, 0, 0xff, 0),
- Green => new_rgba64(0, 0xff, 0, 0),
- Red => new_rgba64(0xff, 0, 0, 0),
- //
- Yellow => new_rgba64(0xff, 0xff, 0, 0),
- Cyan => new_rgba64(0, 0xff, 0xff, 0),
- Magenta => new_rgba64(0xff, 0, 0xff, 0),
-
- Brown => new_rgba64(165, 42, 42, 0),
- Pink => new_rgba64(0xff, 105, 180, 0),
- White => new_rgba64(0xff, 0xff, 0xff, 0),
-
- LightBlue => new_rgba64(173, 216, 230, 0),
- LightGreen => new_rgba64(144, 238, 144, 0),
- LightCyan => new_rgba64(88, 100, 100, 0),
- LightRed => new_rgba64(0xff, 204, 203, 0),
- }
-}
-*/
diff --git a/userland/lib_syscalls/C/file_calls.c b/userland/lib_syscalls/C/file_calls.c
index cb28beaaa..4a8b0507c 100644
--- a/userland/lib_syscalls/C/file_calls.c
+++ b/userland/lib_syscalls/C/file_calls.c
@@ -1,15 +1,20 @@
enum FSReturns {
/// The system call was successful
Ok,
+
/// The directory can not be created
DirectoryCouldNotBeCreated,
+
/// The directory could not be removed
DirectoryCouldNotBeRemoved,
+
///
FileCouldNotBeCreated,
+
///
FileCouldNotBeRemoved,
/// The file could not be opened
+
FileCouldNotBeOpened,
///
FileCouldNotBeClosed,
@@ -18,12 +23,8 @@ enum FSReturns {
int create_directory(path) {
return DirectoryCouldNotBeCreated;
}
+
///
int remove_directory(path) {
return DirectoryCouldNotBeRemoved;
}
-
-
-
-
-
diff --git a/userland/rname/src/main.rs b/userland/rname/src/main.rs
index 3aa10d092..87fb20fc9 100644
--- a/userland/rname/src/main.rs
+++ b/userland/rname/src/main.rs
@@ -1,7 +1,6 @@
//! An implementation of the uname command.
-//!
-use crate::Arch::*;
+use crate::Arch::*;
use core::fmt;
// an example string "Darwin Roadrunner.local 10.3.0 Darwin Kernel Version 10.3.0: Fri Feb 26 11:58:09 PST 2010; root:xnu-1504.3.12~1/RELEASE_I386 i386"
@@ -9,19 +8,6 @@ pub struct RName {
pub arch: Arch,
}
-fn main() {
- let mut rname_string = "".to_string();
-
- rname_string.push_str("ableOS");
-
- let arch = Some(X86_64);
- if let Some(arch) = arch {
- let fmt_str = format!(" {:?}", arch);
- rname_string.push_str(&fmt_str);
- }
-
- println!("{}", rname_string);
-}
#[derive(Debug, Clone, Copy)]
pub enum Arch {
X86,
@@ -42,3 +28,17 @@ impl fmt::Display for Arch {
write!(f, "{:?}", self)
}
}
+
+fn main() {
+ let mut rname_string = "".to_string();
+
+ rname_string.push_str("ableOS");
+
+ let arch = Some(X86_64);
+ if let Some(arch) = arch {
+ let fmt_str = format!(" {:?}", arch);
+ rname_string.push_str(&fmt_str);
+ }
+
+ println!("{}", rname_string);
+}
diff --git a/userland/wasm_pk_data/src/lib.rs b/userland/wasm_pk_data/src/lib.rs
index 42adb3aef..fc5a01479 100644
--- a/userland/wasm_pk_data/src/lib.rs
+++ b/userland/wasm_pk_data/src/lib.rs
@@ -1,5 +1,7 @@
#![no_std]
+
extern crate alloc;
+
use {
alloc::{string::String, vec::Vec},
serde::Deserialize,
@@ -13,7 +15,7 @@ pub struct Version {
}
#[derive(Debug, Deserialize)]
-pub struct MetaData {
+pub struct Metadata {
pub name: String,
pub version: Version,
pub authors: Vec<String>,