2002-09-28 04:31:17

by Bjorn Helgaas

[permalink] [raw]
Subject: [PATCH] pc_keyb.c: hook for keybd controller detection

This patch adds the ability for architecture-specific code to
determine whether a keyboard controller is present (IA64 uses
ACPI to figure this out).

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.666 -> 1.667
# drivers/char/pc_keyb.c 1.12 -> 1.13
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/16 [email protected] 1.667
# Add hook so arch-specific code can determine whether
# keyboard controller is present.
# --------------------------------------------
#
diff -Nru a/drivers/char/pc_keyb.c b/drivers/char/pc_keyb.c
--- a/drivers/char/pc_keyb.c Mon Sep 16 16:39:24 2002
+++ b/drivers/char/pc_keyb.c Mon Sep 16 16:39:24 2002
@@ -69,6 +69,9 @@
static int aux_reconnect = 0;
#endif

+#ifndef kbd_controller_present
+#define kbd_controller_present() 1
+#endif
static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
static unsigned char handle_kbd_event(void);

@@ -895,6 +898,11 @@

void __init pckbd_init_hw(void)
{
+ if (!kbd_controller_present()) {
+ kbd_exists = 0;
+ return;
+ }
+
kbd_request_region();

/* Flush any pending input. */