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

* If the user presses return, load boot2 immediately.

1 files changed, 6 insertions, 3 deletions

diff --git a/sys/boot/alpha/boot1/boot1.c b/sys/boot/alpha/boot1/boot1.c
index afae04a..b4dc995 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;
 	}