Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mvme68k Only try to attach those devices which have...
details: https://anonhg.NetBSD.org/src/rev/61f1b10ab7db
branches: trunk
changeset: 499862:61f1b10ab7db
user: scw <scw%NetBSD.org@localhost>
date: Thu Nov 30 22:54:31 2000 +0000
description:
Only try to attach those devices which have been configured
in the kernel config file.
diffstat:
sys/arch/mvme68k/conf/files.mvme68k | 26 +++++++++++-----------
sys/arch/mvme68k/dev/mainbus.c | 7 ++++-
sys/arch/mvme68k/dev/pcc.c | 20 +++++++++++++++++-
sys/arch/mvme68k/dev/pcctwo.c | 41 ++++++++++++++++++++++++++++++++++--
4 files changed, 75 insertions(+), 19 deletions(-)
diffs (261 lines):
diff -r 832dfbb4c2e6 -r 61f1b10ab7db sys/arch/mvme68k/conf/files.mvme68k
--- a/sys/arch/mvme68k/conf/files.mvme68k Thu Nov 30 22:51:35 2000 +0000
+++ b/sys/arch/mvme68k/conf/files.mvme68k Thu Nov 30 22:54:31 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvme68k,v 1.38 2000/11/24 09:42:09 scw Exp $
+# $NetBSD: files.mvme68k,v 1.39 2000/11/30 22:54:31 scw Exp $
# config file for mvme68k
@@ -9,17 +9,17 @@
device mainbus { }
attach mainbus at root
-file arch/mvme68k/dev/mainbus.c mainbus
+file arch/mvme68k/dev/mainbus.c mainbus
# MVME-147 Peripheral Channel Controller
device pcc { [ ipl = -1 ] }
attach pcc at mainbus
-file arch/mvme68k/dev/pcc.c pcc needs-flag
+file arch/mvme68k/dev/pcc.c pcc
# MVME-166,167 and 177 Peripheral Channel Controller Chip2
device pcctwo { [ ipl = -1 ] }
attach pcctwo at mainbus
-file arch/mvme68k/dev/pcctwo.c pcctwo needs-flag
+file arch/mvme68k/dev/pcctwo.c pcctwo
# Grab the MD VMEbus goop
include "dev/vme/files.vme"
@@ -31,12 +31,12 @@
# MVME-147 VME controller chip
device vmepcc: mvmebus, vmebus
attach vmepcc at pcc
-file arch/mvme68k/dev/vme_pcc.c vmepcc
+file arch/mvme68k/dev/vme_pcc.c vmepcc needs-flag
# MVME-1[67]7 VME controller chip
device vmetwo: mvmebus, vmebus
attach vmetwo at mainbus
-file arch/mvme68k/dev/vme_two.c vmetwo
+file arch/mvme68k/dev/vme_two.c vmetwo needs-flag
device clock
attach clock at pcc with clock_pcc
@@ -63,16 +63,16 @@
attach lpt at pcc with lpt_pcc
attach lpt at pcctwo with lpt_pcctwo
file arch/mvme68k/dev/lpt.c lpt needs-flag
-file arch/mvme68k/dev/lpt_pcc.c lpt_pcc
-file arch/mvme68k/dev/lpt_pcctwo.c lpt_pcctwo
+file arch/mvme68k/dev/lpt_pcc.c lpt_pcc needs-flag
+file arch/mvme68k/dev/lpt_pcctwo.c lpt_pcctwo needs-flag
# device defined in sys/conf/files
attach le at pcc with le_pcc: le24
-file arch/mvme68k/dev/if_le.c le_pcc
+file arch/mvme68k/dev/if_le.c le_pcc needs-flag
# i82596 Ethernet Interface on MVME1[67]7
attach ie at pcctwo with ie_pcctwo
-file arch/mvme68k/dev/if_ie.c ie_pcctwo
+file arch/mvme68k/dev/if_ie.c ie_pcctwo needs-flag
# CD2401 Quad Serial Controller
attach clmpcc at pcctwo with clmpcc_pcctwo
@@ -81,7 +81,7 @@
# MVME16x and MVME17x Memory Controller ASICs
device memc
attach memc at pcctwo
-file arch/mvme68k/dev/memc.c memc
+file arch/mvme68k/dev/memc.c memc needs-flag
# Memory disk for boot tape
file dev/md_root.c memory_disk_hooks
@@ -102,7 +102,7 @@
# ... on the MVME-147
device wdsc: sbic, scsi
attach wdsc at pcc with wdsc_pcc
-file arch/mvme68k/dev/wdsc.c wdsc_pcc
+file arch/mvme68k/dev/wdsc.c wdsc_pcc needs-flag
# NCR53C710 SCSI ...
define msiop
@@ -111,7 +111,7 @@
# ... on everything else
device ncrsc: msiop, scsi
attach ncrsc at pcctwo with ncrsc_pcctwo
-file arch/mvme68k/dev/ncrsc_pcctwo.c ncrsc_pcctwo
+file arch/mvme68k/dev/ncrsc_pcctwo.c ncrsc_pcctwo needs-flag
file arch/mvme68k/mvme68k/autoconf.c
file arch/mvme68k/mvme68k/bus_dma.c
diff -r 832dfbb4c2e6 -r 61f1b10ab7db sys/arch/mvme68k/dev/mainbus.c
--- a/sys/arch/mvme68k/dev/mainbus.c Thu Nov 30 22:51:35 2000 +0000
+++ b/sys/arch/mvme68k/dev/mainbus.c Thu Nov 30 22:54:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.5 2000/11/24 09:36:40 scw Exp $ */
+/* $NetBSD: mainbus.c,v 1.6 2000/11/30 22:54:32 scw Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -54,7 +54,6 @@
#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 *));
@@ -77,9 +76,13 @@
#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 832dfbb4c2e6 -r 61f1b10ab7db sys/arch/mvme68k/dev/pcc.c
--- a/sys/arch/mvme68k/dev/pcc.c Thu Nov 30 22:51:35 2000 +0000
+++ b/sys/arch/mvme68k/dev/pcc.c Thu Nov 30 22:54:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcc.c,v 1.15 2000/11/24 09:36:41 scw Exp $ */
+/* $NetBSD: pcc.c,v 1.16 2000/11/30 22:54:32 scw Exp $ */
/*-
* Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -85,6 +85,12 @@
#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
*/
@@ -113,13 +119,25 @@
*/
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 832dfbb4c2e6 -r 61f1b10ab7db sys/arch/mvme68k/dev/pcctwo.c
--- a/sys/arch/mvme68k/dev/pcctwo.c Thu Nov 30 22:51:35 2000 +0000
+++ b/sys/arch/mvme68k/dev/pcctwo.c Thu Nov 30 22:54:31 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pcctwo.c,v 1.7 2000/11/24 09:42:10 scw Exp $ */
+/* $NetBSD: pcctwo.c,v 1.8 2000/11/30 22:54:32 scw Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -54,6 +54,7 @@
#include <mvme68k/dev/pcctworeg.h>
#include <mvme68k/dev/pcctwovar.h>
+
/*
* Autoconfiguration stuff.
*/
@@ -88,19 +89,41 @@
#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},
- {"nvram", PCCTWO_NVRAM_OFF},
+#endif
{NULL, 0}
};
@@ -128,15 +151,27 @@
/*
* 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},
- {"nvram", PCCTWO_NVRAM_OFF},
+#endif
{NULL, 0}
};
Home |
Main Index |
Thread Index |
Old Index