diff --git a/lwcpu/src/lib.rs b/lwcpu/src/lib.rs index eafe0d6..8d85fc7 100644 --- a/lwcpu/src/lib.rs +++ b/lwcpu/src/lib.rs @@ -2,21 +2,21 @@ use core::ptr::{read_volatile, write_volatile}; -pub const BASE_POINTER: u32 = 0x1000_0000; +pub const BASE_POINTER : u32 = 0x1000_0000; -pub const NUMBER_DISPLAY_OFFSET: u32 = 0x00; -pub const RANDOM_NUMBER_OFFSET: u32 = 0x04; -pub const BUTTONS_OFFSET: u32 = 0x08; -pub const TEXT_DISPLAY_OFFSET: u32 = 0x0C; -pub const KEYBOARD_OFFSET: u32 = 0x10; -pub const SCREEN_OFFSET: u32 = 0x80; +pub const NUMBER_DISPLAY_OFFSET : u32 = 0x00; +pub const RANDOM_NUMBER_OFFSET : u32 = 0x04; +pub const BUTTONS_OFFSET : u32 = 0x08; +pub const TEXT_DISPLAY_OFFSET : u32 = 0x0C; +pub const KEYBOARD_OFFSET : u32 = 0x10; +pub const SCREEN_OFFSET : u32 = 0x80; -pub const NUMBER_DISPLAY_POINTER: *mut u32 = (BASE_POINTER + NUMBER_DISPLAY_OFFSET) as *mut u32; -pub const RANDOM_NUMBER_POINTER: *mut u32 = (BASE_POINTER + RANDOM_NUMBER_OFFSET) as *mut u32; -pub const BUTTONS_POINTER: *mut u8 = (BASE_POINTER + BUTTONS_OFFSET) as *mut u8; -pub const TEXT_DISPLAY_POINTER: *mut u8 = (BASE_POINTER + TEXT_DISPLAY_OFFSET) as *mut u8; -pub const KEYBOARD_POINTER: *mut u32 = (BASE_POINTER + KEYBOARD_OFFSET) as *mut u32; -pub const SCREEN_POINTER: *mut u32 = (BASE_POINTER + SCREEN_OFFSET) as *mut u32; +pub const NUMBER_DISPLAY_POINTER : *mut u32 = (BASE_POINTER + NUMBER_DISPLAY_OFFSET) as *mut u32; +pub const RANDOM_NUMBER_POINTER : *mut u32 = (BASE_POINTER + RANDOM_NUMBER_OFFSET) as *mut u32; +pub const BUTTONS_POINTER : *mut u8 = (BASE_POINTER + BUTTONS_OFFSET) as *mut u8; +pub const TEXT_DISPLAY_POINTER : *mut u8 = (BASE_POINTER + TEXT_DISPLAY_OFFSET) as *mut u8; +pub const KEYBOARD_POINTER : *mut u32 = (BASE_POINTER + KEYBOARD_OFFSET) as *mut u32; +pub const SCREEN_POINTER : *mut u32 = (BASE_POINTER + SCREEN_OFFSET) as *mut u32; pub struct Screen {} impl Screen { @@ -91,14 +91,14 @@ impl RNG { pub struct Buttons {} impl Buttons { - pub const RIGHT_RIGHT: u8 = 0b00000001; - pub const RIGHT_DOWN: u8 = 0b00000010; - pub const RIGHT_LEFT: u8 = 0b00000100; - pub const RIGHT_UP: u8 = 0b00001000; - pub const LEFT_RIGHT: u8 = 0b00010000; - pub const LEFT_DOWN: u8 = 0b00100000; - pub const LEFT_LEFT: u8 = 0b01000000; - pub const LEFT_UP: u8 = 0b10000000; + pub const RIGHT_RIGHT : u8 = 0b00000001; + pub const RIGHT_DOWN : u8 = 0b00000010; + pub const RIGHT_LEFT : u8 = 0b00000100; + pub const RIGHT_UP : u8 = 0b00001000; + pub const LEFT_RIGHT : u8 = 0b00010000; + pub const LEFT_DOWN : u8 = 0b00100000; + pub const LEFT_LEFT : u8 = 0b01000000; + pub const LEFT_UP : u8 = 0b10000000; #[inline] pub fn read() -> u8 {