 @@ -1,14 +1,14 @@
-/* $NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $ */
+/* $NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $ */
 /*
  * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -22,27 +22,27 @@
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include "opt_dec_3000_300.h"
 #include "opt_dec_3000_500.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.45 2016/12/12 17:03:40 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcasic.c,v 1.46 2017/06/09 17:55:18 flxd Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
 #include <machine/alpha.h>
 #include <dev/tc/tcvar.h>
 #include <alpha/tc/tc_conf.h>
 /* Definition of the driver for autoconfig. */
 @@ -212,27 +212,27 @@ struct cnboards {
 };
 /*
  * tc_fb_cnattach --
  *	Attempt to attach the appropriate display driver to the
  * output console.
  */
 int
 tc_fb_cnattach(tc_addr_t tcaddr)
+{
 	char tcname[TC_ROM_LLEN];
 	int i;
-	if (tc_badaddr(tcaddr) || (tc_checkslot(tcaddr, tcname) == 0))
+	if (tc_badaddr(tcaddr) || (tc_checkslot(tcaddr, tcname, NULL) == 0))
 		return (EINVAL);
 	for (i = 0; i < sizeof(cnboards) / sizeof(cnboards[0]); i++)
 		if (strncmp(tcname, cnboards[i].cb_tcname, TC_ROM_LLEN) == 0)
 			break;
 	if (i == sizeof(cnboards) / sizeof(cnboards[0]))
 		return (ENXIO);
 	(cnboards[i].cb_cnattach)(tcaddr);
 	return (0);
+}
 #endif /* if NWSDISPLAY > 0 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $	*/
+/*	$NetBSD: tcbus.c,v 1.33 2017/06/09 17:55:18 flxd Exp $	*/
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``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/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.32 2016/12/12 17:03:41 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcbus.c,v 1.33 2017/06/09 17:55:18 flxd Exp $");
 #define	_PMAX_BUS_DMA_PRIVATE
 /*
  * Which system models were configured?
  */
 #include "opt_dec_3max.h"
 #include "opt_dec_3min.h"
 #include "opt_dec_maxine.h"
 #include "opt_dec_3maxplus.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 @@ -211,27 +211,27 @@ struct cnboards {
 	{ "PMAGB-FA", pxg_cnattach },
 	{ "PMAGB-FB", pxg_cnattach },
 #endif
 };
 int
 tcfb_cnattach(int slotno)
+{
 	paddr_t tcaddr;
 	char tcname[TC_ROM_LLEN];
 	int i;
 	tcaddr = promcall(callv->_slot_address, slotno);
-	if (tc_badaddr(tcaddr) || tc_checkslot(tcaddr, tcname) == 0)
+	if (tc_badaddr(tcaddr) || tc_checkslot(tcaddr, tcname, NULL) == 0)
 		panic("TC console designated by PROM does not exist!?");
 	for (i = 0; i < __arraycount(cnboards); i++) {
 		if (strncmp(tcname, cnboards[i].cb_tcname, TC_ROM_LLEN) == 0)
 			break;
+	}
 	if (i == __arraycount(cnboards))
 		return (0);
 	(cnboards[i].cb_cnattach)((tc_addr_t)TC_PHYS_TO_UNCACHED(tcaddr));
 	return (1);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tc_vsbus.c,v 1.7 2011/06/05 16:12:50 christos Exp $	*/
+/*	$NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas <matt@3am-software.com>.
+ *
  * 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
 @@ -18,130 +18,417 @@
  * 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/cdefs.h>
 __KERNEL_RCSID(0, "$NetBSD: tc_vsbus.c,v 1.8 2017/06/09 17:55:18 flxd Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <machine/cpu.h>
 #include <machine/pte.h>
 #include <machine/scb.h>
 #include <machine/sid.h>
 #include <machine/vsbus.h>
 #include <dev/tc/tcvar.h>
-static int tcbus_match(device_t, cfdata_t, void *);
+#define NSLOTS	1
 static void tcbus_attach(device_t, device_t, void *);
-struct tcbus_softc {
+struct tc_vsbus_softc {
 	struct tc_softc sc_tc;
-	struct tc_slotdesc sc_slots[1];
+	struct tc_slotdesc sc_slots[NSLOTS];
 	struct vax_bus_dma_tag sc_dmatag;
 	struct vax_sgmap sc_sgmap;
 	struct evcnt sc_ev;
-	bus_space_handle_t sc_memh;
+	int (*sc_intr_func)(void *);
 	void *sc_intr_arg;
 	bus_space_tag_t sc_bst;
 	bus_space_handle_t sc_bsh_csr;
 	int sc_cvec;
 };
-static bus_dma_tag_t tcbus_dmat;
+static int tc_vsbus_match(device_t, cfdata_t, void *);
 static void tc_vsbus_attach(device_t, device_t, void *);
 static int tc_vsbus_dma_init(device_t);
 static bus_dma_tag_t tc_vsbus_get_dma_tag(int);
 static void tc_vsbus_intr(void *);
 static void tc_vsbus_intr_establish(device_t, void *, int, int (*)(void *),
     void *);
 static void tc_vsbus_intr_disestablish(device_t, void *);
 static const struct evcnt *tc_vsbus_intr_evcnt(device_t, void *);
 static int vax_tc_bus_space_map(void *, bus_addr_t, bus_size_t, int,
     bus_space_handle_t *, int);
 static int vax_tc_bus_space_subregion(void *, bus_space_handle_t, bus_size_t,
     bus_size_t, bus_space_handle_t *);
 static void vax_tc_bus_space_unmap(void *, bus_space_handle_t, bus_size_t, int);
 static int vax_tc_bus_space_alloc(void *, bus_addr_t, bus_addr_t, bus_size_t,
     bus_size_t, bus_size_t, int, bus_addr_t *, bus_space_handle_t *);
 static void vax_tc_bus_space_free(void *, bus_space_handle_t, bus_size_t);
 static paddr_t vax_tc_bus_space_mmap(void *, bus_addr_t, off_t, int, int);
 CFATTACH_DECL_NEW(tc_vsbus, sizeof(struct tc_vsbus_softc),
     tc_vsbus_match, tc_vsbus_attach, 0, 0);
 static bus_dma_tag_t tc_vsbus_dmat;
 struct vax_bus_space vax_tc_bus_space = {
 	NULL,
 	vax_tc_bus_space_map,
 	vax_tc_bus_space_unmap,
 	vax_tc_bus_space_subregion,
 	vax_tc_bus_space_alloc,
 	vax_tc_bus_space_free,
 	vax_tc_bus_space_mmap,
 };
 /*
  * taken from KA46 System Board Specification, KA46-0-DBF, Rev. X.02,
  * 10 October 1990
  */
 #define KA46_BWF0			0x20080014
 #define   KA46_BWF0_ADP			__BIT(31)
 #define KA46_BWF0_SZ			4
 /*
  * taken from KA49 Processor Module Specification V 1.1, 20 August 1992
  */
 #define KA49_CFG			0x25800000
 #define   KA49_CFG_BA			__BIT(0)
 #define KA49_CFG_SZ			2
 /*
  * taken from Pmariah TURBOchannel Adapter Specification, 29 November 1991
  */
 #define KA4x_TCA_BASE			0x30000000
 #define KA4x_TCA_DIAG_TRIG		(KA4x_TCA_BASE + 0x4000000)
 #define KA4x_TCA_MAP_CHK_SEQ		(KA4x_TCA_BASE + 0x4800000)
 #define KA4x_TCA_FIFO_DIAG		(KA4x_TCA_BASE + 0x5000000)
 #define KA4x_TCA_SGMAP			(KA4x_TCA_BASE + 0x5800000)
 #define KA4x_TCA_DIAG_ROM		(KA4x_TCA_BASE + 0x6000000)
 #define KA4x_TCA_CSR			(KA4x_TCA_BASE + 0x6800000)
 #define   KA4x_TCA_CSR_BLK_SZ		__BITS(0, 2)	/* 0x00007 RW   */
 #define   KA4x_TCA_CSR_SPARE		__BIT(3)	/* 0x00008 RW   */
 #define   KA4x_TCA_CSR_BAD_PAR		__BITS(4, 7)	/* 0x000f0 RW   */
 #define   KA4x_TCA_CSR_RST_TC		__BIT(8)	/* 0x00100 RW   */
 #define   KA4x_TCA_CSR_EN_MAP		__BIT(9)	/* 0x00200 RW   */
 #define   KA4x_TCA_CSR_INVAL_REF	__BIT(10)	/* 0x00400 RW1C */
 #define   KA4x_TCA_CSR_TC_TMO		__BIT(11)	/* 0x00800 RW   */
 #define   KA4x_TCA_CSR_EN_TC_IRQ	__BIT(12)	/* 0x01000 RW   */
 #define   KA4x_TCA_CSR_TC_IRQ		__BIT(13)	/* 0x02000 R    */
 #define   KA4x_TCA_CSR_ERR		__BIT(14)	/* 0x04000 RW1C */
 #define   KA4x_TCA_CSR_ALT_CYC_ST	__BIT(15)	/* 0x08000 RW   */
 #define   KA4x_TCA_CSR_EN_PAR		__BIT(16)	/* 0x10000 RW   */
 #define   KA4x_TCA_CSR_FIFO_EMPTY	__BIT(17)	/* 0x20000 R    */
 #define KA4x_TCA_CSR_SZ			4
 static int
 tc_vsbus_match(device_t parent, cfdata_t cfdata, void *aux)
+{
 	struct vsbus_attach_args * const va = aux;
 	uint32_t *csr;
 	bus_space_tag_t bst = va->va_memt;
 	bus_space_handle_t bsh;
 	int found, rc;
 	if (va->va_paddr != KA4x_TCA_CSR)
 		return 0;
 	/* Bus adaptor present? */
 	switch (vax_boardtype) {
 	case VAX_BTYP_46:
 		if (bus_space_map(bst, KA46_BWF0, KA46_BWF0_SZ, 0, &bsh))
 			return 0;
 		found = ((bus_space_read_4(bst, bsh, 0) & KA46_BWF0_ADP) != 0);
 		bus_space_unmap(bst, bsh, KA46_BWF0_SZ);
 		/*
          	 * On VS4000/60, although interrupting on a real vector, fool
 		 * vsbus interrupt, as no interrupt bit will be set in
 		 * vsbus_softc's sc_intreq for TC adaptor.
          	 */
 		rc = 20;
 		break;
 	case VAX_BTYP_49:
 		if (bus_space_map(bst, KA49_CFG, KA49_CFG_SZ, 0, &bsh))
 			return 0;
 		found = ((bus_space_read_2(bst, bsh, 0) & KA49_CFG_BA) != 0);
 		bus_space_unmap(bst, bsh, KA49_CFG_SZ);
 		rc = 10;
 		break;
 	default:
 		return 0;
+	}
 	if (!found)
 		return 0;
 	/* XXX Assume a found bus adaptor is the TC bus adaptor. */
 	/* Force interrupt. */
 	csr = (uint32_t *)va->va_addr;
 	*csr |= KA4x_TCA_CSR_TC_TMO;
 	DELAY(10000);
 	*csr &= ~KA4x_TCA_CSR_TC_TMO;
 	DELAY(10000);
 	return rc;
+}
 #define INIT_SLOTSZ	1
 static void
 tc_vsbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct tcbus_attach_args tba;
 	struct vsbus_attach_args * const va = aux;
 	struct tc_vsbus_softc * const sc = device_private(self);
 	struct tc_rommap *rommap;
 	bus_space_tag_t bst = va->va_memt;
 	bus_space_handle_t bsh_csr, bsh_slot;
 	const bus_size_t slotb = 4194304;
 	uint32_t csr;
 	int error, slotsz;
 	sc->sc_cvec = va->va_cvec;
-CFATTACH_DECL_NEW(tcbus, sizeof(struct tcbus_softc),
+	error = bus_space_map(bst, KA4x_TCA_CSR, KA4x_TCA_CSR_SZ, 0, &bsh_csr);
-    tcbus_match, tcbus_attach, 0, 0);
+	if (error) {
 		aprint_normal(": failed to map TCA CSR: %d\n", error);
 		return;
+	}
 	sc->sc_bst = bst;
 	sc->sc_bsh_csr = bsh_csr;
 	/* Deassert TC option reset and clean up. */
 	csr = bus_space_read_4(bst, bsh_csr, 0);
 	csr &= ~(KA4x_TCA_CSR_TC_TMO | KA4x_TCA_CSR_RST_TC);
 	csr |= KA4x_TCA_CSR_ERR | KA4x_TCA_CSR_INVAL_REF;
 	bus_space_write_4(bst, bsh_csr, 0, csr);
 	/*
 	 * Map initial number of "slots" (4 MB each) to read the option ROM
 	 * header.
 	 */
 	error = bus_space_map(bst, KA4x_TCA_BASE, INIT_SLOTSZ * slotb,
 	    BUS_SPACE_MAP_LINEAR, &bsh_slot);
 	if (error) {
 		aprint_normal(": failed to map TC slot: %d", error);
 		goto fail;
+	}
 	/* Determine number of slots required from option ROM header. */
 	slotsz = 0;
 	if (tc_checkslot((tc_addr_t)bus_space_vaddr(bst, bsh_slot), NULL,
 	    &rommap))
 		slotsz = rommap->tcr_ssize.v;
 	if (slotsz == 0) {
 		/* Invalid option ROM header or no option present. */
 		bus_space_unmap(bst, bsh_slot, INIT_SLOTSZ * slotb);
 		goto fail;
 	} else if (slotsz > INIT_SLOTSZ) {
 		/* Remap with actual slot size required. */
 		bus_space_unmap(bst, bsh_slot, INIT_SLOTSZ * slotb);
 		error = bus_space_map(bst, KA4x_TCA_BASE, slotsz * slotb,
 		    BUS_SPACE_MAP_LINEAR, &bsh_slot);
 		if (error) {
 			aprint_normal(": failed to map TC slot: %d", error);
 			goto fail;
+		}
 	} else
 		slotsz = INIT_SLOTSZ;
 	/* Pass pre-mapped space for TC drivers not bus_space'ified yet. */
 	sc->sc_slots[0].tcs_addr = (tc_addr_t)bus_space_vaddr(bst, bsh_slot);
 	sc->sc_slots[0].tcs_cookie = sc;
 	sc->sc_slots[0].tcs_used = 0;
 	tba.tba_busname = "tc";
 	/* Tag with custom methods for pre-mapped bus_space. */
 	tba.tba_memt = &vax_tc_bus_space;
 	tba.tba_speed = TC_SPEED_12_5_MHZ;
 	tba.tba_nslots = __arraycount(sc->sc_slots);
 	tba.tba_slots = sc->sc_slots;
 	tba.tba_nbuiltins = 0;
 	tba.tba_intr_evcnt = tc_vsbus_intr_evcnt;
 	tba.tba_intr_establish = tc_vsbus_intr_establish;
 	tba.tba_intr_disestablish = tc_vsbus_intr_disestablish;
 	tba.tba_get_dma_tag = tc_vsbus_get_dma_tag;
 	error = tc_vsbus_dma_init(self);
 	if (error) {
 		aprint_normal(": failed to init DMA: %d", error);
 		bus_space_unmap(bst, bsh_slot, slotsz * slotb);
 		goto fail;
+	}
 	evcnt_attach_dynamic(&sc->sc_ev, EVCNT_TYPE_INTR, NULL,
 	    device_xname(self), "intr");
 	/* Enable SGDMA and option IRQ now. */
 	csr = bus_space_read_4(bst, bsh_csr, 0);
 	csr &= ~(KA4x_TCA_CSR_TC_TMO | KA4x_TCA_CSR_RST_TC);
 	csr |= KA4x_TCA_CSR_ERR | KA4x_TCA_CSR_EN_TC_IRQ |
 	    KA4x_TCA_CSR_INVAL_REF | KA4x_TCA_CSR_EN_MAP;
 	bus_space_write_4(bst, bsh_csr, 0, csr);
 	/* XXX: why not config_found(9)?? */
 	tcattach(parent, self, &tba);
 	return;
 fail:
 	aprint_normal("\n");
 	/* Clear possible timeout bit which asserts TC interrupt. */
 	csr = bus_space_read_4(bst, bsh_csr, 0);
 	csr &= ~KA4x_TCA_CSR_TC_TMO;
 	bus_space_write_4(bst, bsh_csr, 0, csr);
 	bus_space_unmap(bst, bsh_csr, KA4x_TCA_CSR_SZ);
+}
 static int
 tc_vsbus_dma_init(device_t dev)
+{
 	struct tc_vsbus_softc * const sc = device_private(dev);
 	struct pte *pte;
 	bus_dma_tag_t dmat = &sc->sc_dmatag;
 	bus_space_tag_t bst = sc->sc_bst;
 	bus_space_handle_t bsh;
 	const bus_size_t ptecnt = 8192;
 	const bus_size_t mapsize = ptecnt * sizeof(pte[0]);
 	int error;
 	vax_sgmap_dmatag_init(dmat, sc, ptecnt);
 	dmat->_sgmap = &sc->sc_sgmap;
 	error = bus_space_map(bst, KA4x_TCA_SGMAP, mapsize,
 	    BUS_SPACE_MAP_LINEAR, &bsh);
 	if (error)
 		return error;
 	bus_space_set_region_4(bst, bsh, 0, 0, ptecnt);
 	pte = bus_space_vaddr(bst, bsh);
 	/* Initialize the SGMAP. */
 	vax_sgmap_init(dmat, &sc->sc_sgmap, "tc_sgmap", dmat->_wbase,
 	    dmat->_wsize, pte, 0);
 	tc_vsbus_dmat = dmat;
 	return 0;
+}
 static bus_dma_tag_t
-tcbus_get_dma_tag(int slotno)
+tc_vsbus_get_dma_tag(int slotno)
+{
 	return tcbus_dmat;
 	return tc_vsbus_dmat;
+}
 static void
 tc_vsbus_intr(void *arg)
+{
 	struct tc_vsbus_softc * const sc = arg;
 	bus_space_tag_t bst = sc->sc_bst;
 	bus_space_handle_t bsh = sc->sc_bsh_csr;
 	uint32_t csr;
 	sc->sc_ev.ev_count++;
 	csr = bus_space_read_4(bst, bsh, 0);
 	if (__predict_true((csr & KA4x_TCA_CSR_TC_IRQ) == 0))	/* active low */
 		sc->sc_intr_func(sc->sc_intr_arg);
 	/* Clear possible timeout bit which asserts TC interrupt. */
 	csr = bus_space_read_4(bst, bsh, 0);
 	csr &= ~KA4x_TCA_CSR_TC_TMO;
 	bus_space_write_4(bst, bsh, 0, csr);
+}
 static void
-tcbus_intr_establish(device_t dv, void *cookie, int level,
+tc_vsbus_intr_establish(device_t dv, void *cookie, int level,
-	int (*func)(void *), void *arg)
+    int (*func)(void *), void *arg)
+{
-	struct tcbus_softc * const sc = cookie;
+	struct tc_vsbus_softc * const sc = cookie;
 	sc->sc_intr_func = func;
 	sc->sc_intr_arg = arg;
-	scb_vecalloc(0x51, (void (*)(void *)) func, arg, SCB_ISTACK,
+	scb_vecalloc(sc->sc_cvec, tc_vsbus_intr, sc, SCB_ISTACK, &sc->sc_ev);
 	    &sc->sc_ev);
+}
 static void
-tcbus_intr_disestablish(device_t dv, void *cookie)
+tc_vsbus_intr_disestablish(device_t dv, void *cookie)
+{
 	/* Do nothing. */
+}
 static const struct evcnt *
-tcbus_intr_evcnt(device_t dv, void *cookie)
+tc_vsbus_intr_evcnt(device_t dv, void *cookie)
+{
-	return NULL;
+	struct tc_vsbus_softc * const sc = device_private(dv);
 	return &sc->sc_ev;
+}
-int
+static int
-tcbus_match(device_t parent, cfdata_t cfdata, void *aux)
+vax_tc_bus_space_map(void *t, bus_addr_t pa, bus_size_t size, int cacheable,
     bus_space_handle_t *bshp, int f2)
+{
 	/* bus_space is pre-mapped, so "pa" is a virtual address already. */
 	*bshp = pa;
 	return 0;
+}
-#define	KA4x_TURBO	0x30000000
+static int
-#define	KA4x_TURBOMAPS	0x35800000
+vax_tc_bus_space_subregion(void *t, bus_space_handle_t h, bus_size_t o,
-#define	KA4x_TURBOCSR	0x36800000
+    bus_size_t s, bus_space_handle_t *hp)
 void
 tcbus_attach(device_t parent, device_t self, void *aux)
+{
 	struct vsbus_attach_args * const va = aux;
 	struct tcbus_softc * const sc = device_private(self);
 	struct tcbus_attach_args tba;
 	struct pte *pte;
 	const size_t nentries = 32768;
 	int error;
 	int i;
-	error = bus_space_map(va->va_memt, KA4x_TURBO, 0x10000,
+	*hp = h + o;
-	    BUS_SPACE_MAP_LINEAR, &sc->sc_memh);
+	return 0;
 	if (error) {
 		aprint_error(": failed to map TC slot 0: %d\n", error);
 		return;
-	sc->sc_slots[0].tcs_addr = sc->sc_memh;
+static void
-	sc->sc_slots[0].tcs_cookie = sc;
+vax_tc_bus_space_unmap(void *t, bus_space_handle_t h, bus_size_t size, int f)
+{
-	tba.tba_speed = TC_SPEED_12_5_MHZ;
+	/* Do nothing. */
 	tba.tba_slots = sc->sc_slots;
 	tba.tba_nslots = 1;
 	tba.tba_intr_evcnt = tcbus_intr_evcnt;
 	tba.tba_intr_establish = tcbus_intr_establish;
 	tba.tba_intr_disestablish = tcbus_intr_disestablish;
 	tba.tba_get_dma_tag = tcbus_get_dma_tag;
 	vax_sgmap_dmatag_init(&sc->sc_dmatag, sc, nentries);
 	pte = (struct pte *) vax_map_physmem(KA4x_TURBOMAPS,
 	    nentries * sizeof(pte[0]));
-	for (i = nentries; i > 0; )
+static int
-		((uint32_t *) pte)[--i] = 0;
+vax_tc_bus_space_alloc(void *t, bus_addr_t rs, bus_addr_t re, bus_size_t s,
     bus_size_t a, bus_size_t b, int f, bus_addr_t *ap, bus_space_handle_t *hp)
+{
-	sc->sc_dmatag._sgmap = &sc->sc_sgmap;
+	panic("vax_tc_bus_space_alloc not implemented");
 	/*
 	 * Initialize the SGMAP.
 	 */
 	vax_sgmap_init(&sc->sc_dmatag, &sc->sc_sgmap, "tc_sgmap",
 	     sc->sc_dmatag._wbase, sc->sc_dmatag._wsize, pte, 0);
-	aprint_normal("\n");
+static void
 vax_tc_bus_space_free(void *t, bus_space_handle_t h, bus_size_t s)
+{
-	aprint_verbose_dev(self, "32K entry DMA SGMAP at PA 0x%x (VA %p)\n",
+	panic("vax_tc_bus_space_free not implemented");
 	     KA4x_TURBOMAPS, pte);
-	tcbus_dmat = &sc->sc_dmatag;
+static paddr_t
 vax_tc_bus_space_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
 	bus_addr_t rv;
-	/* XXX: why not config_found(9)?? */
+	rv = addr + off;
-	tcattach(parent, self, &tba);
+	return btop(rv);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $	*/
+/*	$NetBSD: tc.c,v 1.55 2017/06/09 17:55:18 flxd Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -18,27 +18,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.54 2016/12/12 17:03:41 flxd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tc.c,v 1.55 2017/06/09 17:55:18 flxd Exp $");
 #include "opt_tcverbose.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <machine/cpu.h>	/* for badaddr */
 #include <dev/tc/tcreg.h>
 #include <dev/tc/tcvar.h>
 #include <dev/tc/tcdevs.h>
 @@ -146,27 +146,27 @@ tcattach(device_t parent, device_t self,
 	for (i = sc->sc_nslots - 1; i >= 0; i--) {
 		slot = &sc->sc_slots[i];
 		/* If already checked above, don't look again now. */
 		if (slot->tcs_used)
 			continue;
 		/*
 		 * Make sure something is there, and find out what it is.
 		 */
 		tcaddr = slot->tcs_addr;
 		if (tc_badaddr(tcaddr))
 			continue;
-		if (tc_checkslot(tcaddr, ta.ta_modname) == 0)
+		if (tc_checkslot(tcaddr, ta.ta_modname, NULL) == 0)
 			continue;
 		/*
 		 * Set up the rest of the attachment information.
 		 */
 		ta.ta_memt = tba->tba_memt;
 		ta.ta_dmat = (*sc->sc_get_dma_tag)(i);
 		ta.ta_slot = i;
 		ta.ta_offset = 0;
 		ta.ta_addr = tcaddr;
 		ta.ta_cookie = slot->tcs_cookie;
 		/*
 @@ -191,29 +191,27 @@ tcprint(void *aux, const char *pnp)
 	char devinfo[256];
 	if (pnp) {
 		tc_devinfo(ta->ta_modname, devinfo, sizeof(devinfo));
 		aprint_normal("%s at %s", devinfo, pnp);
+	}
 	aprint_normal(" slot %d offset 0x%x", ta->ta_slot, ta->ta_offset);
 	return (UNCONF);
+}
 static const tc_offset_t tc_slot_romoffs[] = {
 	TC_SLOT_ROM,
 #ifndef __vax__
 	TC_SLOT_PROTOROM,
 #endif
 };
 static int
 tc_check_romp(const struct tc_rommap *romp)
+{
 	switch (romp->tcr_width.v) {
 	case 1:
 	case 2:
 	case 4:
 		break;
 	default:
 @@ -224,41 +222,45 @@ tc_check_romp(const struct tc_rommap *ro
 		return 0;
 	for (size_t j = 0; j < romp->tcr_width.v; j++) {
 		if (romp->tcr_test[j + 0 * romp->tcr_stride.v] != 0x55 ||
 		    romp->tcr_test[j + 1 * romp->tcr_stride.v] != 0x00 ||
 		    romp->tcr_test[j + 2 * romp->tcr_stride.v] != 0xaa ||
 		    romp->tcr_test[j + 3 * romp->tcr_stride.v] != 0xff)
 			return 0;
+	}
 	return 1;
+}
 int
-tc_checkslot(tc_addr_t slotbase, char *namep)
+tc_checkslot(tc_addr_t slotbase, char *namep, struct tc_rommap **rompp)
+{
 	struct tc_rommap *romp;
 	int i, j;
 	for (i = 0; i < __arraycount(tc_slot_romoffs); i++) {
 		romp = (struct tc_rommap *)
 		    (slotbase + tc_slot_romoffs[i]);
 		if (!tc_check_romp(romp))
 			continue;
-		for (j = 0; j < TC_ROM_LLEN; j++)
+		if (namep != NULL) {
-			namep[j] = romp->tcr_modname[j].v;
+			for (j = 0; j < TC_ROM_LLEN; j++)
-		namep[j] = '\0';
+				namep[j] = romp->tcr_modname[j].v;
 			namep[j] = '\0';
+		}
 		if (rompp != NULL)
 			*rompp = romp;
 		return (1);
+	}
 	return (0);
+}
 const struct evcnt *
 tc_intr_evcnt(device_t dev, void *cookie)
+{
 	struct tc_softc *sc = device_lookup_private(&tc_cd, 0);
 	return ((*sc->sc_intr_evcnt)(dev, cookie));
+}

 @@ -1,14 +1,14 @@
-#	$NetBSD: files.vax,v 1.120 2015/07/05 03:06:27 matt Exp $
+#	$NetBSD: files.vax,v 1.121 2017/06/09 17:55:18 flxd Exp $
+#
 # new style config file for vax architecture
+#
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 8
 maxusers 8 32 64
 device	mainbus { }: bus
 attach	mainbus at root
 # Define a bunch of devices, needed in more than one place.
 @@ -100,28 +100,28 @@ include "dev/dec/files.dec"
 # Memory Disk for install floppy
 file	dev/md_root.c			memory_disk_hooks
 # MSCP device drivers
 include "dev/mscp/files.mscp"
 # Unibus/Q22 bus definitions
 include "dev/qbus/files.uba"
 # TurboCHANNEL bus support and device drivers
 include "dev/tc/files.tc"
-attach	tc at vsbus with tcbus
+attach	tc at vsbus with tc_vsbus
-file	arch/vax/vsa/tc_vsbus.c		tcbus
+file	arch/vax/vsa/tc_vsbus.c		tc_vsbus
 attach	uba at mainbus with uba_mainbus
 file	arch/vax/uba/uba_mainbus.c	uba_mainbus
 attach	uba at sbi with uba_sbi
 file	arch/vax/uba/uba_sbi.c		uba_sbi
 attach	uba at cmi with uba_cmi
 file	arch/vax/uba/uba_cmi.c		uba_cmi
 attach	uba at ubi with uba_ubi
 file	arch/vax/uba/uba_ubi.c		uba_ubi
 # BI bus definitions
 include "dev/bi/files.bi"

 @@ -1,14 +1,14 @@
-/* $NetBSD: tcvar.h,v 1.26 2011/06/04 01:57:34 tsutsui Exp $ */
+/* $NetBSD: tcvar.h,v 1.27 2017/06/09 17:55:18 flxd Exp $ */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
+ *
  * Author: Chris G. Demetriou
+ *
  * Permission to use, copy, modify and distribute this software and
  * its documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
 @@ -129,27 +129,27 @@ struct tc_slotdesc {
  * Description of built-in TURBOchannel devices, provided by
  * machine-dependent code to the TURBOchannel bus driver.
  */
 struct tc_builtin {
 	const char	*tcb_modname;
 	u_int		tcb_slot;
 	tc_offset_t	tcb_offset;
 	void		*tcb_cookie;
 };
 /*
  * Interrupt establishment functions.
  */
-int	tc_checkslot(tc_addr_t, char *);
+int	tc_checkslot(tc_addr_t, char *, struct tc_rommap **);
 void	tcattach(device_t, device_t, void *);
 const struct evcnt *tc_intr_evcnt(device_t, void *);
 void	tc_intr_establish(device_t, void *, int, int (*)(void *),
 	    void *);
 void	tc_intr_disestablish(device_t, void *);
 /*
  * Miscellaneous definitions.
  */
 #define	TC_SPEED_12_5_MHZ	0		/* 12.5MHz TC bus */
 #define	TC_SPEED_25_MHZ		1		/* 25MHz TC bus */
 #endif /* __DEV_TC_TCVAR_H__ */