From bbf1dde8e63772a49192e91bc9e9f128e18dcc5d Mon Sep 17 00:00:00 2001
From: miod <miod@openbsd.org>
Date: Fri, 15 Aug 2008 22:39:59 +0000
Subject: [PATCH] Remove unused and incomplete vax_bus_t enum, and unused
 vaxbus_dma_get_tag() macro and related function pointers.

---
 sys/arch/vax/include/bus.h | 28 +---------------------------
 sys/arch/vax/vax/bus_dma.c |  5 ++---
 sys/arch/vax/vsa/vsbus.c   |  7 +++----
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/sys/arch/vax/include/bus.h b/sys/arch/vax/include/bus.h
index 311b9cbd672..5e054f7e537 100644
--- a/sys/arch/vax/include/bus.h
+++ b/sys/arch/vax/include/bus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus.h,v 1.10 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: bus.h,v 1.11 2008/08/15 22:39:59 miod Exp $	*/
 /*	$NetBSD: bus.h,v 1.14 2000/06/26 04:56:13 simonb Exp $	*/
 
 /*-
@@ -791,23 +791,6 @@ struct vax_sgmap;
 #define	BUS_DMASYNC_PREWRITE	0x04	/* pre-write synchronization */
 #define	BUS_DMASYNC_POSTWRITE	0x08	/* post-write synchronization */
 
-/*
- *	vax_bus_t
- *
- *	Busses supported by NetBSD/vax, used by internal
- *	utility functions.  NOT TO BE USED BY MACHINE-INDEPENDENT
- *	CODE!
- */
-typedef enum {
-	VAX_BUS_MAINBUS,
-	VAX_BUS_SBI,
-	VAX_BUS_MASSBUS,
-	VAX_BUS_UNIBUS,		/* Also handles QBUS */
-	VAX_BUS_BI,
-	VAX_BUS_XMI,
-	VAX_BUS_TURBOCHANNEL
-} vax_bus_t;
-
 typedef struct vax_bus_dma_tag	*bus_dma_tag_t;
 typedef struct vax_bus_dmamap	*bus_dmamap_t;
 
@@ -851,12 +834,6 @@ struct vax_bus_dma_tag {
 	 */
 	struct vax_sgmap *_sgmap;
 
-	/*
-	 * Internal-use only utility methods.  NOT TO BE USED BY
-	 * MACHINE-INDEPENDENT CODE!
-	 */
-	bus_dma_tag_t (*_get_tag)(bus_dma_tag_t, vax_bus_t);
-
 	/*
 	 * DMA mapping methods.
 	 */
@@ -889,9 +866,6 @@ struct vax_bus_dma_tag {
 		    int, off_t, int, int);
 };
 
-#define	vaxbus_dma_get_tag(t, b)				\
-	(*(t)->_get_tag)(t, b)
-
 #define	bus_dmamap_create(t, s, n, m, b, f, p)			\
 	(*(t)->_dmamap_create)((t), (s), (n), (m), (b), (f), (p))
 #define	bus_dmamap_destroy(t, p)				\
diff --git a/sys/arch/vax/vax/bus_dma.c b/sys/arch/vax/vax/bus_dma.c
index 5f47abac6b5..13db9a33e5d 100644
--- a/sys/arch/vax/vax/bus_dma.c
+++ b/sys/arch/vax/vax/bus_dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bus_dma.c,v 1.19 2008/06/26 05:42:14 ray Exp $	*/
+/*	$OpenBSD: bus_dma.c,v 1.20 2008/08/15 22:40:00 miod Exp $	*/
 /*	$NetBSD: bus_dma.c,v 1.5 1999/11/13 00:32:20 thorpej Exp $	*/
 
 /*-
@@ -750,8 +750,7 @@ struct vax_bus_dma_tag vax_bus_dma_tag = {
 	0, 
 	0,
 	0,
-	0,
-	0,
+	NULL,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c
index 2793e0064a7..0c6069ddd80 100644
--- a/sys/arch/vax/vsa/vsbus.c
+++ b/sys/arch/vax/vsa/vsbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbus.c,v 1.18 2006/12/13 21:12:06 miod Exp $ */
+/*	$OpenBSD: vsbus.c,v 1.19 2008/08/15 22:40:07 miod Exp $ */
 /*	$NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
@@ -70,12 +70,11 @@ int	vsbus_print(void *, const char *);
 int	vsbus_search(struct device *, void *, void *);
 
 static struct vax_bus_dma_tag vsbus_bus_dma_tag = {
+	NULL,
 	0,
 	0,
 	0,
-	0,
-	0,
-	0,
+	NULL,
 	_bus_dmamap_create,
 	_bus_dmamap_destroy,
 	_bus_dmamap_load,
-- 
2.20.1