summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/hppa/include/bus.h3
-rw-r--r--sys/arch/hppa64/include/bus.h3
-rw-r--r--sys/arch/macppc/include/bus.h3
-rw-r--r--sys/arch/mvme68k/include/bus.h3
-rw-r--r--sys/arch/mvme88k/include/bus.h3
-rw-r--r--sys/arch/mvmeppc/include/bus_mi.h3
-rw-r--r--sys/arch/sgi/include/bus.h3
-rw-r--r--sys/arch/socppc/include/bus.h3
-rw-r--r--sys/dev/pci/isp_pci.c6
9 files changed, 9 insertions, 21 deletions
diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h
index 61f29bef8f8..4989eaf7639 100644
--- a/sys/arch/hppa/include/bus.h
+++ b/sys/arch/hppa/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.26 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.27 2009/05/31 17:42:11 miod Exp $ */
/*
* Copyright (c) 1998-2004 Michael Shalayeff
@@ -295,7 +295,6 @@ extern const struct hppa_bus_space_tag hppa_bustag;
#define BUS_DMA_NOWAIT 0x0001 /* not safe to sleep */
#define BUS_DMA_ALLOCNOW 0x0002 /* perform resource allocation now */
#define BUS_DMA_COHERENT 0x0004 /* hint: map memory DMA coherent */
-#define BUS_DMAMEM_NOSYNC 0x0010
#define BUS_DMA_BUS1 0x0020 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x0040
#define BUS_DMA_BUS3 0x0080
diff --git a/sys/arch/hppa64/include/bus.h b/sys/arch/hppa64/include/bus.h
index 846fddcdba6..5ac5e3f0de9 100644
--- a/sys/arch/hppa64/include/bus.h
+++ b/sys/arch/hppa64/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.3 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.4 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -278,7 +278,6 @@ typedef struct hppa64_bus_space_tag *bus_space_tag_t;
#define BUS_DMA_NOWAIT 0x0001 /* not safe to sleep */
#define BUS_DMA_ALLOCNOW 0x0002 /* perform resource allocation now */
#define BUS_DMA_COHERENT 0x0004 /* hint: map memory DMA coherent */
-#define BUS_DMAMEM_NOSYNC 0x0010
#define BUS_DMA_BUS1 0x0020 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x0040
#define BUS_DMA_BUS3 0x0080
diff --git a/sys/arch/macppc/include/bus.h b/sys/arch/macppc/include/bus.h
index 61bc9e5a252..9588be509ef 100644
--- a/sys/arch/macppc/include/bus.h
+++ b/sys/arch/macppc/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.14 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.15 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom. All rights reserved.
@@ -454,7 +454,6 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
#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_DMAMEM_NOSYNC 0x004
#define BUS_DMA_COHERENT 0x008 /* hint: map memory DMA coherent */
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
diff --git a/sys/arch/mvme68k/include/bus.h b/sys/arch/mvme68k/include/bus.h
index b72b3aeb124..54d1857cbdc 100644
--- a/sys/arch/mvme68k/include/bus.h
+++ b/sys/arch/mvme68k/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.3 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.4 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -720,7 +720,6 @@ void d16_bzero(void *, size_t);
#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_DMAMEM_NOSYNC 0x008
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
#define BUS_DMA_BUS3 0x040
diff --git a/sys/arch/mvme88k/include/bus.h b/sys/arch/mvme88k/include/bus.h
index a588d380c96..311f71c4762 100644
--- a/sys/arch/mvme88k/include/bus.h
+++ b/sys/arch/mvme88k/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.6 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.7 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 2004, Miodrag Vallat.
*
@@ -729,7 +729,6 @@ void d16_bzero(void *, size_t);
#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_DMAMEM_NOSYNC 0x008
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
#define BUS_DMA_BUS3 0x040
diff --git a/sys/arch/mvmeppc/include/bus_mi.h b/sys/arch/mvmeppc/include/bus_mi.h
index 8bc1bf8b01f..b0b72687bb8 100644
--- a/sys/arch/mvmeppc/include/bus_mi.h
+++ b/sys/arch/mvmeppc/include/bus_mi.h
@@ -1,5 +1,5 @@
/* $NetBSD: bus.h,v 1.1 2001/06/06 17:37:37 matt Exp $ */
-/* $OpenBSD: bus_mi.h,v 1.10 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus_mi.h,v 1.11 2009/05/31 17:42:13 miod Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -961,7 +961,6 @@ bus_space_copy_region_4(t, h1, o1, h2, o2, c)
#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_DMAMEM_NOSYNC 0x004
#define BUS_DMA_COHERENT 0x008 /* hint: map memory DMA coherent */
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h
index de61e1fad1a..6b5d7490712 100644
--- a/sys/arch/sgi/include/bus.h
+++ b/sys/arch/sgi/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.14 2009/05/24 17:31:05 miod Exp $ */
+/* $OpenBSD: bus.h,v 1.15 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved.
@@ -309,7 +309,6 @@ bus_space_copy_8(void *v, bus_space_handle_t h1, bus_size_t o1,
#define BUS_DMA_WAITOK 0x000
#define BUS_DMA_NOWAIT 0x001
#define BUS_DMA_ALLOCNOW 0x002
-#define BUS_DMAMEM_NOSYNC 0x004
#define BUS_DMA_COHERENT 0x008
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
diff --git a/sys/arch/socppc/include/bus.h b/sys/arch/socppc/include/bus.h
index 93de2235c82..978d3afa558 100644
--- a/sys/arch/socppc/include/bus.h
+++ b/sys/arch/socppc/include/bus.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bus.h,v 1.2 2009/04/20 00:42:06 oga Exp $ */
+/* $OpenBSD: bus.h,v 1.3 2009/05/31 17:42:13 miod Exp $ */
/*
* Copyright (c) 1997 Per Fogelstrom. All rights reserved.
@@ -454,7 +454,6 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_space_handle_t h2,
#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_DMAMEM_NOSYNC 0x004
#define BUS_DMA_COHERENT 0x008 /* hint: map memory DMA coherent */
#define BUS_DMA_BUS1 0x010 /* placeholders for bus functions... */
#define BUS_DMA_BUS2 0x020
diff --git a/sys/dev/pci/isp_pci.c b/sys/dev/pci/isp_pci.c
index 49bb6e70348..3f12d0a40cd 100644
--- a/sys/dev/pci/isp_pci.c
+++ b/sys/dev/pci/isp_pci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isp_pci.c,v 1.45 2009/05/08 18:39:01 miod Exp $ */
+/* $OpenBSD: isp_pci.c,v 1.46 2009/05/31 17:42:13 miod Exp $ */
/*
* PCI specific probe and attach routines for QLogic ISP SCSI adapters.
*
@@ -314,10 +314,6 @@ static struct ispmdvec mdvec_2300 = {
#endif
#endif
-#ifndef BUS_DMA_COHERENT
-#define BUS_DMA_COHERENT BUS_DMAMEM_NOSYNC
-#endif
-
static int isp_pci_probe (struct device *, void *, void *);
static void isp_pci_attach (struct device *, struct device *, void *);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 15:06:01 +0000