summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChander Sudanthi <chander.sudanthi@arm.com>2012-06-05 01:23:10 -0400
committerChander Sudanthi <chander.sudanthi@arm.com>2012-06-05 01:23:10 -0400
commite60b2ac7060eff8dd6d68c7f92ef220511e7daa2 (patch)
tree99742b5761cc2deaf0b436f04bc6b87c98abb99f /src
parent70d7d6cc7f7c25d43f0dc56fe133073eb4a97298 (diff)
downloadgem5-e60b2ac7060eff8dd6d68c7f92ef220511e7daa2.tar.xz
ARM: PS2 encoding fix
Fixed Disable encoding and added SetDefaults. See http://wiki.osdev.org/Mouse_Input for encodings.
Diffstat (limited to 'src')
-rw-r--r--src/dev/arm/kmi.cc1
-rw-r--r--src/dev/ps2.hh3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/dev/arm/kmi.cc b/src/dev/arm/kmi.cc
index 92b5ee8cb..c90e00125 100644
--- a/src/dev/arm/kmi.cc
+++ b/src/dev/arm/kmi.cc
@@ -212,6 +212,7 @@ Pl050::processCommand(uint8_t byte)
// fall through
case Disable:
case Enable:
+ case SetDefaults:
rxQueue.push_back(Ack);
break;
case StatusRequest:
diff --git a/src/dev/ps2.hh b/src/dev/ps2.hh
index 73f3f9cd8..f1ddb522e 100644
--- a/src/dev/ps2.hh
+++ b/src/dev/ps2.hh
@@ -62,7 +62,8 @@ enum {
Ack = 0xfa,
SetRate = 0xf3,
Enable = 0xf4,
- Disable = 0xf6,
+ Disable = 0xf5,
+ SetDefaults = 0xf6,
KeyboardId = 0xab,
TouchKitId = 0x0a,
MouseId = 0x00,