Module Name: src
Committed By: dyoung
Date: Fri Jul 15 23:40:57 UTC 2011
Modified Files:
src/sys/rump/librump/rumpdev: rumpdma.c
Added Files:
src/sys/rump/include/sys: bus.h
Removed Files:
src/sys/rump/include/machine: bus.h
Log Message:
Use <sys/bus.h> not <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r0 src/sys/rump/include/machine/bus.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/sys/bus.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpdev/rumpdma.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/rump/librump/rumpdev/rumpdma.c
diff -u src/sys/rump/librump/rumpdev/rumpdma.c:1.2 src/sys/rump/librump/rumpdev/rumpdma.c:1.3
--- src/sys/rump/librump/rumpdev/rumpdma.c:1.2 Mon Mar 1 13:01:16 2010
+++ src/sys/rump/librump/rumpdev/rumpdma.c Fri Jul 15 23:40:56 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdma.c,v 1.2 2010/03/01 13:01:16 pooka Exp $ */
+/* $NetBSD: rumpdma.c,v 1.3 2011/07/15 23:40:56 dyoung Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include <sys/device.h>
#include <sys/kmem.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
/*
* bus dma "implementation" for rump.
Added files:
Index: src/sys/rump/include/sys/bus.h
diff -u /dev/null src/sys/rump/include/sys/bus.h:1.1
--- /dev/null Fri Jul 15 23:40:57 2011
+++ src/sys/rump/include/sys/bus.h Fri Jul 15 23:40:56 2011
@@ -0,0 +1,61 @@
+/* $NetBSD: bus.h,v 1.1 2011/07/15 23:40:56 dyoung Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_RUMP_BUS_H_
+#define _SYS_RUMP_BUS_H_
+
+/*
+ * This is a blanket header for archs which are inline/macro-happy
+ * in their bus.h header. Currently, this is anything but x86.
+ * After an arch is cured from inline scurvy, the native bus.h
+ * should be used.
+ */
+
+/* bus space defs */
+typedef int bus_addr_t;
+typedef int bus_size_t;
+typedef int bus_space_tag_t;
+typedef int bus_space_handle_t;
+
+/* bus dma defs */
+typedef int *bus_dma_tag_t;
+
+typedef struct {
+ bus_addr_t ds_addr;
+ bus_size_t ds_len;
+} bus_dma_segment_t;
+
+typedef struct {
+ bus_size_t dm_maxsegsz;
+ bus_size_t dm_mapsize;
+ int dm_nsegs;
+ bus_dma_segment_t dm_segs[1];
+} *bus_dmamap_t;
+
+#include <sys/bus_proto.h>
+
+#endif /* _SYS_RUMP_BUS_H_ */
