From 846c54653be9fe4fabf9019a5a2b864af0974f6e Mon Sep 17 00:00:00 2001 From: andromeda Date: Thu, 5 Mar 2026 21:00:18 +0100 Subject: [PATCH] change dev env, format rust --- flake.nix | 5 ++++- src/lib.rs | 22 +++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/flake.nix b/flake.nix index d1aa1e1..81b9289 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,10 @@ }; }; devShells.${system}.default = pkgs.mkShell { - inputsFrom = [self.packages.${system}.default]; + inputsFrom = [ + self.packages.${system}.bootle + self.packages.${system}.bootler + ]; }; }; } diff --git a/src/lib.rs b/src/lib.rs index 18bb65c..adc1aab 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,11 +12,13 @@ pub extern "C" fn _start() -> ! { fn print_serial(s: &str) { let mut bytes = s.bytes(); while let Some(b) = bytes.next() { - unsafe {core::arch::asm!( - "out dx, al" - , in("al") b - )}; - }; + unsafe { + core::arch::asm!( + "out dx, al" + , in("al") b + ) + }; + } } fn println_serial(s: &str) { @@ -28,7 +30,11 @@ fn welcome_serial() { print_serial(ANSI_PINK); println_serial("\nWelcome to Bootle OS"); println_serial("All code GPL licensed and freely available on git.mtgmonkey.net"); - print_serial("Enjoy your time! Press "); print_serial(ANSI_RED); print_serial("ctrl+a x"); print_serial(ANSI_PINK); println_serial(" to escape Qemu"); + print_serial("Enjoy your time! Press "); + print_serial(ANSI_RED); + print_serial("ctrl+a x"); + print_serial(ANSI_PINK); + println_serial(" to escape Qemu"); print_serial(ANSI_CLEAR); } @@ -39,9 +45,7 @@ fn panic(_: &PanicInfo) -> ! { } fn halt() -> ! { - unsafe {core::arch::asm!( - "hlt" - )}; + unsafe { core::arch::asm!("hlt") }; halt() }