BSD 4_3_Net_2 release

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

diff --git a/usr/src/sys/hp300/stand/machdep.c b/usr/src/sys/hp300/stand/machdep.c
index 68f8d76..5e96089 100644 (file)
--- a/usr/src/sys/hp300/stand/machdep.c
+++ b/usr/src/sys/hp300/stand/machdep.c
@@ -7,11 +7,37 @@
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
  *

- * %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.

  *
  * from: Utah $Hdr: machdep.c 1.6 88/05/24$
  *
  *
  * from: Utah $Hdr: machdep.c 1.6 88/05/24$
  *

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

  */
 
 #include "sys/param.h"
  */
 
 #include "sys/param.h"


@@ -60,22 +86,17 @@ trap(fp)
        if (intrap)
                return;
        intrap = 1;
        if (intrap)
                return;
        intrap = 1;

-       romprintf("Got unexpected trap, vector = %x, ps = %x, pc = %x\n",
+       printf("Got unexpected trap, vector = %x, ps = %x, pc = %x\n",

               fp->frame&0xFFF, fp->sr, fp->pc);
               fp->frame&0xFFF, fp->sr, fp->pc);

-       romprintf("dregs: %x %x %x %x %x %x %x %x\n",
+       printf("dregs: %x %x %x %x %x %x %x %x\n",

               fp->dregs[0], fp->dregs[1], fp->dregs[2], fp->dregs[3], 
               fp->dregs[4], fp->dregs[5], fp->dregs[6], fp->dregs[7]);
               fp->dregs[0], fp->dregs[1], fp->dregs[2], fp->dregs[3], 
               fp->dregs[4], fp->dregs[5], fp->dregs[6], fp->dregs[7]);

-       romprintf("aregs: %x %x %x %x %x %x %x %x\n",
+       printf("aregs: %x %x %x %x %x %x %x %x\n",

               fp->aregs[0], fp->aregs[1], fp->aregs[2], fp->aregs[3], 
               fp->aregs[4], fp->aregs[5], fp->aregs[6], fp->aregs[7]);
        intrap = 0;
 }
 
               fp->aregs[0], fp->aregs[1], fp->aregs[2], fp->aregs[3], 
               fp->aregs[4], fp->aregs[5], fp->aregs[6], fp->aregs[7]);
        intrap = 0;
 }
 

-nodev()
-{
-       return(0);
-}
-

 #ifdef ROMPRF
 #define ROWS   46
 #define COLS   128
 #ifdef ROMPRF
 #define ROWS   46
 #define COLS   128