[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/10] pckbd: remove duplicated keyboard and mouse defines
From: |
Volker Rümelin |
Subject: |
[PATCH 10/10] pckbd: remove duplicated keyboard and mouse defines |
Date: |
Wed, 5 May 2021 21:21:33 +0200 |
In 2005 the author of commit daa579632d "PS2 mouse and keyboard
separation (Paul Brook)" and 0e43e99c04 "PS2 mouse and keyboard
separation (Paul Brook)" separated the PS/2 controller code and
the PS/2 keyboard and mouse code. It seems he forgot to remove
a few defines. Remove them now.
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
---
hw/input/pckbd.c | 37 -------------------------------------
1 file changed, 37 deletions(-)
diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index 7c476f7a3e..a386457187 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -61,21 +61,6 @@
#define KBD_CCMD_RESET 0xFE /* Pulse bit 0 of the output port P2 =
CPU reset. */
#define KBD_CCMD_NO_OP 0xFF /* Pulse no bits of the output port
P2. */
-/* Keyboard Commands */
-#define KBD_CMD_SET_LEDS 0xED /* Set keyboard leds */
-#define KBD_CMD_ECHO 0xEE
-#define KBD_CMD_GET_ID 0xF2 /* get keyboard ID */
-#define KBD_CMD_SET_RATE 0xF3 /* Set typematic rate */
-#define KBD_CMD_ENABLE 0xF4 /* Enable scanning */
-#define KBD_CMD_RESET_DISABLE 0xF5 /* reset and disable scanning */
-#define KBD_CMD_RESET_ENABLE 0xF6 /* reset and enable scanning */
-#define KBD_CMD_RESET 0xFF /* Reset */
-
-/* Keyboard Replies */
-#define KBD_REPLY_POR 0xAA /* Power on reset */
-#define KBD_REPLY_ACK 0xFA /* Command ACK */
-#define KBD_REPLY_RESEND 0xFE /* Command NACK, send the cmd again */
-
/* Status Register Bits */
#define KBD_STAT_OBF 0x01 /* Keyboard output buffer full */
#define KBD_STAT_IBF 0x02 /* Keyboard input buffer full */
@@ -108,28 +93,6 @@
*/
#define KBD_OUT_ONES 0xcc
-/* Mouse Commands */
-#define AUX_SET_SCALE11 0xE6 /* Set 1:1 scaling */
-#define AUX_SET_SCALE21 0xE7 /* Set 2:1 scaling */
-#define AUX_SET_RES 0xE8 /* Set resolution */
-#define AUX_GET_SCALE 0xE9 /* Get scaling factor */
-#define AUX_SET_STREAM 0xEA /* Set stream mode */
-#define AUX_POLL 0xEB /* Poll */
-#define AUX_RESET_WRAP 0xEC /* Reset wrap mode */
-#define AUX_SET_WRAP 0xEE /* Set wrap mode */
-#define AUX_SET_REMOTE 0xF0 /* Set remote mode */
-#define AUX_GET_TYPE 0xF2 /* Get type */
-#define AUX_SET_SAMPLE 0xF3 /* Set sample rate */
-#define AUX_ENABLE_DEV 0xF4 /* Enable aux device */
-#define AUX_DISABLE_DEV 0xF5 /* Disable aux device */
-#define AUX_SET_DEFAULT 0xF6
-#define AUX_RESET 0xFF /* Reset aux device */
-#define AUX_ACK 0xFA /* Command byte ACK. */
-
-#define MOUSE_STATUS_REMOTE 0x40
-#define MOUSE_STATUS_ENABLED 0x20
-#define MOUSE_STATUS_SCALE21 0x10
-
#define KBD_PENDING_KBD_V3 0x01
#define KBD_PENDING_AUX_V3 0x02
#define KBD_PENDING_CTRL_KBD 0x04
--
2.26.2
- [PATCH 00/10] PS/2 controller related fixes, Volker Rümelin, 2021/05/05
- [PATCH 03/10] ps2: don't deassert irq twice if queue is empty, Volker Rümelin, 2021/05/05
- [PATCH 02/10] ps2: don't raise an interrupt if queue is full, Volker Rümelin, 2021/05/05
- [PATCH 05/10] pckbd: don't update OBF flags if KBD_STAT_OBF is set, Volker Rümelin, 2021/05/05
- [PATCH 10/10] pckbd: remove duplicated keyboard and mouse defines,
Volker Rümelin <=
- [PATCH 06/10] pckbd: PS/2 keyboard throttle, Volker Rümelin, 2021/05/05
- [PATCH 08/10] pckbd: add controller response queue, Volker Rümelin, 2021/05/05
- [PATCH 04/10] pckbd: split out interrupt line changing code, Volker Rümelin, 2021/05/05
- [PATCH 01/10] ps2: fix mouse stream corruption, Volker Rümelin, 2021/05/05
- [PATCH 09/10] pckbd: correctly disable PS/2 communication, Volker Rümelin, 2021/05/05
- [PATCH 07/10] pckbd: add state variable for interrupt source, Volker Rümelin, 2021/05/05