[src/trunk]: src/sys/arch/m68k Move CACHELINE_* from bus_dma.c to cpu.h (need...

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

details:   https://anonhg.NetBSD.org/src/rev/44cd595790dd
branches:  trunk
changeset: 769706:44cd595790dd
user:      rkujawa <rkujawa%NetBSD.org@localhost>
date:      Mon Sep 19 19:17:05 2011 +0000

description:
Move CACHELINE_* from bus_dma.c to cpu.h (needed for PCI configuration on amiga port).

diffstat:

 sys/arch/m68k/include/cpu.h  |  5 ++++-
 sys/arch/m68k/m68k/bus_dma.c |  9 ++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diffs (49 lines):

diff -r 084e7aa7301f -r 44cd595790dd sys/arch/m68k/include/cpu.h
--- a/sys/arch/m68k/include/cpu.h       Mon Sep 19 19:15:28 2011 +0000
+++ b/sys/arch/m68k/include/cpu.h       Mon Sep 19 19:17:05 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.14 2011/02/08 20:20:16 rmind Exp $   */
+/*     $NetBSD: cpu.h,v 1.15 2011/09/19 19:17:05 rkujawa Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -159,6 +159,9 @@
 #define        CACHE60_ON      (CACHE40_ON|IC60_CABC|IC60_EBC|DC60_ESB)
 #define        CACHE60_OFF     (CACHE40_OFF|IC60_CABC)
 
+#define CACHELINE_SIZE 16
+#define CACHELINE_MASK (CACHELINE_SIZE - 1)
+
 #if defined(_KERNEL) || defined(_KMEMUSER)
 #include <sys/cpu_data.h>
 
diff -r 084e7aa7301f -r 44cd595790dd sys/arch/m68k/m68k/bus_dma.c
--- a/sys/arch/m68k/m68k/bus_dma.c      Mon Sep 19 19:15:28 2011 +0000
+++ b/sys/arch/m68k/m68k/bus_dma.c      Mon Sep 19 19:17:05 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $ */
+/* $NetBSD: bus_dma.c,v 1.32 2011/09/19 19:17:05 rkujawa Exp $ */
 
 /*
  * This file was taken from from alpha/common/bus_dma.c
@@ -41,7 +41,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.31 2010/11/12 13:18:58 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.32 2011/09/19 19:17:05 rkujawa Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -424,11 +424,6 @@
  * Common function for DMA map synchronization.  May be called
  * by chipset-specific DMA map synchronization functions.
  */
-
-/* XXX these should be in <m68k/cpu.h> or <m68k/cacheops.h> */
-#define CACHELINE_SIZE 16
-#define CACHELINE_MASK (CACHELINE_SIZE - 1)
-
 void
 _bus_dmamap_sync(bus_dma_tag_t t, bus_dmamap_t map, bus_addr_t offset,
     bus_size_t len, int ops)