diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-03 09:10:29 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1996-05-03 09:10:29 +0000 |
| commit | 595cbd2e050401adf0cab2bab6ce52f902dfbb54 (patch) | |
| tree | 8474c159022572bb93d15b7f2c287d1044321bc1 /sys/arch/vax/stand/bootxx.c | |
| parent | 3472e7ae763d3e453e57b218243b6d60ece25b43 (diff) | |
sync w/ 0430
Diffstat (limited to 'sys/arch/vax/stand/bootxx.c')
| -rw-r--r-- | sys/arch/vax/stand/bootxx.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/sys/arch/vax/stand/bootxx.c b/sys/arch/vax/stand/bootxx.c index b60d7e7931c..4a1b34f83d6 100644 --- a/sys/arch/vax/stand/bootxx.c +++ b/sys/arch/vax/stand/bootxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: bootxx.c,v 1.4 1995/10/20 13:35:43 ragge Exp $ */ +/* $NetBSD: bootxx.c,v 1.5 1996/02/17 18:23:21 ragge Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. * All rights reserved. @@ -41,15 +41,15 @@ #include "lib/libsa/stand.h" #include "lib/libsa/ufs.h" -#include "../mba/mbareg.h" -#include "../mba/hpreg.h" - #include "../include/pte.h" #include "../include/sid.h" #include "../include/mtpr.h" #include "../include/reg.h" #include "../include/rpb.h" +#include "../mba/mbareg.h" +#include "../mba/hpreg.h" + #define NRSP 0 /* Kludge */ #define NCMD 0 /* Kludge */ #include "../uba/ubareg.h" @@ -197,6 +197,10 @@ getbootdev() is_tmscp = 1; /* use tape spec in mscp routines */ break; + case 64: + major = 8; + break; + default: printf("Unsupported boot device %d, trying anyway.\n", bootdev); boothowto |= (RB_SINGLE | RB_ASKNAME); @@ -236,7 +240,7 @@ devopen(f, fname, file) char line[64]; f->f_dev = &devsw[0]; - *file = fname; + *file = (char *)fname; /* * On uVAX we need to init [T]MSCP ctlr to be able to use it. @@ -382,7 +386,7 @@ hpread(block, size, buf) pfnum = (u_int) buf >> PGSHIFT; for (mapnr = 0, nsize = size; (nsize + NBPG) > 0; nsize -= NBPG) - mr->mba_map[mapnr++] = PG_V | pfnum++; + *(int *)&mr->mba_map[mapnr++] = PG_V | pfnum++; mr->mba_var = ((u_int) buf & PGOFSET); mr->mba_bc = (~size) + 1; bn = block; |