From bf6413046b73005ecca3f5352c8711d00a6d00b9 Mon Sep 17 00:00:00 2001 From: Mats O Jansson Date: Wed, 15 Jan 1997 23:25:34 +0000 Subject: sync with NetBSD 970112 -moj --- sys/arch/vax/stand/boot.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'sys/arch/vax/stand/boot.c') diff --git a/sys/arch/vax/stand/boot.c b/sys/arch/vax/stand/boot.c index 206db3dcf7a..7fd54220f49 100644 --- a/sys/arch/vax/stand/boot.c +++ b/sys/arch/vax/stand/boot.c @@ -1,4 +1,5 @@ -/* $NetBSD: boot.c,v 1.4 1995/09/16 15:54:20 ragge Exp $ */ +/* $OpenBSD: boot.c,v 1.3 1997/01/15 23:24:16 maja Exp $ */ +/* $NetBSD: boot.c,v 1.5 1996/08/02 11:21:49 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. * All rights reserved. @@ -38,6 +39,8 @@ #include "sys/reboot.h" #include "lib/libsa/stand.h" +#define V750UCODE(x) ((x>>8)&255) + #include /* @@ -49,8 +52,9 @@ char line[100]; volatile u_int devtype, bootdev; extern unsigned opendev; +extern unsigned *bootregs; -main() +Xmain() { register howto asm("r11"); register bdev asm("r10"); @@ -149,7 +153,7 @@ copyunix(howto, devtype, aio) hoppabort((x.a_entry&0x7fffffff),howto, devtype, esym); return; shread: - printf("Short read\n"); + printf("\nShort read\n\n"); return; } @@ -191,7 +195,7 @@ loadpcs() if (*cp == ')' || *cp == ':') break; if (*cp) { - strncpy(pcs, line, 99); + bcopy(line, pcs, 99); pcs[99] = 0; i = cp - line + 1; } else -- cgit v1.2.3