[src/trunk]: src/sys/arch/alpha/alpha Normalize determination of scsiboot and...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1fc40b867202
branches:  trunk
changeset: 486465:1fc40b867202
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Mon May 22 20:09:12 2000 +0000

description:
Normalize determination of scsiboot and netboot.

diffstat:

 sys/arch/alpha/alpha/dec_kn300.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (73 lines):

diff -r aef014183c8c -r 1fc40b867202 sys/arch/alpha/alpha/dec_kn300.c
--- a/sys/arch/alpha/alpha/dec_kn300.c  Mon May 22 19:17:04 2000 +0000
+++ b/sys/arch/alpha/alpha/dec_kn300.c  Mon May 22 20:09:12 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_kn300.c,v 1.14 1999/12/03 22:48:22 thorpej Exp $ */
+/* $NetBSD: dec_kn300.c,v 1.15 2000/05/22 20:09:12 thorpej Exp $ */
 
 /*
  * Copyright (c) 1998 by Matthew Jacob
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.14 1999/12/03 22:48:22 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_kn300.c,v 1.15 2000/05/22 20:09:12 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -180,11 +180,10 @@
                return;
 
        if (!initted) {
-               scsiboot = (strcmp(b->protocol, "scsi") == 0) ||
-                   (strcmp(b->protocol, "SCSI") == 0);
-               netboot = (strcmp(b->protocol, "bootp") == 0) ||
-                   (strcmp(b->protocol, "mop") == 0);
-#if    BDEBUG
+               scsiboot = (strcmp(b->protocol, "SCSI") == 0);
+               netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+                   (strcmp(b->protocol, "MOP") == 0);
+#ifdef BDEBUG
                printf("proto:%s bus:%d slot:%d chan:%d", b->protocol,
                    b->bus, b->slot, b->channel);
                if (b->remote_address)
@@ -209,7 +208,7 @@
                                return;
        
                        pcidev = dev;
-#if    BDEBUG
+#ifdef BDEBUG
                        printf("\npcidev = %s\n", pcidev->dv_xname);
 #endif
                        return;
@@ -228,7 +227,7 @@
                        /* XXX function? */
        
                        scsidev = dev;
-#if    BDEBUG
+#ifdef BDEBUG
                        printf("\nscsidev = %s\n", scsidev->dv_xname);
 #endif
 
@@ -261,7 +260,7 @@
 
                /* we've found it! */
                booted_device = dev;
-#if    BDEBUG
+#ifdef BDEBUG
                printf("\nbooted_device = %s\n", booted_device->dv_xname);
 #endif
                found = 1;
@@ -279,8 +278,9 @@
                        /* XXX function? */
        
                        booted_device = dev;
-#if    BDEBUG
-                       printf("\nbooted_device = %s\n", booted_device->dv_xname);
+#ifdef BDEBUG
+                       printf("\nbooted_device = %s\n",
+                           booted_device->dv_xname);
 #endif
                        found = 1;
                        return;