[SeaBIOS] [PATCH 2/3] When USB keyboard active, don't send keyboard commands to ps2 port.
Kevin O'Connor
kevin at koconnor.net
Sun May 2 04:23:56 CEST 2010
Route keyboard commands to a USB handler when USB keyboard is active.
Add a GETID handler for USB keyboards.
---
src/kbd.c | 11 ++++++++++-
src/mouse.c | 26 ++++++++++++++++----------
src/ps2port.c | 36 +++++++++++++++++++-----------------
src/ps2port.h | 4 ++--
src/usb-hid.c | 23 +++++++++++++++++++++++
src/usb-hid.h | 2 ++
6 files changed, 72 insertions(+), 30 deletions(-)
diff --git a/src/kbd.c b/src/kbd.c
index 36c89fc..1977c5d 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -9,7 +9,8 @@
#include "util.h" // debug_enter
#include "config.h" // CONFIG_*
#include "bregs.h" // struct bregs
-#include "ps2port.h" // kbd_command
+#include "ps2port.h" // ps2_kbd_command
+#include "usb-hid.h" // usb_kbd_command
// Bit definitions for BDA kbd_flag[012]
#define KF0_RSHIFT (1<<0)
@@ -109,6 +110,14 @@ dequeue_key(struct bregs *regs, int incr, int extended)
SET_BDA(kbd_buf_head, buffer_head);
}
+static inline int
+kbd_command(int command, u8 *param)
+{
+ if (usb_kbd_active())
+ return usb_kbd_command(command, param);
+ return ps2_kbd_command(command, param);
+}
+
// read keyboard input
static void
handle_1600(struct bregs *regs)
diff --git a/src/mouse.c b/src/mouse.c
index aba12ad..cc6c4d2 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -9,7 +9,7 @@
#include "util.h" // debug_isr
#include "pic.h" // eoi_pic2
#include "bregs.h" // struct bregs
-#include "ps2port.h" // aux_command
+#include "ps2port.h" // ps2_mouse_command
void
mouse_setup(void)
@@ -21,6 +21,12 @@ mouse_setup(void)
SETBITS_BDA(equipment_list_flags, 0x04);
}
+static inline int
+mouse_command(int command, u8 *param)
+{
+ return ps2_mouse_command(command, param);
+}
+
#define RET_SUCCESS 0x00
#define RET_EINVFUNCTION 0x01
#define RET_EINVINPUT 0x02
@@ -36,7 +42,7 @@ disable_mouse(u16 ebda_seg)
ps2ctr &= ~I8042_CTR_AUXINT;
SET_EBDA2(ebda_seg, ps2ctr, ps2ctr);
- return aux_command(PSMOUSE_CMD_DISABLE, NULL);
+ return mouse_command(PSMOUSE_CMD_DISABLE, NULL);
}
// Disable Mouse
@@ -67,7 +73,7 @@ mouse_15c20001(struct bregs *regs)
ps2ctr |= I8042_CTR_AUXINT;
SET_EBDA2(ebda_seg, ps2ctr, ps2ctr);
- int ret = aux_command(PSMOUSE_CMD_ENABLE, NULL);
+ int ret = mouse_command(PSMOUSE_CMD_ENABLE, NULL);
if (ret)
set_code_invalid(regs, RET_ENEEDRESEND);
else
@@ -96,7 +102,7 @@ static void
mouse_15c201(struct bregs *regs)
{
u8 param[2];
- int ret = aux_command(PSMOUSE_CMD_RESET_BAT, param);
+ int ret = mouse_command(PSMOUSE_CMD_RESET_BAT, param);
if (ret) {
set_code_invalid(regs, RET_ENEEDRESEND);
return;
@@ -116,7 +122,7 @@ mouse_15c202(struct bregs *regs)
return;
}
u8 mouse_data1 = GET_GLOBAL(sample_rates[regs->bh]);
- int ret = aux_command(PSMOUSE_CMD_SETRATE, &mouse_data1);
+ int ret = mouse_command(PSMOUSE_CMD_SETRATE, &mouse_data1);
if (ret)
set_code_invalid(regs, RET_ENEEDRESEND);
else
@@ -137,7 +143,7 @@ mouse_15c203(struct bregs *regs)
return;
}
u8 param = regs->bh;
- int ret = aux_command(PSMOUSE_CMD_SETRES, ¶m);
+ int ret = mouse_command(PSMOUSE_CMD_SETRES, ¶m);
if (ret)
set_code_invalid(regs, RET_ENEEDRESEND);
else
@@ -149,7 +155,7 @@ static void
mouse_15c204(struct bregs *regs)
{
u8 param[2];
- int ret = aux_command(PSMOUSE_CMD_GETID, param);
+ int ret = mouse_command(PSMOUSE_CMD_GETID, param);
if (ret) {
set_code_invalid(regs, RET_ENEEDRESEND);
return;
@@ -179,7 +185,7 @@ static void
mouse_15c20600(struct bregs *regs)
{
u8 param[3];
- int ret = aux_command(PSMOUSE_CMD_GETINFO, param);
+ int ret = mouse_command(PSMOUSE_CMD_GETINFO, param);
if (ret) {
set_code_invalid(regs, RET_ENEEDRESEND);
return;
@@ -194,7 +200,7 @@ mouse_15c20600(struct bregs *regs)
static void
mouse_15c20601(struct bregs *regs)
{
- int ret = aux_command(PSMOUSE_CMD_SETSCALE11, NULL);
+ int ret = mouse_command(PSMOUSE_CMD_SETSCALE11, NULL);
if (ret)
set_code_invalid(regs, RET_ENEEDRESEND);
else
@@ -205,7 +211,7 @@ mouse_15c20601(struct bregs *regs)
static void
mouse_15c20602(struct bregs *regs)
{
- int ret = aux_command(PSMOUSE_CMD_SETSCALE21, NULL);
+ int ret = mouse_command(PSMOUSE_CMD_SETSCALE21, NULL);
if (ret)
set_code_invalid(regs, RET_ENEEDRESEND);
else
diff --git a/src/ps2port.c b/src/ps2port.c
index 47dfd49..f379eb3 100644
--- a/src/ps2port.c
+++ b/src/ps2port.c
@@ -8,7 +8,7 @@
#include "ioport.h" // inb
#include "util.h" // dprintf
#include "biosvar.h" // GET_EBDA
-#include "ps2port.h" // kbd_command
+#include "ps2port.h" // ps2_kbd_command
#include "pic.h" // eoi_pic1
@@ -194,7 +194,7 @@ ps2_sendbyte(int aux, u8 command, int timeout)
}
static int
-ps2_command(int aux, int command, u8 *param)
+__ps2_command(int aux, int command, u8 *param)
{
int ret2;
int receive = (command >> 8) & 0xf;
@@ -296,24 +296,26 @@ fail:
return ret;
}
-int
-kbd_command(int command, u8 *param)
+static int
+ps2_command(int aux, int command, u8 *param)
{
- dprintf(7, "kbd_command cmd=%x\n", command);
- int ret = ps2_command(0, command, param);
+ dprintf(7, "ps2_command aux=%d cmd=%x\n", aux, command);
+ int ret = __ps2_command(aux, command, param);
if (ret)
- dprintf(2, "keyboard command %x failed\n", command);
+ dprintf(2, "ps2 command %x failed (aux=%d)\n", command, aux);
return ret;
}
int
-aux_command(int command, u8 *param)
+ps2_kbd_command(int command, u8 *param)
{
- dprintf(7, "aux_command cmd=%x\n", command);
- int ret = ps2_command(1, command, param);
- if (ret)
- dprintf(2, "mouse command %x failed\n", command);
- return ret;
+ return ps2_command(0, command, param);
+}
+
+int
+ps2_mouse_command(int command, u8 *param)
+{
+ return ps2_command(1, command, param);
}
@@ -413,7 +415,7 @@ keyboard_init(void *data)
/* ------------------- keyboard side ------------------------*/
/* reset keyboard and self test (keyboard side) */
- ret = kbd_command(ATKBD_CMD_RESET_BAT, param);
+ ret = ps2_kbd_command(ATKBD_CMD_RESET_BAT, param);
if (ret)
return;
if (param[0] != 0xaa) {
@@ -422,13 +424,13 @@ keyboard_init(void *data)
}
/* Disable keyboard */
- ret = kbd_command(ATKBD_CMD_RESET_DIS, NULL);
+ ret = ps2_kbd_command(ATKBD_CMD_RESET_DIS, NULL);
if (ret)
return;
// Set scancode command (mode 2)
param[0] = 0x02;
- ret = kbd_command(ATKBD_CMD_SSCANSET, param);
+ ret = ps2_kbd_command(ATKBD_CMD_SSCANSET, param);
if (ret)
return;
@@ -436,7 +438,7 @@ keyboard_init(void *data)
SET_EBDA(ps2ctr, I8042_CTR_AUXDIS | I8042_CTR_XLATE | I8042_CTR_KBDINT);
/* Enable keyboard */
- ret = kbd_command(ATKBD_CMD_ENABLE, NULL);
+ ret = ps2_kbd_command(ATKBD_CMD_ENABLE, NULL);
if (ret)
return;
diff --git a/src/ps2port.h b/src/ps2port.h
index bc04903..afb0e78 100644
--- a/src/ps2port.h
+++ b/src/ps2port.h
@@ -57,8 +57,8 @@
// functions
int i8042_flush(void);
int i8042_command(int command, u8 *param);
-int kbd_command(int command, u8 *param);
-int aux_command(int command, u8 *param);
+int ps2_kbd_command(int command, u8 *param);
+int ps2_mouse_command(int command, u8 *param);
void ps2port_setup(void);
#endif // ps2port.h
diff --git a/src/usb-hid.c b/src/usb-hid.c
index f82965d..bffd81c 100644
--- a/src/usb-hid.c
+++ b/src/usb-hid.c
@@ -9,6 +9,7 @@
#include "config.h" // CONFIG_*
#include "usb.h" // usb_ctrlrequest
#include "biosvar.h" // GET_GLOBAL
+#include "ps2port.h" // ATKBD_CMD_GETID
struct usb_pipe *keyboard_pipe VAR16VISIBLE;
@@ -252,3 +253,25 @@ usb_check_key(void)
handle_key(&data);
}
}
+
+// Test if USB keyboard is active.
+inline int
+usb_kbd_active(void)
+{
+ return GET_GLOBAL(keyboard_pipe) != NULL;
+}
+
+// Handle a ps2 style keyboard command.
+inline int
+usb_kbd_command(int command, u8 *param)
+{
+ switch (command) {
+ case ATKBD_CMD_GETID:
+ // Return the id of a standard AT keyboard.
+ param[0] = 0xab;
+ param[1] = 0x83;
+ return 0;
+ default:
+ return -1;
+ }
+}
diff --git a/src/usb-hid.h b/src/usb-hid.h
index 1c75560..6af4da2 100644
--- a/src/usb-hid.h
+++ b/src/usb-hid.h
@@ -7,7 +7,9 @@ struct usb_pipe;
int usb_keyboard_init(struct usb_pipe *pipe
, struct usb_interface_descriptor *iface, int imax);
void usb_keyboard_setup(void);
+inline int usb_kbd_active(void);
void usb_check_key(void);
+inline int usb_kbd_command(int command, u8 *param);
/****************************************************************
--
1.6.6.1
More information about the SeaBIOS
mailing list