[src/sommerfeld_i386mp_1]: src/sys/arch/i386/include merge up with -current

[sommerfeld <sommerfeld%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d511ff73f33
branches:  sommerfeld_i386mp_1
changeset: 482426:7d511ff73f33
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Fri Jul 20 00:38:22 2001 +0000

description:
merge up with -current

diffstat:

 sys/arch/i386/include/bus.h |  22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diffs (36 lines):

diff -r f02fde592a82 -r 7d511ff73f33 sys/arch/i386/include/bus.h
--- a/sys/arch/i386/include/bus.h       Thu Jul 19 08:57:25 2001 +0000
+++ b/sys/arch/i386/include/bus.h       Fri Jul 20 00:38:22 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bus.h,v 1.30.2.4 2001/04/30 16:58:34 sommerfeld Exp $  */
+/*     $NetBSD: bus.h,v 1.30.2.5 2001/07/20 00:38:22 sommerfeld Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -1003,15 +1003,17 @@
 /*
  * Flags used in various bus DMA methods.
  */
-#define        BUS_DMA_WAITOK          0x00    /* safe to sleep (pseudo-flag) */
-#define        BUS_DMA_NOWAIT          0x01    /* not safe to sleep */
-#define        BUS_DMA_ALLOCNOW        0x02    /* perform resource allocation now */
-#define        BUS_DMA_COHERENT        0x04    /* hint: map memory DMA coherent */
-#define        BUS_DMA_STREAMING       0x08    /* hint: sequential, unidirectional */
-#define        BUS_DMA_BUS1            0x10    /* placeholders for bus functions... */
-#define        BUS_DMA_BUS2            0x20
-#define        BUS_DMA_BUS3            0x40
-#define        BUS_DMA_BUS4            0x80
+#define        BUS_DMA_WAITOK          0x000   /* safe to sleep (pseudo-flag) */
+#define        BUS_DMA_NOWAIT          0x001   /* not safe to sleep */
+#define        BUS_DMA_ALLOCNOW        0x002   /* perform resource allocation now */
+#define        BUS_DMA_COHERENT        0x004   /* hint: map memory DMA coherent */
+#define        BUS_DMA_STREAMING       0x008   /* hint: sequential, unidirectional */
+#define        BUS_DMA_BUS1            0x010   /* placeholders for bus functions... */
+#define        BUS_DMA_BUS2            0x020
+#define        BUS_DMA_BUS3            0x040
+#define        BUS_DMA_BUS4            0x080
+#define        BUS_DMA_READ            0x100   /* mapping is device -> memory only */
+#define        BUS_DMA_WRITE           0x200   /* mapping is memory -> device only */
 
 /* Forwards needed by prototypes below. */
 struct mbuf;