From 0296dea15cc0fc298b9935a4c29b2930605ca025 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Wed, 3 Nov 1999 20:18:12 +0000 Subject: [PATCH] * Don't wait forever for the boot2 filename if the PCC wraps. * If the user presses return, load boot2 immediately. --- sys/boot/alpha/boot1/boot1.c | 9 ++++++--- 1 file 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; }