Module Name: src
Committed By: rkujawa
Date: Mon Sep 19 19:17:05 UTC 2011
Modified Files:
src/sys/arch/m68k/include: cpu.h
src/sys/arch/m68k/m68k: bus_dma.c
Log Message:
Move CACHELINE_* from bus_dma.c to cpu.h (needed for PCI configuration on amiga
port).
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/m68k/include/cpu.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/m68k/m68k/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/include/cpu.h
diff -u src/sys/arch/m68k/include/cpu.h:1.14 src/sys/arch/m68k/include/cpu.h:1.15
--- src/sys/arch/m68k/include/cpu.h:1.14 Tue Feb 8 20:20:16 2011
+++ src/sys/arch/m68k/include/cpu.h Mon Sep 19 19:17:05 2011
@@ -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>
Index: src/sys/arch/m68k/m68k/bus_dma.c
diff -u src/sys/arch/m68k/m68k/bus_dma.c:1.31 src/sys/arch/m68k/m68k/bus_dma.c:1.32
--- src/sys/arch/m68k/m68k/bus_dma.c:1.31 Fri Nov 12 13:18:58 2010
+++ src/sys/arch/m68k/m68k/bus_dma.c Mon Sep 19 19:17:05 2011
@@ -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)
