summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Rabson <dfr@FreeBSD.org>1999-11-03 20:18:12 +0000
committerDoug Rabson <dfr@FreeBSD.org>1999-11-03 20:18:12 +0000
commit0296dea15cc0fc298b9935a4c29b2930605ca025 (patch)
tree39d4b33bf6e9caa79f0bb66c5ba4720a34d3f585
parent4e449fe462e937ddf95cfa43732e629e49f22f8f (diff)
Notes
-rw-r--r--sys/boot/alpha/boot1/boot1.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index afae04afb06a..b4dc9956cebd 100644
--- a/sys/boot/alpha/boot1/boot1.c
+++ b/sys/boot/alpha/boot1/boot1.c
@@ -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;
}