From: Pekka Enberg <penberg@kernel.org>
Date: Thu, 2 Jun 2011 10:24:41 +0000 (+0300)
Subject: kvm tools: Use constants for i8042 register numbers
X-Git-Tag: next-20110824~3^2~234
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=025f209f95783c8725602232491f0e58ce258a3c;p=karo-tx-linux.git

kvm tools: Use constants for i8042 register numbers

Cc: Ingo Molnar <mingo@elte.hu>
Cc: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
---

diff --git a/tools/kvm/hw/i8042.c b/tools/kvm/hw/i8042.c
index 80f0d18e8470..de0e73b3c24e 100644
--- a/tools/kvm/hw/i8042.c
+++ b/tools/kvm/hw/i8042.c
@@ -10,9 +10,18 @@
 #include <rfb/rfb.h>
 #include <stdint.h>
 
+/*
+ * IRQs
+ */
 #define KBD_IRQ			1
 #define AUX_IRQ			12
 
+/*
+ * Registers
+ */
+#define I8042_DATA_REG		0x60
+#define I8042_COMMAND_REG	0x64
+
 #define CMD_READ_MODE		0x20
 #define CMD_WRITE_MODE		0x60
 #define CMD_WRITE_AUX_BUF	0xD3
@@ -438,7 +447,7 @@ static bool kbd_in(struct ioport *ioport, struct kvm *kvm, u16 port, void *data,
 {
 	u32 result;
 
-	if (port == 0x64) {
+	if (port == I8042_COMMAND_REG) {
 		result = kbd_read_status();
 		ioport__write8(data, (char)result);
 	} else {
@@ -453,7 +462,7 @@ static bool kbd_in(struct ioport *ioport, struct kvm *kvm, u16 port, void *data,
  */
 static bool kbd_out(struct ioport *ioport, struct kvm *kvm, u16 port, void *data, int size, u32 count)
 {
-	if (port == 0x64)
+	if (port == I8042_COMMAND_REG)
 		kbd_write_command(*((u32 *)data));
 	else
 		kbd_write_data(*((u32 *)data));
@@ -470,6 +479,6 @@ void kbd__init(struct kvm *kvm)
 {
 	kbd_reset();
 	state.kvm = kvm;
-	ioport__register(0x60, &kbd_ops, 2, NULL);
-	ioport__register(0x64, &kbd_ops, 2, NULL);
+	ioport__register(I8042_DATA_REG, &kbd_ops, 2, NULL);
+	ioport__register(I8042_COMMAND_REG, &kbd_ops, 2, NULL);
 }