[src/trunk]: src/sys/arch/mvme68k/dev Revert the previous change, after discu...

[scw <scw%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a891d753a6c
branches:  trunk
changeset: 500017:4a891d753a6c
user:      scw <scw%NetBSD.org@localhost>
date:      Sun Dec 03 15:37:46 2000 +0000

description:
Revert the previous change, after discussion with thorpej and cgd.

diffstat:

 sys/arch/mvme68k/dev/mainbus.c |   7 ++-----
 sys/arch/mvme68k/dev/pcc.c     |  20 +-------------------
 sys/arch/mvme68k/dev/pcctwo.c  |  41 +++--------------------------------------
 3 files changed, 6 insertions(+), 62 deletions(-)

diffs (168 lines):

diff -r c795425e03d1 -r 4a891d753a6c sys/arch/mvme68k/dev/mainbus.c
--- a/sys/arch/mvme68k/dev/mainbus.c    Sun Dec 03 14:49:50 2000 +0000
+++ b/sys/arch/mvme68k/dev/mainbus.c    Sun Dec 03 15:37:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mainbus.c,v 1.6 2000/11/30 22:54:32 scw Exp $  */
+/*     $NetBSD: mainbus.c,v 1.7 2000/12/03 15:37:46 scw Exp $  */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
 
 #include <mvme68k/dev/mainbus.h>
 
+
 void mainbus_attach __P((struct device *, struct device *, void *));
 int mainbus_match __P((struct device *, struct cfdata *, void *));
 int mainbus_print __P((void *, const char *));
@@ -76,13 +77,9 @@
 #endif
 
 #if defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
-#include "vmetwo.h"
-
 static struct mainbus_devices mainbusdevs_1x7[] = {
        {"pcctwo", MAINBUS_PCCTWO_OFFSET},
-#if NVMETWO
        {"vmetwo", MAINBUS_VMETWO_OFFSET},
-#endif
        {NULL, 0}
 };
 #endif
diff -r c795425e03d1 -r 4a891d753a6c sys/arch/mvme68k/dev/pcc.c
--- a/sys/arch/mvme68k/dev/pcc.c        Sun Dec 03 14:49:50 2000 +0000
+++ b/sys/arch/mvme68k/dev/pcc.c        Sun Dec 03 15:37:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcc.c,v 1.16 2000/11/30 22:54:32 scw Exp $     */
+/*     $NetBSD: pcc.c,v 1.17 2000/12/03 15:37:46 scw Exp $     */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -85,12 +85,6 @@
 #include <mvme68k/dev/pccreg.h>
 #include <mvme68k/dev/pccvar.h>
 
-#include "zsc_pcc.h"
-#include "le_pcc.h"
-#include "wdsc_pcc.h"
-#include "lpt_pcc.h"
-#include "vmepcc.h"
-
 /*
  * Autoconfiguration stuff for the PCC chip on mvme147
  */
@@ -119,25 +113,13 @@
  */
 static struct pcc_device pcc_devices[] = {
        {"clock", PCC_RTC_OFF},
-#if 0
        {"nvram", PCC_NVRAM_OFF},
-#endif
-#if NZSC_PCC
        {"zsc", PCC_ZS0_OFF},
        {"zsc", PCC_ZS1_OFF},
-#endif
-#if NLE_PCC
        {"le", PCC_LE_OFF},
-#endif
-#if NWDSC_PCC
        {"wdsc", PCC_WDSC_OFF},
-#endif
-#if NLPT_PCC
        {"lpt", PCC_LPT_OFF},
-#endif
-#if NVMEPCC
        {"vmepcc", PCC_VME_OFF},
-#endif
        {NULL, 0},
 };
 
diff -r c795425e03d1 -r 4a891d753a6c sys/arch/mvme68k/dev/pcctwo.c
--- a/sys/arch/mvme68k/dev/pcctwo.c     Sun Dec 03 14:49:50 2000 +0000
+++ b/sys/arch/mvme68k/dev/pcctwo.c     Sun Dec 03 15:37:46 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcctwo.c,v 1.8 2000/11/30 22:54:32 scw Exp $ */
+/*     $NetBSD: pcctwo.c,v 1.9 2000/12/03 15:37:46 scw Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -54,7 +54,6 @@
 #include <mvme68k/dev/pcctworeg.h>
 #include <mvme68k/dev/pcctwovar.h>
 
-
 /*
  * Autoconfiguration stuff.
  */
@@ -89,41 +88,19 @@
 #define VEC2ICSR_REG(x)                ((x) & 0xff)
 #define VEC2ICSR_INIT(x)       ((x) >> 8)
 
-/*
- * Devices that live on both mvme16x and mvme17x boards.
- */
-#include "memc.h"
-#include "ie_pcctwo.h"
-#include "ncrsc_pcctwo.h"
-
 #if defined(MVME167) || defined(MVME177)
 /*
  * Devices that live on the PCCchip2, attached in this order.
  */
-#include "clmpcc_pcctwo.h"
-#include "lpt_pcctwo.h"
-
 static struct pcctwo_device pcctwo_devices[] = {
        {"clock", PCCTWO_RTC_OFF},
-#if 0
-       {"nvram", PCCTWO_NVRAM_OFF},
-#endif
-#if NMEMC
        {"memc", PCCTWO_MEMC1_OFF},
        {"memc", PCCTWO_MEMC2_OFF},
-#endif
-#if NCLMPCC_PCCTWO
        {"clmpcc", PCCTWO_SCC_OFF},
-#endif
-#if NIE_PCCTWO
        {"ie", PCCTWO_IE_OFF},
-#endif
-#if NNCRSC_PCCTWO
        {"ncrsc", PCCTWO_NCRSC_OFF},
-#endif
-#if NLPT_PCCTWO
        {"lpt", PCCTWO_LPT_OFF},
-#endif
+       {"nvram", PCCTWO_NVRAM_OFF},
        {NULL, 0}
 };
 
@@ -151,27 +128,15 @@
 /*
  * Devices that live on the MCchip, attached in this order.
  */
-#include "zsc_pcctwo.h"
-
 static struct pcctwo_device mcchip_devices[] = {
        {"clock", PCCTWO_RTC_OFF},
-#if 0
-       {"nvram", PCCTWO_NVRAM_OFF},
-#endif
-#if NMEMC
        {"memc", PCCTWO_MEMC1_OFF},
        {"memc", PCCTWO_MEMC2_OFF},
-#endif
-#if NZSC_PCCTWO
        {"zsc", MCCHIP_ZS0_OFF},
        {"zsc", MCCHIP_ZS1_OFF},
-#endif
-#if NIE_PCCTWO
        {"ie", PCCTWO_IE_OFF},
-#endif
-#if NNCRSC_PCCTWO
        {"ncrsc", PCCTWO_NCRSC_OFF},
-#endif
+       {"nvram", PCCTWO_NVRAM_OFF},
        {NULL, 0}
 };