d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Don't wait forever for the boot2 filename if the PCC wraps.

Browse Source 
* If the user presses return, load boot2 immediately.
This commit is contained in:
Doug Rabson 1999-11-03 20:18:12 +00:00
parent 4e449fe462
commit 0296dea15c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/boot/alpha/boot1/boot1.c
View File

@ -163,7 +163,7 @@ devclose()
}
static void
getfilename(char *filename)
getfilename(char *filename, const char *defname)
{
int c;
char *p = filename;
@ -183,6 +183,8 @@ getfilename(char *filename)
}
putchar('\n');
*p = '\0';
if (!*filename)
strcpy(filename, defname);
return;
}
@ -235,9 +237,10 @@ main()
start = rpcc();
freq = ((struct rpb *)HWRPB_ADDR)->rpb_cc_freq;
while (rpcc() < start + freq) {
while (((rpcc() - start) & 0xffffffff) < freq) {
twiddle();
if (ischar()) {
getfilename(filename);
getfilename(filename, name);
name = filename;
break;
}