Module Name: src
Committed By: rkujawa
Date: Wed Jan 11 17:04:29 UTC 2012
Modified Files:
src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL files.amiga
src/sys/arch/amiga/pci: p5pbreg.h
Added Files:
src/sys/arch/amiga/pci: cv3dpb.c cv3dpbreg.h cv3dpbvar.h
Log Message:
Add cv3dpb, a driver for CyberVision64/3D PCI bridge, which was split from p5pb.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.279 -r1.280 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/amiga/conf/INSTALL
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/amiga/conf/files.amiga
cvs rdiff -u -r0 -r1.1 src/sys/arch/amiga/pci/cv3dpb.c \
src/sys/arch/amiga/pci/cv3dpbreg.h src/sys/arch/amiga/pci/cv3dpbvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/p5pbreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.149 src/sys/arch/amiga/conf/DRACO:1.150
--- src/sys/arch/amiga/conf/DRACO:1.149 Tue Jan 10 20:29:49 2012
+++ src/sys/arch/amiga/conf/DRACO Wed Jan 11 17:04:29 2012
@@ -1,9 +1,9 @@
-# $NetBSD: DRACO,v 1.149 2012/01/10 20:29:49 rkujawa Exp $
+# $NetBSD: DRACO,v 1.150 2012/01/11 17:04:29 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.149 $"
+#ident "GENERIC-$Revision: 1.150 $"
maxusers 8
Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.279 src/sys/arch/amiga/conf/GENERIC:1.280
--- src/sys/arch/amiga/conf/GENERIC:1.279 Tue Jan 10 20:29:49 2012
+++ src/sys/arch/amiga/conf/GENERIC Wed Jan 11 17:04:29 2012
@@ -1,9 +1,9 @@
-# $NetBSD: GENERIC,v 1.279 2012/01/10 20:29:49 rkujawa Exp $
+# $NetBSD: GENERIC,v 1.280 2012/01/11 17:04:29 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.279 $"
+#ident "GENERIC-$Revision: 1.280 $"
maxusers 8
@@ -482,6 +482,8 @@ pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
pci* at mppb?
+#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
+
#genfb* at pci? # generic fb, CVPPC/BVPPC only
ne* at pci? # NE2000 Ethernet
Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.91 src/sys/arch/amiga/conf/GENERIC.in:1.92
--- src/sys/arch/amiga/conf/GENERIC.in:1.91 Tue Jan 10 20:29:50 2012
+++ src/sys/arch/amiga/conf/GENERIC.in Wed Jan 11 17:04:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $
+# $NetBSD: GENERIC.in,v 1.92 2012/01/11 17:04:29 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.91 $"
+#ident "GENERIC-$Revision: 1.92 $"
m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
makeoptions COPTS="-Os"
@@ -569,6 +569,8 @@ pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
pci* at mppb?
+#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
+
#genfb* at pci? # generic fb, CVPPC/BVPPC only
ne* at pci? # NE2000 Ethernet
Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.101 src/sys/arch/amiga/conf/INSTALL:1.102
--- src/sys/arch/amiga/conf/INSTALL:1.101 Tue Jan 10 20:29:50 2012
+++ src/sys/arch/amiga/conf/INSTALL Wed Jan 11 17:04:29 2012
@@ -1,9 +1,9 @@
-# $NetBSD: INSTALL,v 1.101 2012/01/10 20:29:50 rkujawa Exp $
+# $NetBSD: INSTALL,v 1.102 2012/01/11 17:04:29 rkujawa Exp $
#
# This file was automatically created.
# Changes will be lost when make is run in this directory.
#
-# Created from: # NetBSD: GENERIC.in,v 1.90 2011/12/26 13:07:24 mlelstv Exp $
+# Created from: # NetBSD: GENERIC.in,v 1.91 2012/01/10 20:29:50 rkujawa Exp $
#
##
# GENERIC machine description file
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.101 $"
+#ident "GENERIC-$Revision: 1.102 $"
makeoptions COPTS="-Os"
@@ -426,6 +426,8 @@ pci* at p5pb0
mppb* at zbus0 # Matay Prometheus Zorro-PCI bridge
pci* at mppb?
+#cv3dpb* at zbus0 # CyberVision 64/3D PCI bridge
+
#genfb* at pci? # generic fb, CVPPC/BVPPC only
ne* at pci? # NE2000 Ethernet
Index: src/sys/arch/amiga/conf/files.amiga
diff -u src/sys/arch/amiga/conf/files.amiga:1.151 src/sys/arch/amiga/conf/files.amiga:1.152
--- src/sys/arch/amiga/conf/files.amiga:1.151 Tue Jan 10 20:29:50 2012
+++ src/sys/arch/amiga/conf/files.amiga Wed Jan 11 17:04:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.amiga,v 1.151 2012/01/10 20:29:50 rkujawa Exp $
+# $NetBSD: files.amiga,v 1.152 2012/01/11 17:04:29 rkujawa Exp $
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 16 # NOTE THAT AMIGA IS SPECIAL!
@@ -514,6 +514,7 @@ file arch/amiga/dev/bppcsc.c bppcsc nee
# PCI bus
file arch/amiga/pci/p5pb.c pci
file arch/amiga/pci/mppb.c pci
+file arch/amiga/pci/cv3dpb.c pci
file arch/amiga/pci/pci_machdep.c pci
device p5pb: pcibus
@@ -522,6 +523,9 @@ attach p5pb at p5bus
device mppb: pcibus
attach mppb at zbus
+device cv3dpb: pcibus
+attach cv3dpb at zbus
+
include "dev/i2o/files.i2o"
include "dev/pci/files.pci"
#include "dev/wsfb/files.wsfb"
Index: src/sys/arch/amiga/pci/p5pbreg.h
diff -u src/sys/arch/amiga/pci/p5pbreg.h:1.4 src/sys/arch/amiga/pci/p5pbreg.h:1.5
--- src/sys/arch/amiga/pci/p5pbreg.h:1.4 Tue Jan 10 20:29:50 2012
+++ src/sys/arch/amiga/pci/p5pbreg.h Wed Jan 11 17:04:29 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: p5pbreg.h,v 1.4 2012/01/10 20:29:50 rkujawa Exp $ */
+/* $NetBSD: p5pbreg.h,v 1.5 2012/01/11 17:04:29 rkujawa Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -49,20 +49,19 @@
#ifndef _AMIGA_P5PBREG_H_
#define P5BUS_PCI_CONF_BASE 0xFFFC0000
-#define P5BUS_PCI_CONF_SIZE 0x00021000
+#define P5BUS_PCI_CONF_SIZE 0x00020000 /* up to 128kB */
/* XXX: This is OK for CVPPC/BVPPC only! */
#define P5BUS_PCI_MEM_BASE 0xE0000000
#define P5BUS_PCI_MEM_SIZE 0x01010000 /* actually 0x01020000 */
#define P5BUS_PCI_IO_BASE 0xFFFA0000
-#define P5BUS_PCI_IO_SIZE 0x0000FFFF
+#define P5BUS_PCI_IO_SIZE 0x0000FFFF /* 64kB */
#define P5BUS_PCI_BRIDGE_BASE 0xFFFE0000
-#define P5BUS_PCI_BRIDGE_SIZE 0x0000FFFF /* 4kB on some fw revs */
+#define P5BUS_PCI_BRIDGE_SIZE 0x0000FFFF /* 64kB, 4kB on some fw revs */
#define OFF_PCI_CONF_DATA 0x00000000
-#define OFF_PCI_CONF_ADDR 0x00020000
#define P5BUS_CONF_ENDIAN 0x0000 /* PCI_BRIDGE_BASE + offset */
#define P5BUS_CONF_ENDIAN_BIG 0x02 /* to switch into BE mode */
Added files:
Index: src/sys/arch/amiga/pci/cv3dpb.c
diff -u /dev/null src/sys/arch/amiga/pci/cv3dpb.c:1.1
--- /dev/null Wed Jan 11 17:04:29 2012
+++ src/sys/arch/amiga/pci/cv3dpb.c Wed Jan 11 17:04:29 2012
@@ -0,0 +1,223 @@
+/* $NetBSD: cv3dpb.c,v 1.1 2012/01/11 17:04:29 rkujawa Exp $ */
+
+/*-
+ * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Radoslaw Kujawa.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+#include <sys/extent.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+
+#include <amiga/dev/zbusvar.h>
+#include <amiga/pci/cv3dpbreg.h>
+#include <amiga/pci/cv3dpbvar.h>
+
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcidevs.h>
+#include <dev/pci/pciconf.h>
+
+/* Zorro IDs */
+#define ZORRO_MANID_P5 8512
+#define ZORRO_PRODID_CV643D_Z3 67 /* CV64/3D on Z3 bus */
+
+static int cv3dpb_match(struct device *, struct cfdata *, void *);
+static void cv3dpb_attach(struct device *, struct device *, void *);
+pcireg_t cv3dpb_pci_conf_read(pci_chipset_tag_t, pcitag_t, int);
+void cv3dpb_pci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t);
+int cv3dpb_pci_bus_maxdevs(pci_chipset_tag_t pc, int busno);
+int cv3dpb_pci_intr_map(const struct pci_attach_args *pa,
+ pci_intr_handle_t *ihp);
+static bool cv3dpb_bus_map(struct cv3dpb_softc *sc);
+
+CFATTACH_DECL_NEW(cv3dpb, sizeof(struct cv3dpb_softc),
+ cv3dpb_match, cv3dpb_attach, NULL, NULL);
+
+static int
+cv3dpb_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct zbus_args *zap;
+
+ zap = aux;
+
+ if (zap->manid != ZORRO_MANID_P5)
+ return 0;
+
+ if (zap->prodid != ZORRO_PRODID_CV643D_Z3)
+ return 0;
+
+#ifdef P5PB_DEBUG
+ aprint_normal("cv3dpb matched by Zorro ID %d, %d\n", zap->manid,
+ zap->prodid);
+#endif
+
+ return 10;
+}
+
+
+static void
+cv3dpb_attach(device_t parent, device_t self, void *aux)
+{
+ struct cv3dpb_softc *sc;
+ struct pcibus_attach_args pba;
+ struct zbus_args *zap;
+
+ sc = device_private(self);
+ pci_chipset_tag_t pc = &sc->apc;
+ sc->sc_dev = self;
+ zap = aux;
+
+ sc->ba = zap->va;
+
+ if(!(cv3dpb_bus_map(sc))) {
+ aprint_error_dev(self,
+ "couldn't map PCI configuration registers\n");
+ return;
+ }
+
+ aprint_normal(": CyberVision 64/3D PCI bridge\n");
+
+#ifdef P5PB_DEBUG
+ aprint_normal("cv3dpb: mapped %x -> %x, %x -> %x\n, %x -> %x\n",
+ P5BUS_PCI_CONF_BASE, sc->pci_conf_area.base,
+ P5BUS_PCI_IO_BASE, sc->pci_io_area.base,
+ P5BUS_PCI_MEM_BASE, sc->pci_mem_area.base );
+#endif
+
+ /* Initialize the PCI chipset tag. */
+ sc->apc.pc_conf_v = (void*) pc;
+ sc->apc.pc_bus_maxdevs = cv3dpb_pci_bus_maxdevs;
+ sc->apc.pc_make_tag = amiga_pci_make_tag;
+ sc->apc.pc_decompose_tag = amiga_pci_decompose_tag;
+ sc->apc.pc_conf_read = cv3dpb_pci_conf_read;
+ sc->apc.pc_conf_write = cv3dpb_pci_conf_write;
+ //sc->apc.pc_attach_hook = cv3dpb_pci_attach_hook;
+
+ sc->apc.pc_intr_map = cv3dpb_pci_intr_map;
+ sc->apc.pc_intr_string = amiga_pci_intr_string;
+ sc->apc.pc_intr_establish = amiga_pci_intr_establish;
+ sc->apc.pc_intr_disestablish = amiga_pci_intr_disestablish;
+
+ pba.pba_iot = &(sc->pci_io_area);
+ pba.pba_memt = &(sc->pci_mem_area);
+ pba.pba_dmat = NULL;
+ pba.pba_dmat64 = NULL;
+ pba.pba_pc = pc;
+ pba.pba_flags = PCI_FLAGS_MEM_OKAY | PCI_FLAGS_IO_OKAY;
+ pba.pba_bus = 0;
+ pba.pba_bridgetag = NULL;
+
+ config_found_ia(self, "pcibus", &pba, pcibusprint);
+}
+
+pcireg_t
+cv3dpb_pci_conf_read(pci_chipset_tag_t pc, pcitag_t tag, int reg)
+{
+ uint32_t data;
+ uint32_t bus, dev, func;
+
+ pci_decompose_tag(pc, tag, &bus, &dev, &func);
+
+ data = bus_space_read_4(pc->pci_conf_datat, pc->pci_conf_datah,
+ (func<<5) + reg);
+#ifdef P5PB_DEBUG
+ aprint_normal("cv3dpb conf read va: %lx, bus: %d, dev: %d, "
+ "func: %d, reg: %d -r-> data %x\n",
+ pc->pci_conf_datah, bus, dev, func, reg, data);
+#endif
+ return data;
+}
+
+void
+cv3dpb_pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t val)
+{
+ uint32_t bus, dev, func;
+
+ pci_decompose_tag(pc, tag, &bus, &dev, &func);
+
+ bus_space_write_4(pc->pci_conf_datat, pc->pci_conf_datah,
+ (func << 5) + reg, val);
+#ifdef P5PB_DEBUG
+ aprint_normal("cv3dpb conf write va: %lx, bus: %d, dev: %d, "
+ "func: %d, reg: %d -w-> data %x\n",
+ pc->pci_conf_datah, bus, dev, func, reg, val);
+#endif
+
+}
+
+/* There can be only one. */
+int
+cv3dpb_pci_bus_maxdevs(pci_chipset_tag_t pc, int busno)
+{
+ return 1;
+}
+
+int
+cv3dpb_pci_intr_map(const struct pci_attach_args *pa, pci_intr_handle_t *ihp)
+{
+ /* TODO: add sanity checking */
+
+ *ihp = 2; /* XXX: untested */
+ return 0;
+}
+
+bool
+cv3dpb_bus_map(struct cv3dpb_softc *sc) {
+#ifdef P5PB_DEBUG
+ aprint_normal("cv3dpb: cv3dpb_bus_map called, ba = %x\n",
+ (bus_addr_t) sc->ba);
+#endif /* P5PB_DEBUG */
+
+ sc->pci_conf_area.base = (bus_addr_t) sc->ba + CV643D_PCI_CONF_BASE;
+ sc->pci_conf_area.absm = &amiga_bus_stride_1;
+
+ sc->pci_mem_area.base = (bus_addr_t) sc->ba + CV643D_PCI_MEM_BASE;
+ sc->pci_mem_area.absm = &amiga_bus_stride_1;
+
+ sc->pci_io_area.base = (bus_addr_t) sc->ba + CV643D_PCI_IO_BASE;
+ sc->pci_io_area.absm = &amiga_bus_stride_1;
+
+ sc->apc.pci_conf_datat = &(sc->pci_conf_area);
+
+ if (bus_space_map(sc->apc.pci_conf_datat, 0,
+ CV643D_PCI_CONF_SIZE, 0, &sc->apc.pci_conf_datah))
+ return false;
+
+ return true;
+}
+
Index: src/sys/arch/amiga/pci/cv3dpbreg.h
diff -u /dev/null src/sys/arch/amiga/pci/cv3dpbreg.h:1.1
--- /dev/null Wed Jan 11 17:04:29 2012
+++ src/sys/arch/amiga/pci/cv3dpbreg.h Wed Jan 11 17:04:29 2012
@@ -0,0 +1,45 @@
+/* $NetBSD: cv3dpbreg.h,v 1.1 2012/01/11 17:04:29 rkujawa Exp $ */
+
+/*-
+ * Copyright (c) 2011, 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Radoslaw Kujawa.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef _AMIGA_CV3DPBREG_H_
+
+/* PCI configuration register on CV64/3D, base is an offset from card base */
+#define CV643D_PCI_CONF_BASE 0xC0E0000
+#define CV643D_PCI_CONF_SIZE 0xFFF
+/* Memory space */
+#define CV643D_PCI_MEM_BASE 0x4000000
+#define CV643D_PCI_MEM_SIZ 0x4000FFF
+/* I/O space */
+#define CV643D_PCI_IO_BASE 0xC000000
+#define CV643D_PCI_IO_SIZE 0xFFFF
+
+#endif /* _AMIGA_CV3DPBREG_H_ */
+
Index: src/sys/arch/amiga/pci/cv3dpbvar.h
diff -u /dev/null src/sys/arch/amiga/pci/cv3dpbvar.h:1.1
--- /dev/null Wed Jan 11 17:04:29 2012
+++ src/sys/arch/amiga/pci/cv3dpbvar.h Wed Jan 11 17:04:29 2012
@@ -0,0 +1,49 @@
+/* $NetBSD: cv3dpbvar.h,v 1.1 2012/01/11 17:04:29 rkujawa Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Radoslaw Kujawa.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef _AMIGA_CV3DPBVAR_H_
+
+#include <sys/types.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciconf.h>
+#include <machine/pci_machdep.h>
+
+struct cv3dpb_softc {
+ device_t sc_dev;
+
+ volatile char *ba;
+ struct bus_space_tag pci_conf_area;
+ struct bus_space_tag pci_mem_area;
+ struct bus_space_tag pci_io_area;
+ struct amiga_pci_chipset apc;
+};
+
+#endif /* _AMIGA_CV3DPBVAR_H_ */
