Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Move the arm32/pci files into the cats dir. AFAIK ...
details: https://anonhg.NetBSD.org/src/rev/add3964fac79
branches: trunk
changeset: 521954:add3964fac79
user: chris <chris%NetBSD.org@localhost>
date: Sat Feb 09 12:14:01 2002 +0000
description:
Move the arm32/pci files into the cats dir. AFAIK these files are only used by cats.
diffstat:
sys/arch/arm32/pci/pcib.c | 140 ------------------------------------
sys/arch/arm32/pci/pciide_machdep.c | 78 --------------------
sys/arch/cats/cats/cats_machdep.c | 5 +-
sys/arch/cats/conf/files.cats | 6 +-
sys/arch/cats/pci/pcib.c | 140 ++++++++++++++++++++++++++++++++++++
sys/arch/cats/pci/pciide_machdep.c | 78 ++++++++++++++++++++
6 files changed, 225 insertions(+), 222 deletions(-)
diffs (truncated from 498 to 300 lines):
diff -r 5d842dd0c856 -r add3964fac79 sys/arch/arm32/pci/pcib.c
--- a/sys/arch/arm32/pci/pcib.c Sat Feb 09 11:53:58 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/* $NetBSD: pcib.c,v 1.4 2002/02/09 11:43:29 chris Exp $ */
-
-/*-
- * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Jason R. Thorpe.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * from: i386/pci/pcib.c,v 1.12
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <machine/bus.h>
-
-#include <dev/isa/isavar.h>
-
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pcireg.h>
-
-#include <dev/pci/pcidevs.h>
-
-#include "isadma.h"
-
-int pcibmatch __P((struct device *, struct cfdata *, void *));
-void pcibattach __P((struct device *, struct device *, void *));
-
-struct cfattach pcib_ca = {
- sizeof(struct device), pcibmatch, pcibattach
-};
-
-void pcib_callback __P((struct device *));
-int pcib_print __P((void *, const char *));
-
-int
-pcibmatch(parent, match, aux)
- struct device *parent;
- struct cfdata *match;
- void *aux;
-{
- struct pci_attach_args *pa = aux;
-
- /*
- * Match tested PCI-ISA bridges.
- */
- switch (PCI_VENDOR(pa->pa_id)) {
- case PCI_VENDOR_ALI:
- switch (PCI_PRODUCT(pa->pa_id)) {
- case PCI_PRODUCT_ALI_M1543:
- return (1);
- }
- break;
- }
-
- return (0);
-}
-
-void
-pcibattach(parent, self, aux)
- struct device *parent, *self;
- void *aux;
-{
- struct pci_attach_args *pa = aux;
- char devinfo[256];
-
- printf("\n");
-
- /*
- * Just print out a description and set the ISA bus
- * callback.
- */
- pci_devinfo(pa->pa_id, pa->pa_class, 0, devinfo);
- printf("%s: %s (rev. 0x%02x)\n", self->dv_xname, devinfo,
- PCI_REVISION(pa->pa_class));
-
- /* Set the ISA bus callback */
- config_defer(self, pcib_callback);
-}
-
-void
-pcib_callback(self)
- struct device *self;
-{
- struct isabus_attach_args iba;
-
- /*
- * Attach the ISA bus behind this bridge.
- */
- memset(&iba, 0, sizeof(iba));
- iba.iba_busname = "isa";
- iba.iba_iot = &isa_io_bs_tag;
- iba.iba_memt = &isa_mem_bs_tag;
-#if NISADMA > 0
- iba.iba_dmat = &isa_bus_dma_tag;
-#endif
- config_found(self, &iba, pcib_print);
-}
-
-int
-pcib_print(aux, pnp)
- void *aux;
- const char *pnp;
-{
-
- /* Only ISAs can attach to pcib's; easy. */
- if (pnp)
- printf("isa at %s", pnp);
- return (UNCONF);
-}
diff -r 5d842dd0c856 -r add3964fac79 sys/arch/arm32/pci/pciide_machdep.c
--- a/sys/arch/arm32/pci/pciide_machdep.c Sat Feb 09 11:53:58 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/* $NetBSD: pciide_machdep.c,v 1.5 2002/02/09 11:43:29 chris Exp $ */
-
-/*
- * Copyright (c) 1998 Christopher G. Demetriou. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Christopher G. Demetriou
- * for the NetBSD Project.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * PCI IDE controller driver (arm32 machine-dependent portion).
- *
- * Author: Christopher G. Demetriou, March 2, 1998 (derived from NetBSD
- * sys/dev/pci/ppb.c, revision 1.16).
- *
- * See "PCI IDE Controller Specification, Revision 1.0 3/4/94" from the
- * PCI SIG.
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/device.h>
-
-#include <dev/pci/pcireg.h>
-#include <dev/pci/pcivar.h>
-#include <dev/pci/pciidereg.h>
-#include <dev/pci/pciidevar.h>
-
-#include <dev/isa/isavar.h>
-#include <machine/intr.h>
-#include "isa.h"
-
-void *
-pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
- struct device *dev;
- struct pci_attach_args *pa;
- int chan;
- int (*func) __P((void *));
- void *arg;
-{
-#if NISA > 0
- int irq;
- void *cookie;
-
- irq = PCIIDE_COMPAT_IRQ(chan);
- cookie = isa_intr_establish(NULL, irq, IST_EDGE, IPL_BIO, func, arg);
- if (cookie == NULL)
- return (NULL);
- printf("%s: %s channel interrupting at irq %d\n", dev->dv_xname,
- PCIIDE_CHANNEL_NAME(chan), irq);
- return (cookie);
-#else
- panic("pciide_machdep_compat_intr_establish() called\n");
-#endif
-}
diff -r 5d842dd0c856 -r add3964fac79 sys/arch/cats/cats/cats_machdep.c
--- a/sys/arch/cats/cats/cats_machdep.c Sat Feb 09 11:53:58 2002 +0000
+++ b/sys/arch/cats/cats/cats_machdep.c Sat Feb 09 12:14:01 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cats_machdep.c,v 1.12 2002/01/25 19:19:28 thorpej Exp $ */
+/* $NetBSD: cats_machdep.c,v 1.13 2002/02/09 12:14:02 chris Exp $ */
/*
* Copyright (c) 1997,1998 Mark Brinicombe.
@@ -733,6 +733,9 @@
#ifdef DDB
db_machine_init();
#ifdef __ELF__
+ /* ok this is really rather sick, in ELF what happens is that the
+ * ELF symbol table is added after the text section.
+ */
ddb_init(0, NULL, NULL); /* XXX */
#else
{
diff -r 5d842dd0c856 -r add3964fac79 sys/arch/cats/conf/files.cats
--- a/sys/arch/cats/conf/files.cats Sat Feb 09 11:53:58 2002 +0000
+++ b/sys/arch/cats/conf/files.cats Sat Feb 09 12:14:01 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.cats,v 1.15 2002/02/02 18:37:43 jdolecek Exp $
+# $NetBSD: files.cats,v 1.16 2002/02/09 12:14:02 chris Exp $
#
# First try for arm-specific configuration info
#
@@ -112,7 +112,7 @@
device pcib: isabus
attach pcib at pci
-file arch/arm32/pci/pcib.c pcib
+file arch/cats/pci/pcib.c pcib
# XXX THE FOLLOWING BLOCK SHOULD GO INTO dev/pci/files.pci, BUT CANNOT
# XXX BECAUSE NOT 'lpt' IS DEFINED IN files.isa, RATHER THAN files.
@@ -122,7 +122,7 @@
attach lpt at puc with lpt_puc
file dev/pci/lpt_puc.c lpt_puc
-file arch/arm32/pci/pciide_machdep.c pciide
+file arch/cats/pci/pciide_machdep.c pciide
# Include USB stuff
include "dev/usb/files.usb"
diff -r 5d842dd0c856 -r add3964fac79 sys/arch/cats/pci/pcib.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/cats/pci/pcib.c Sat Feb 09 12:14:01 2002 +0000
@@ -0,0 +1,140 @@
+/* $NetBSD: pcib.c,v 1.1 2002/02/09 12:14:02 chris Exp $ */
+
+/*-
+ * Copyright (c) 1996, 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
Home |
Main Index |
Thread Index |
Old Index