From ea4461a2eca5a80002692aeb8a63964ac360a58f Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Sat, 10 Jun 2000 19:53:24 +0000
Subject: better ifdef

---
 sys/arch/mvme68k/dev/vs.c    | 24 ++++++++++++------------
 sys/arch/mvme68k/dev/vsdma.c |  4 ++--
 sys/arch/mvme68k/dev/vsreg.h |  8 ++++----
 3 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'sys')

diff --git a/sys/arch/mvme68k/dev/vs.c b/sys/arch/mvme68k/dev/vs.c
index c57eb483c54..933ea6b5820 100644
--- a/sys/arch/mvme68k/dev/vs.c
+++ b/sys/arch/mvme68k/dev/vs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vs.c,v 1.1 2000/01/25 04:18:17 smurph Exp $ */
+/*	$OpenBSD: vs.c,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -54,18 +54,18 @@
 #include <machine/param.h>
 
 #define PAGESIZE 4096  /* should get this out of a header? XXX - smurph */
-#if defined(MVME187) || defined(MVME188) || defined(MVME197)
-   #include <mvme88k/dev/vsreg.h>
-   #include <mvme88k/dev/vsvar.h>
-   #include "machine/mmu.h"
-   #define ROUND_PAGE m88k_round_page
-   #define TRUNC_PAGE m88k_trunc_page
+#ifdef __m88k_
+#include <mvme88k/dev/vsreg.h>
+#include <mvme88k/dev/vsvar.h>
+#include "machine/mmu.h"
+#define ROUND_PAGE m88k_round_page
+#define TRUNC_PAGE m88k_trunc_page
 #else
-   #include <mvme68k/dev/vsreg.h>
-   #include <mvme68k/dev/vsvar.h>
-   #define ROUND_PAGE m68k_round_page
-   #define TRUNC_PAGE m68k_trunc_page
-#endif /* defined(MVME187) || defined(MVME188) || defined(MVME197) */
+#include <mvme68k/dev/vsreg.h>
+#include <mvme68k/dev/vsvar.h>
+#define ROUND_PAGE m68k_round_page
+#define TRUNC_PAGE m68k_trunc_page
+#endif
 
 int  vs_checkintr        __P((struct vs_softc *, struct scsi_xfer *, int *));
 int  vs_chksense         __P((struct scsi_xfer *));
diff --git a/sys/arch/mvme68k/dev/vsdma.c b/sys/arch/mvme68k/dev/vsdma.c
index 2158eb3e0d2..da8a05fc5f9 100644
--- a/sys/arch/mvme68k/dev/vsdma.c
+++ b/sys/arch/mvme68k/dev/vsdma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsdma.c,v 1.1 2000/01/25 04:18:18 smurph Exp $ */
+/*	$OpenBSD: vsdma.c,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * All rights reserved.
@@ -46,7 +46,7 @@
 #include <scsi/scsiconf.h>
 #include <machine/autoconf.h>
 
-#if defined(MVME187) || defined(MVME188) || defined(MVME197)
+#ifdef __m88k__
 #include <machine/board.h>
 #include <mvme88k/dev/vsreg.h>
 #include <mvme88k/dev/vsvar.h>
diff --git a/sys/arch/mvme68k/dev/vsreg.h b/sys/arch/mvme68k/dev/vsreg.h
index 7fdf8107745..299e0203949 100644
--- a/sys/arch/mvme68k/dev/vsreg.h
+++ b/sys/arch/mvme68k/dev/vsreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsreg.h,v 1.1 2000/01/25 04:18:18 smurph Exp $ */
+/*	$OpenBSD: vsreg.h,v 1.2 2000/06/10 19:53:23 deraadt Exp $ */
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
  * Copyright (c) 1990 The Regents of the University of California.
@@ -178,12 +178,12 @@ typedef struct {
    unsigned short  :3;
    unsigned short  transfer_type :2;
    /* 				0x0 is reserved */
-   #define SHORT_TREANSFER 		0x1	
+   #define SHORT_TRANSFER 			0x1	
    #define LONG_TRANSFER			0x2	
    #define SCATTER_GATTER_LIST_IN_SHORT_IO	0x3	
    unsigned short  memory_type :2;
-   #define NORMAL_TYPE			0x0	
-   #define BLOCK_MODE			0x1	
+   #define NORMAL_TYPE				0x0	
+   #define BLOCK_MODE				0x1	
    /*				0x2 is reserved */
    /*				0x3 is reserved */
    unsigned short  address_modifier :8;
-- 
cgit v1.2.3