From 038ca0a1464a7d5fcf493ac2ba844124839a030d Mon Sep 17 00:00:00 2001
From: enami <enami@NetBSD.org>
Date: Wed, 15 Nov 2000 02:00:31 +0000
Subject: [PATCH] Make isa_machdep.c compile again.

---
 sys/arch/i386/include/isa_machdep.h | 38 +----------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/sys/arch/i386/include/isa_machdep.h b/sys/arch/i386/include/isa_machdep.h
index 3945a886190c..3a4dc84d0aa7 100644
--- a/sys/arch/i386/include/isa_machdep.h
+++ b/sys/arch/i386/include/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.h,v 1.16 2000/06/04 19:14:44 cgd Exp $	*/
+/*	$NetBSD: isa_machdep.h,v 1.17 2000/11/15 02:00:31 enami Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -170,42 +170,6 @@ void	isa_mem_free(bus_space_tag_t, bus_space_handle_t, bus_size_t);
 
 extern struct i386_bus_dma_tag isa_bus_dma_tag;
 
-/*
- * Cookie used by ISA dma.  A pointer to one of these it stashed in
- * the DMA map.
- */
-struct i386_isa_dma_cookie {
-	int	id_flags;		/* flags; see below */
-
-	/*
-	 * Information about the original buffer used during
-	 * DMA map syncs.  Note that origibuflen is only used
-	 * for ID_BUFTYPE_LINEAR.
-	 */
-	void	*id_origbuf;		/* pointer to orig buffer if
-					   bouncing */
-	bus_size_t id_origbuflen;	/* ...and size */
-	int	id_buftype;		/* type of buffer */
-
-	void	*id_bouncebuf;		/* pointer to the bounce buffer */
-	bus_size_t id_bouncebuflen;	/* ...and size */
-	int	id_nbouncesegs;		/* number of valid bounce segs */
-	bus_dma_segment_t id_bouncesegs[0]; /* array of bounce buffer
-					       physical memory segments */
-};
-
-/* id_flags */
-#define	ID_MIGHT_NEED_BOUNCE	0x01	/* map could need bounce buffers */
-#define	ID_HAS_BOUNCE		0x02	/* map currently has bounce buffers */
-#define	ID_IS_BOUNCING		0x04	/* map is bouncing current xfer */
-
-/* id_buftype */
-#define	ID_BUFTYPE_INVALID	0
-#define	ID_BUFTYPE_LINEAR	1
-#define	ID_BUFTYPE_MBUF		2
-#define	ID_BUFTYPE_UIO		3
-#define	ID_BUFTYPE_RAW		4
-
 /*
  * XXX Various seemingly PC-specific constants, some of which may be
  * unnecessary anyway.