vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Assertions in PS/2 driver

Browse source
This commit is contained in:
Jeremy Soller 2016-09-01 21:01:38 -06:00
parent 3d79c653bd
commit 7a4c5de2ae
1 changed files with 36 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

75
arch/x86_64/src/device/ps2.rs
View file

@ -199,37 +199,30 @@ impl Ps2 {
// Perform the self test // Perform the self test
self.command(Command::TestController); self.command(Command::TestController);
let self_test = self.read(); assert_eq!(self.read(), 0x55);
if self_test != 0x55 {
// TODO: Do reset on failure
print!("PS/2 Self Test Failure: {:X}\n", self_test);
return;
}
// Enable devices // Enable devices
self.command(Command::EnableFirst); self.command(Command::EnableFirst);
self.command(Command::EnableSecond); self.command(Command::EnableSecond);
// Reset and enable scanning on keyboard // Reset and enable scanning on keyboard
// TODO: Check for ack assert_eq!(self.keyboard_command(KeyboardCommand::Reset), 0xFA);
print!("KEYBOARD RESET {:X}\n", self.keyboard_command(KeyboardCommand::Reset)); assert_eq!(self.read(), 0xAA);
print!("KEYBOARD RESET RESULT {:X} == 0xAA\n", self.read());
self.flush_read(); self.flush_read();
// Reset and enable scanning on mouse // Reset and enable scanning on mouse
// TODO: Check for ack // TODO: Check for ack
print!("MOUSE RESET {:X}\n", self.mouse_command(MouseCommand::Reset)); assert_eq!(self.mouse_command(MouseCommand::Reset), 0xFA);
print!("MOUSE RESET RESULT {:X} == 0xAA\n", self.read()); assert_eq!(self.read(), 0xAA);
print!("MOUSE RESET ID {:X} == 0x00\n", self.read()); assert_eq!(self.read(), 0x00);
self.flush_read(); self.flush_read();
// Enable extra packet on mouse // Enable extra packet on mouse
print!("SAMPLE 200 {:X}\n", self.mouse_command_data(MouseCommandData::SetSampleRate, 200)); assert_eq!(self.mouse_command_data(MouseCommandData::SetSampleRate, 200), 0xFA);
print!("SAMPLE 100 {:X}\n", self.mouse_command_data(MouseCommandData::SetSampleRate, 100)); assert_eq!(self.mouse_command_data(MouseCommandData::SetSampleRate, 100), 0xFA);
print!("SAMPLE 80 {:X}\n", self.mouse_command_data(MouseCommandData::SetSampleRate, 80)); assert_eq!(self.mouse_command_data(MouseCommandData::SetSampleRate, 80), 0xFA);
print!("GET ID {:X}\n", self.mouse_command(MouseCommand::GetDeviceId)); assert_eq!(self.mouse_command(MouseCommand::GetDeviceId), 0xFA);
let mouse_id = self.read(); let mouse_id = self.read();
print!("MOUSE ID: {:X} == 0x03\n", mouse_id);
self.mouse_extra = mouse_id == 3; self.mouse_extra = mouse_id == 3;
// Enable extra buttons, TODO // Enable extra buttons, TODO
@ -245,11 +238,11 @@ impl Ps2 {
*/ */
// Set sample rate to maximum // Set sample rate to maximum
print!("SAMPLE 200 {:X}\n", self.mouse_command_data(MouseCommandData::SetSampleRate, 200)); assert_eq!(self.mouse_command_data(MouseCommandData::SetSampleRate, 200), 0xFA);
// Enable data reporting // Enable data reporting
print!("KEYBOARD ENABLE {:X}\n", self.keyboard_command(KeyboardCommand::EnableReporting)); assert_eq!(self.keyboard_command(KeyboardCommand::EnableReporting), 0xFA);
print!("MOUSE ENABLE {:X}\n", self.mouse_command(MouseCommand::EnableReporting)); assert_eq!(self.mouse_command(MouseCommand::EnableReporting), 0xFA);
// Enable clocks and interrupts // Enable clocks and interrupts
{ {
@ -275,29 +268,33 @@ impl Ps2 {
let flags = MousePacketFlags::from_bits_truncate(self.mouse[0]); let flags = MousePacketFlags::from_bits_truncate(self.mouse[0]);
let mut dx = self.mouse[1] as isize; assert!(flags.contains(ALWAYS_ON));
if flags.contains(X_SIGN) {
dx -= 0x100;
}
let mut dy = self.mouse[2] as isize; if ! flags.contains(X_OVERFLOW) && ! flags.contains(Y_OVERFLOW) {
if flags.contains(Y_SIGN) { let mut dx = self.mouse[1] as isize;
dy -= 0x100; if flags.contains(X_SIGN) {
} dx -= 0x100;
}
let _extra = if self.mouse_extra { let mut dy = self.mouse[2] as isize;
self.mouse[3] if flags.contains(Y_SIGN) {
} else { dy -= 0x100;
0 }
};
//print!("MOUSE {:?}, {}, {}, {}\n", flags, dx, dy, extra); let _extra = if self.mouse_extra {
self.mouse[3]
} else {
0
};
if let Some(ref mut display) = *super::display::DISPLAY.lock() { //print!("MOUSE {:?}, {}, {}, {}\n", flags, dx, dy, extra);
self.mouse_x = cmp::max(0, cmp::min(display.width as isize - 1, self.mouse_x as isize + dx)) as usize;
self.mouse_y = cmp::max(0, cmp::min(display.height as isize - 1, self.mouse_y as isize - dy)) as usize; if let Some(ref mut display) = *super::display::DISPLAY.lock() {
let offset = self.mouse_y * display.width + self.mouse_x; self.mouse_x = cmp::max(0, cmp::min(display.width as isize - 1, self.mouse_x as isize + dx)) as usize;
display.onscreen[offset as usize] = 0xFF0000; self.mouse_y = cmp::max(0, cmp::min(display.height as isize - 1, self.mouse_y as isize - dy)) as usize;
let offset = self.mouse_y * display.width + self.mouse_x;
display.onscreen[offset as usize] = 0xFF0000;
}
} }
} }
} }