d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
fb2539e946
freebsd-dev/sys/i386/boot/biosboot/probe_keyboard.c

123 lines
3.7 KiB
C
Raw Normal View History

Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
/*-
* Copyright (c) 1992-1995 S<EFBFBD>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)
*
Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not ready for it yet.
1997-02-22 09:48:43 +00:00
* $Id$
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
*/
Probe the keyboard if PROBE_KEYBOARD is defined instead of when `notyet' is defined and FORCE_COMCONSOLE isn't defined. Don't compile any keyboard probing code if PROBE_KEYBOARD isn't defined. Makefile: Removed -I paths. They weren't used, and the one to /sys hasn't worked since the source directory was moved down one level.
1996-03-08 06:29:07 +00:00
#ifdef PROBE_KEYBOARD
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
#include <machine/console.h>
#include <machine/cpufunc.h>
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
#include <i386/isa/kbdio.h>
#include <i386/isa/isa.h>
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
#include "boot.h"
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
int
probe_keyboard(void)
{
int i, retries = 5;
unsigned char val;
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
/* flush any noise in the buffer */
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
while (inb(IO_KBD + KBD_STATUS_PORT) & KBDS_BUFFER_FULL) {
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
delay1ms();
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
(void) inb(IO_KBD + KBD_DATA_PORT);
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
}
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
/* Try to reset keyboard hardware */
. Make Poul's boot2 overflow warning less noisy in case the blocks do fit, and beeping in case of an overflow. . Drop a comment about the ``FORCE_COMCONSOLE'' option into README.serial. . Increase the name buffer for the root directory from 100 bytes to 8 KB; this is in no way ideal, but (IMHO) the best that can be done by now. People did encounter problems with their root dir name listing overflowing the allocated buffer space. Once we've got the three-stage boot, we should implement some basic malloc(). Swap space is already getting tight now, perhaps the swap should go into another 64 KB segment instead. . Make the keyboard probe less paranoid. It should not give up in case of a keyboard that's continuously demanding RESEND's. Even though the keyboard reset apparently has not been reported to be complete, it's at the very least proven that there IS something like a keyboard available. This solves problems with the ``Gateway-2000 AllKey programmable'' (sp?) keyboard, that experienced a total hang with the previous probe. Thanks goes to Scott Blachowicz <scott@statsci.com> for his extensive testing of my various interim (debugging) bootblocks to get this working.
1995-04-20 23:15:10 +00:00
again:
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
while (--retries) {
#ifdef DEBUG
printf("%d ", retries);
#endif
Update the bootblocks to use the new definitions that changed in the recent psm/syscons/kbdio code update. Submitted by: Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp>
1996-12-03 03:32:15 +00:00
while ((inb(IO_KBD + KBD_STATUS_PORT) & KBDS_INPUT_BUFFER_FULL)
== KBDS_INPUT_BUFFER_FULL)
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
delay1ms();
outb(IO_KBD + KBD_DATA_PORT, KBDC_RESET_KBD);
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
for (i=0; i<1000; i++) {
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
delay1ms();
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
val = inb(IO_KBD + KBD_DATA_PORT);
if (val == KBD_ACK || val == KBD_ECHO)
Fix a couple of bugs causing false positives
1996-09-26 20:52:13 +00:00
goto gotack;
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
if (val == KBD_RESEND)
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
break;
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
}
}
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
gotres:
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
#ifdef DEBUG
. Make Poul's boot2 overflow warning less noisy in case the blocks do fit, and beeping in case of an overflow. . Drop a comment about the ``FORCE_COMCONSOLE'' option into README.serial. . Increase the name buffer for the root directory from 100 bytes to 8 KB; this is in no way ideal, but (IMHO) the best that can be done by now. People did encounter problems with their root dir name listing overflowing the allocated buffer space. Once we've got the three-stage boot, we should implement some basic malloc(). Swap space is already getting tight now, perhaps the swap should go into another 64 KB segment instead. . Make the keyboard probe less paranoid. It should not give up in case of a keyboard that's continuously demanding RESEND's. Even though the keyboard reset apparently has not been reported to be complete, it's at the very least proven that there IS something like a keyboard available. This solves problems with the ``Gateway-2000 AllKey programmable'' (sp?) keyboard, that experienced a total hang with the previous probe. Thanks goes to Scott Blachowicz <scott@statsci.com> for his extensive testing of my various interim (debugging) bootblocks to get this working.
1995-04-20 23:15:10 +00:00
printf("gotres\n");
#endif
if (!retries) {
#ifdef DEBUG
Fix a couple of bugs causing false positives
1996-09-26 20:52:13 +00:00
printf("gave up\n");
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
#endif
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
return(1);
. Make Poul's boot2 overflow warning less noisy in case the blocks do fit, and beeping in case of an overflow. . Drop a comment about the ``FORCE_COMCONSOLE'' option into README.serial. . Increase the name buffer for the root directory from 100 bytes to 8 KB; this is in no way ideal, but (IMHO) the best that can be done by now. People did encounter problems with their root dir name listing overflowing the allocated buffer space. Once we've got the three-stage boot, we should implement some basic malloc(). Swap space is already getting tight now, perhaps the swap should go into another 64 KB segment instead. . Make the keyboard probe less paranoid. It should not give up in case of a keyboard that's continuously demanding RESEND's. Even though the keyboard reset apparently has not been reported to be complete, it's at the very least proven that there IS something like a keyboard available. This solves problems with the ``Gateway-2000 AllKey programmable'' (sp?) keyboard, that experienced a total hang with the previous probe. Thanks goes to Scott Blachowicz <scott@statsci.com> for his extensive testing of my various interim (debugging) bootblocks to get this working.
1995-04-20 23:15:10 +00:00
}
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
gotack:
delay1ms();
Fix my previous (untested) commit. The probe routine now appears to work again. Something needs to be done about this in 2.2, since the code there doesn't even compile anymore since the syscons/kbdio/psm merge into 2.2.
1996-11-24 08:06:01 +00:00
while ((inb(IO_KBD + KBD_STATUS_PORT) & KBDS_KBD_BUFFER_FULL) == 0)
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
delay1ms();
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
delay1ms();
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
#ifdef DEBUG
printf("ACK ");
#endif
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
val = inb(IO_KBD + KBD_DATA_PORT);
if (val == KBD_ACK)
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
goto gotack;
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
if (val == KBD_RESEND)
. Make Poul's boot2 overflow warning less noisy in case the blocks do fit, and beeping in case of an overflow. . Drop a comment about the ``FORCE_COMCONSOLE'' option into README.serial. . Increase the name buffer for the root directory from 100 bytes to 8 KB; this is in no way ideal, but (IMHO) the best that can be done by now. People did encounter problems with their root dir name listing overflowing the allocated buffer space. Once we've got the three-stage boot, we should implement some basic malloc(). Swap space is already getting tight now, perhaps the swap should go into another 64 KB segment instead. . Make the keyboard probe less paranoid. It should not give up in case of a keyboard that's continuously demanding RESEND's. Even though the keyboard reset apparently has not been reported to be complete, it's at the very least proven that there IS something like a keyboard available. This solves problems with the ``Gateway-2000 AllKey programmable'' (sp?) keyboard, that experienced a total hang with the previous probe. Thanks goes to Scott Blachowicz <scott@statsci.com> for his extensive testing of my various interim (debugging) bootblocks to get this working.
1995-04-20 23:15:10 +00:00
goto again;
Make this compile again after the syscons/psm/kbdio changes that removed the keyboard IO port definitions from <machine/console.h>. Note: I do not have a machine available to test this yet, I sent this for review to several people who have not replied. This is also totally busted in 2.2, which has half of the syscons/psm/kbdio changes in it. This really desperately needs to be tested and fixed in 2.2 as well.
1996-11-23 07:38:25 +00:00
if (val != KBD_RESET_DONE) {
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
#ifdef DEBUG
printf("stray val %d\n", val);
#endif
. Make Poul's boot2 overflow warning less noisy in case the blocks do fit, and beeping in case of an overflow. . Drop a comment about the ``FORCE_COMCONSOLE'' option into README.serial. . Increase the name buffer for the root directory from 100 bytes to 8 KB; this is in no way ideal, but (IMHO) the best that can be done by now. People did encounter problems with their root dir name listing overflowing the allocated buffer space. Once we've got the three-stage boot, we should implement some basic malloc(). Swap space is already getting tight now, perhaps the swap should go into another 64 KB segment instead. . Make the keyboard probe less paranoid. It should not give up in case of a keyboard that's continuously demanding RESEND's. Even though the keyboard reset apparently has not been reported to be complete, it's at the very least proven that there IS something like a keyboard available. This solves problems with the ``Gateway-2000 AllKey programmable'' (sp?) keyboard, that experienced a total hang with the previous probe. Thanks goes to Scott Blachowicz <scott@statsci.com> for his extensive testing of my various interim (debugging) bootblocks to get this working.
1995-04-20 23:15:10 +00:00
return(0);
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
}
#ifdef DEBUG
printf("ok\n");
#endif
Some people have complained that they were unable to boot the Feb. 10th snapshot. The keyboard probe in the bootblock seems to have been singled out as the cause of these problems, so I've beefed it up alittle. This pushes us right up to the edge of the size limit: the second stage boot is now 7152 bytes in size, just 8 bytes under the wire. On the other hand, the new probe now does almost exactly what syscons does, so hopefully this will do the trick. It seems to work properly on my hardware, but then so did the old probe.
1995-03-02 21:00:14 +00:00
return(0);
Submitted by: Bill Paul (wpaul@ctr.columbia.edu) Obtained from: bios boot block changed to allow booting from both the attached graphics display and from a serial port. (A specially compiled serial boot block is no longer necessary.) The boot block should detect the presence or absence of a keyboard: if there is no keyboard, COM1 is turned into the console. This simulates the behavior of the Sun boot PROMs. Unplug your keyboard, attach a terminal to COM1 and you should be ready to go. :)
1995-01-20 07:48:27 +00:00
}
Boot block cleanup. 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.
1995-04-14 21:26:53 +00:00
Probe the keyboard if PROBE_KEYBOARD is defined instead of when `notyet' is defined and FORCE_COMCONSOLE isn't defined. Don't compile any keyboard probing code if PROBE_KEYBOARD isn't defined. Makefile: Removed -I paths. They weren't used, and the one to /sys hasn't worked since the source directory was moved down one level.
1996-03-08 06:29:07 +00:00
#endif /* PROBE_KEYBOARD */
Reference in New Issue Copy Permalink