Skip to content

Fix keyboard and mouse to properly follow ps2 protocol #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiranchandrasekhar merged 5 commits into from
Apr 22, 2025
Merged

Fix keyboard and mouse to properly follow ps2 protocol #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a004a8f
Fix keyboard and mouse to properly follow ps2 protocol
amerikrainian Apr 19, 2025
562267b
Async keyboard again
kiranchandrasekhar Apr 22, 2025
7eecb7d
Rust version naked function change
kiranchandrasekhar Apr 22, 2025
48109e0
Reintroduce unecessary unsafe
kiranchandrasekhar Apr 22, 2025
d0afe28
try lock
kiranchandrasekhar Apr 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions kernel/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions kernel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ futures-util = { version = "0.3.31", default-features = false, features = [
"async-await-macro",
"futures-macro",
] }
ps2 = "0.2.0"
219 changes: 0 additions & 219 deletions kernel/src/devices/keyboard.rs
View file
Open in desktop

This file was deleted.

6 changes: 2 additions & 4 deletions kernel/src/devices/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ use sd_card::{find_sd_card, initalize_sd_card};
use xhci::{find_xhci_inferface, initalize_xhci_hub};
pub mod graphics;
use graphics::framebuffer::{self, colors};
pub mod keyboard;
pub mod mmio;
pub mod mouse;
pub mod pci;
pub mod ps2_dev;
pub mod sd_card;
pub mod serial;
pub mod xhci;
Expand Down Expand Up @@ -74,7 +73,6 @@ pub fn init(cpu_id: u32) {
find_xhci_inferface(&devices).expect("Build system currently sets up xhci device");
initalize_xhci_hub(&xhci_device).unwrap();

keyboard::init().expect("Failed to initialize keyboard");
mouse::init().expect("Failed to initialize mouse");
ps2_dev::init();
}
}
Loading