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/boot/tmscp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'sys/arch/vax/boot/tmscp.c') diff --git a/sys/arch/vax/boot/tmscp.c b/sys/arch/vax/boot/tmscp.c index f5d0fe11879..b63022212f7 100644 --- a/sys/arch/vax/boot/tmscp.c +++ b/sys/arch/vax/boot/tmscp.c @@ -1,4 +1,4 @@ -/* $NetBSD: tmscp.c,v 1.2 1996/02/17 18:23:24 ragge Exp $ */ +/* $NetBSD: tmscp.c,v 1.3 1996/08/02 11:22:53 ragge Exp $ */ /* * Copyright (c) 1995 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -43,7 +43,8 @@ #include "../include/macros.h" #include "../uba/ubareg.h" #include "../uba/udareg.h" -#include "../vax/mscp.h" +#include "../mscp/mscp.h" +#include "../mscp/mscpreg.h" #include "vaxstand.h" @@ -63,7 +64,7 @@ struct ra_softc { }; static volatile struct uda { - struct uda1ca uda_ca; /* communications area */ + struct mscp_1ca uda_ca; /* communications area */ struct mscp uda_rsp; /* response packets */ struct mscp uda_cmd; /* command packets */ } uda; @@ -100,14 +101,14 @@ tmscpopen(f, adapt, ctlr, unit, part) * Init of this tmscp ctlr. */ udacsr->udaip=0; /* Start init */ - while((udacsr->udasa&UDA_STEP1) == 0); + while((udacsr->udasa&MP_STEP1) == 0); udacsr->udasa=0x8000; - while((udacsr->udasa&UDA_STEP2) == 0); + while((udacsr->udasa&MP_STEP2) == 0); johan=(((u_int)ubauda)&0xffff)+8; udacsr->udasa=johan; - while((udacsr->udasa&UDA_STEP3) == 0); + while((udacsr->udasa&MP_STEP3) == 0); udacsr->udasa=3; - while((udacsr->udasa&UDA_STEP4) == 0); + while((udacsr->udasa&MP_STEP4) == 0); udacsr->udasa=0x0001; uda.uda_ca.ca_rspdsc=(int)&ubauda->uda_rsp.mscp_cmdref; -- cgit v1.2.3