summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-16 13:54:03 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-06-16 13:54:03 +0000
commita6d4c925c04ac97dd6d5ec206074b219a30d7864 (patch)
treeca72761d809ec06d00722708e52b8f957a142757
parentb0486b6d37a789ffb5e8c9a4d7b79ba9f9c66414 (diff)
pcvt doesn not recognize IBM Thinkpad keyboards; netbsd pr#2468; jhawk@mit.edu
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_hdr.h3
-rw-r--r--sys/arch/i386/isa/pcvt/pcvt_kbd.c6
2 files changed, 7 insertions, 2 deletions
diff --git a/sys/arch/i386/isa/pcvt/pcvt_hdr.h b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
index 79b5b78b091..c045b465a6b 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_hdr.h
+++ b/sys/arch/i386/isa/pcvt/pcvt_hdr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_hdr.h,v 1.11 1996/05/25 22:17:55 deraadt Exp $ */
+/* $OpenBSD: pcvt_hdr.h,v 1.12 1996/06/16 13:54:01 deraadt Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -278,6 +278,7 @@ in the config file"
#define KEYB_R_MF2ID1 0xab /* MF II Keyboard id-byte #1 */
#define KEYB_R_MF2ID2 0x41 /* MF II Keyboard id-byte #2 */
#define KEYB_R_MF2ID2HP 0x83 /* MF II Keyboard id-byte #2 from HP keybd's */
+#define KEYB_R_MF2ID2TP 0x54 /* MF II Keyboard id-byte #2 from IBM ThinkPad */
/* internal Keyboard Type */
diff --git a/sys/arch/i386/isa/pcvt/pcvt_kbd.c b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
index 1822a2f4af5..9e2b907293e 100644
--- a/sys/arch/i386/isa/pcvt/pcvt_kbd.c
+++ b/sys/arch/i386/isa/pcvt/pcvt_kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcvt_kbd.c,v 1.6 1996/05/25 22:17:58 deraadt Exp $ */
+/* $OpenBSD: pcvt_kbd.c,v 1.7 1996/06/16 13:54:02 deraadt Exp $ */
/*
* Copyright (c) 1992, 1995 Hellmuth Michaelis and Joerg Wunsch.
@@ -533,6 +533,10 @@ r_entry:
{
keyboard_type = KB_MFII;
}
+ else if(response == KEYB_R_MF2ID2TP)
+ {
+ keyboard_type = KB_MFII;
+ }
else
{
printf("\npcvt: doreset() - kbdid, response 2 = [%d]\n",