BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / hp300 / stand / boot.c

diff --git a/usr/src/sys/hp300/stand/boot.c b/usr/src/sys/hp300/stand/boot.c
index fa87a23..e3f600b 100644 (file)
--- a/usr/src/sys/hp300/stand/boot.c
+++ b/usr/src/sys/hp300/stand/boot.c
@@ -1,21 +1,48 @@
-/*
+/*-

  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * %sccs.include.redist.c%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  *
  *

- *     @(#)boot.c      7.2 (Berkeley) %G%
+ *     @(#)boot.c      7.4 (Berkeley) 5/5/91

  */
 
  */
 

+#include <sys/param.h>
+#include <sys/reboot.h>

 #include <a.out.h>
 #include "saio.h"
 #include <a.out.h>
 #include "saio.h"

-#include "sys/reboot.h"

 
 #ifndef INSECURE
 #include "sys/stat.h"
 struct stat sb;
 #endif
 
 #ifndef INSECURE
 #include "sys/stat.h"
 struct stat sb;
 #endif

-
+                                       /* XXX -- see sys/reboot.h */

 #define B_MAKEDEV(a,u,p,t) \
        (((a) << B_ADAPTORSHIFT) | ((u) << B_UNITSHIFT) | \
         ((p) << B_PARTITIONSHIFT) | ((t) << B_TYPESHIFT))
 #define B_MAKEDEV(a,u,p,t) \
        (((a) << B_ADAPTORSHIFT) | ((u) << B_UNITSHIFT) | \
         ((p) << B_PARTITIONSHIFT) | ((t) << B_TYPESHIFT))


@@ -28,15 +55,14 @@ struct stat sb;
 
 /* Types in `devtype' specifying major device */
 char   devname[][2] = {
 
 /* Types in `devtype' specifying major device */
 char   devname[][2] = {

-       0,0,            /* 0 = ct */
-       0,0,            /* 1 = fd */
-       'r','d',        /* 2 = rd */
-       0,0,            /* 3 = sw */
-       's','d',        /* 4 = sd */
+       '\0', '\0',     /* 0 = ct */
+       '\0', '\0',     /* 1 = fd */
+        'r',  'd',     /* 2 = rd */
+       '\0', '\0',     /* 3 = sw */
+        's',  'd',     /* 4 = sd */

 };
 #define        MAXTYPE (sizeof(devname) / sizeof(devname[0]))
 
 };
 #define        MAXTYPE (sizeof(devname) / sizeof(devname[0]))
 

-#define        UNIX    "vmunix"

 char line[100];
 
 int    retry = 0;
 char line[100];
 
 int    retry = 0;