15c99149f8
o Fix the keyboard probe to properly wait for the ready bit before sending a command to the keyboard controller. This should avoid the problems some people are experiencing where the boot blocks hang the system during keyboard probe. (It does solve it for me.) o Fix a bug that effectively prevented the boot blocks from ever passing control to the serial console. [while(--retries) instead of while(retries--)] o Gratuitously reduced the keyboard probe timeout from 500 to 5 seconds. :) o Introduced a new option ``FORCE_COMCONSOLE'' as a commented-out example in the Makefile, to force the usage of a serial console regardless of a keyboard being connected or not. o Moved all external declarations to boot.h, declared all functions there, and ANSIfied all function declarations/definitions. (printf() remains bogus, however -- i'm too lazy to fix this.) We're in the ninetees, dunno why we should still support compilers from the 70's.
116 lines
3.5 KiB
C
116 lines
3.5 KiB
C
/*-
|
|
* Copyright (c) 1992-1995 Søren Schmidt
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
* All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* William Jolitz and Don Ahn.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* This is a modified version of the keyboard reset code used in syscons.
|
|
* If the keyboard reset fails, we assume that the keyboard has been
|
|
* unplugged and we use a serial port (COM1) as the console instead.
|
|
* Returns 1 on failure (no keyboard), 0 on success (keyboard attached).
|
|
*
|
|
* This grody hack brought to you by Bill Paul (wpaul@ctr.columbia.edu)
|
|
*
|
|
* $Id: probe_keyboard.c,v 1.3 1995/03/02 21:00:14 wpaul Exp $
|
|
*/
|
|
|
|
#ifndef FORCE_COMCONSOLE
|
|
|
|
#include <machine/console.h>
|
|
#include <machine/cpufunc.h>
|
|
#include "boot.h"
|
|
|
|
int
|
|
probe_keyboard(void)
|
|
{
|
|
int i, retries = 5;
|
|
unsigned char val;
|
|
|
|
/* flush any noise in the buffer */
|
|
while (inb(KB_STAT) & KB_BUF_FULL) {
|
|
delay1ms();
|
|
(void) inb(KB_DATA);
|
|
}
|
|
|
|
/* Try to reset keyboard hardware */
|
|
#ifdef DEBUG
|
|
printf("kbd reset\n");
|
|
#endif
|
|
while (--retries) {
|
|
#ifdef DEBUG
|
|
printf("%d ", retries);
|
|
#endif
|
|
while ((inb(KB_STAT) & KB_READY) == KB_READY) delay1ms();
|
|
outb(KB_DATA, KB_RESET);
|
|
for (i=0; i<1000; i++) {
|
|
delay1ms();
|
|
val = inb(KB_DATA);
|
|
if (val == KB_ACK || val == KB_ECHO)
|
|
goto gotres;
|
|
if (val == KB_RESEND)
|
|
break;
|
|
}
|
|
}
|
|
gotres:
|
|
#ifdef DEBUG
|
|
printf("%d after loop.\n", retries);
|
|
#endif
|
|
if (!retries)
|
|
return(1);
|
|
else {
|
|
gotack:
|
|
delay1ms();
|
|
while ((inb(KB_STAT) & KB_BUF_FULL) == 0) delay1ms();
|
|
delay1ms();
|
|
#ifdef DEBUG
|
|
printf("ACK ");
|
|
#endif
|
|
val = inb(KB_DATA);
|
|
if (val == KB_ACK)
|
|
goto gotack;
|
|
if (val != KB_RESET_DONE) {
|
|
#ifdef DEBUG
|
|
printf("stray val %d\n", val);
|
|
#endif
|
|
return(1);
|
|
}
|
|
}
|
|
#ifdef DEBUG
|
|
printf("ok\n");
|
|
#endif
|
|
return(0);
|
|
}
|
|
|
|
#endif /* !FORCE_COMCONSOLE */
|