Monadic-Cat/ableos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into fix/rhai-repl

Browse source
This commit is contained in:
able 2022-02-20 11:06:56 +00:00
parent c49eb97397 ca743955c5
commit 9273d74446
14 changed files with 793 additions and 796 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ableos/src/experiments/y_compositor/mod.rs
View file

@ -1,3 +1,3 @@
//! //!
pub mod window;
pub mod compositor; pub mod compositor;
pub mod window;

4
ableos/src/keyboard/abstractions/custom_scancode_set.rs
View file

@ -1,4 +1,6 @@
use crate::{KeyCode, ScancodeSet, DecodeState, KeyEvent, Error, KeyState, keyboard::EXTENDED_KEY_CODE}; use crate::{
keyboard::EXTENDED_KEY_CODE, DecodeState, Error, KeyCode, KeyEvent, KeyState, ScancodeSet,
};
pub struct CustomScancodeSet { pub struct CustomScancodeSet {
single_byte: [Option<KeyCode>; 256], single_byte: [Option<KeyCode>; 256],

6
ableos/src/keyboard/abstractions/layout_entry.rs
View file

@ -78,8 +78,7 @@ impl LayoutEntry {
} }
#[must_use] #[must_use]
pub fn common(self, c: impl Into<DecodedKey> + Clone) -> Self { pub fn common(self, c: impl Into<DecodedKey> + Clone) -> Self {
self self.unshifted(c.clone())
.unshifted(c.clone())
.shifted(c.clone()) .shifted(c.clone())
.locked(c.clone()) .locked(c.clone())
.locked_shifted(c) .locked_shifted(c)
@ -94,8 +93,7 @@ impl LayoutEntry {
} }
#[must_use] #[must_use]
pub fn all(self, c: impl Into<DecodedKey> + Clone) -> Self { pub fn all(self, c: impl Into<DecodedKey> + Clone) -> Self {
self self.unshifted(c.clone())
.unshifted(c.clone())
.shifted(c.clone()) .shifted(c.clone())
.locked(c.clone()) .locked(c.clone())
.locked_shifted(c.clone()) .locked_shifted(c.clone())

3
ableos/src/relib/encoding/bin.rs
View file

@ -1,5 +1,4 @@
use alloc::{boxed::Box}; use alloc::boxed::Box;
pub struct BinCodeWriter { pub struct BinCodeWriter {
pub stream: Box<u8>, pub stream: Box<u8>,

1
ableos/src/vga_e.rs
View file

@ -20,7 +20,6 @@ lazy_static::lazy_static! {
pub static ref VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0); pub static ref VGAE_BUFF_OFFSET_Y: spin::Mutex<u8> = spin::Mutex::new(0);
} }
/// Converts a number to ... i forgor 💀 /// Converts a number to ... i forgor 💀
pub fn num_to_vga16(num: u8) -> Color16 { pub fn num_to_vga16(num: u8) -> Color16 {
use Color16::*; use Color16::*;

6
repbuild/src/main.rs
View file

@ -55,7 +55,8 @@ fn main() -> anyhow::Result<()> {
).run()?; ).run()?;
} }
MachineType::RISCV => { MachineType::RISCV => {
xshell::cmd!("cargo build --release --target=riscv64gc-unknown-none-elf").run()?; xshell::cmd!("cargo build --release --target=riscv64gc-unknown-none-elf")
.run()?;
#[rustfmt::skip] #[rustfmt::skip]
xshell::cmd!( xshell::cmd!(
"qemu-system-riscv64 "qemu-system-riscv64
@ -78,7 +79,8 @@ fn main() -> anyhow::Result<()> {
xshell::cmd!("cargo doc --open").run()?; xshell::cmd!("cargo doc --open").run()?;
} }
MachineType::ARM => { MachineType::ARM => {
xshell::cmd!("cargo doc --open --target=json_targets/aarch64-ableos.json").run()?; xshell::cmd!("cargo doc --open --target=json_targets/aarch64-ableos.json")
.run()?;
} }
MachineType::RISCV => { MachineType::RISCV => {
xshell::cmd!("cargo doc --open --target=riscv64gc-unknown-none-elf").run()?; xshell::cmd!("cargo doc --open --target=riscv64gc-unknown-none-elf").run()?;

9
shadeable/src/pixel_format.rs
View file

@ -19,20 +19,17 @@ pub fn get_a(rgba: Rgba64) -> u8 {
} }
pub fn set_r(rgba: Rgba64, r: u8) -> Rgba64 { pub fn set_r(rgba: Rgba64, r: u8) -> Rgba64 {
rgba rgba.bitand(0xffffffff_00_ff_ff_ff)
.bitand(0xffffffff_00_ff_ff_ff)
.bitor((r as Rgba64).shr(0o30)) .bitor((r as Rgba64).shr(0o30))
} }
pub fn set_g(rgba: Rgba64, g: u8) -> Rgba64 { pub fn set_g(rgba: Rgba64, g: u8) -> Rgba64 {
rgba rgba.bitand(0xffffffff_ff_00_ff_ff)
.bitand(0xffffffff_ff_00_ff_ff)
.bitor((g as Rgba64).shr(0o20)) .bitor((g as Rgba64).shr(0o20))
} }
pub fn set_b(rgba: Rgba64, b: u8) -> Rgba64 { pub fn set_b(rgba: Rgba64, b: u8) -> Rgba64 {
rgba rgba.bitand(0xffffffff_ff_ff_00_ff)
.bitand(0xffffffff_ff_ff_00_ff)
.bitor((b as Rgba64).shr(0o10)) .bitor((b as Rgba64).shr(0o10))
} }