summaryrefslogtreecommitdiffstats
path: root/rsnix/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--rsnix/src/interrupts.rs2
-rw-r--r--rsnix/src/lib.rs8
-rw-r--r--rsnix/src/ps2.rs7
3 files changed, 8 insertions, 9 deletions
diff --git a/rsnix/src/interrupts.rs b/rsnix/src/interrupts.rs
index 8f2acd7..66dc59f 100644
--- a/rsnix/src/interrupts.rs
+++ b/rsnix/src/interrupts.rs
@@ -362,7 +362,7 @@ pub fn init() {
362 362
363 // Build the IDTR pseudo-descriptor. 363 // Build the IDTR pseudo-descriptor.
364 IDTR = [ 364 IDTR = [
365 ((256u16 * 16 - 1)), // limit = 256*16 - 1 365 (256u16 * 16 - 1), // limit = 256*16 - 1
366 idt_ptr as u16, // base lo 366 idt_ptr as u16, // base lo
367 (idt_ptr as u64 >> 16) as u16, // base mid 367 (idt_ptr as u64 >> 16) as u16, // base mid
368 (idt_ptr as u64 >> 32) as u16, // base hi 368 (idt_ptr as u64 >> 32) as u16, // base hi
diff --git a/rsnix/src/lib.rs b/rsnix/src/lib.rs
index 6c7fb3c..0bc0cb9 100644
--- a/rsnix/src/lib.rs
+++ b/rsnix/src/lib.rs
@@ -2,10 +2,10 @@
2 2
3extern crate alloc; 3extern crate alloc;
4 4
5pub mod uefi;
6pub mod serial;
7pub mod gop;
8pub mod font; 5pub mod font;
9pub mod ps2; 6pub mod gop;
10pub mod interrupts; 7pub mod interrupts;
11pub mod memory; 8pub mod memory;
9pub mod ps2;
10pub mod serial;
11pub mod uefi;
diff --git a/rsnix/src/ps2.rs b/rsnix/src/ps2.rs
index b83a4e0..477d146 100644
--- a/rsnix/src/ps2.rs
+++ b/rsnix/src/ps2.rs
@@ -346,10 +346,9 @@ fn update_modifiers(scancode: u8, pressed: bool, e0: bool) {
346 (0x1D, true) => set_mod(state, MOD_RCTRL, pressed), 346 (0x1D, true) => set_mod(state, MOD_RCTRL, pressed),
347 (0x38, false) => set_mod(state, MOD_LALT, pressed), 347 (0x38, false) => set_mod(state, MOD_LALT, pressed),
348 (0x38, true) => set_mod(state, MOD_RALT, pressed), 348 (0x38, true) => set_mod(state, MOD_RALT, pressed),
349 (0x3A, false) 349 (0x3A, false) if pressed => {
350 if pressed => { 350 state.modifiers ^= MOD_CAPS;
351 state.modifiers ^= MOD_CAPS; 351 }
352 }
353 _ => {} 352 _ => {}
354 } 353 }
355} 354}