Module Name:    src
Committed By:   pooka
Date:           Tue Feb  9 17:33:31 UTC 2010

Added Files:
        src/sys/rump/include/machine: bus.h

Log Message:
Add a bus.h blanket header which forces definition of bus space /
bus dma interfaces as functions and therefore makes it possible to
use rump on archs which suffer from macro maladies, i.e. everything
except i386 and amd64.

(build-tested on sparc64 and vax, which are usually the two extremes
of weirdness in these cases)


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/machine/bus.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/sys/rump/include/machine/bus.h
diff -u /dev/null src/sys/rump/include/machine/bus.h:1.1
--- /dev/null	Tue Feb  9 17:33:31 2010
+++ src/sys/rump/include/machine/bus.h	Tue Feb  9 17:33:31 2010
@@ -0,0 +1,58 @@
+/*	$NetBSD: bus.h,v 1.1 2010/02/09 17:33:31 pooka 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_dma_segment_t dm_segs[1];
+} *bus_dmamap_t;
+
+#include <sys/bus_proto.h>
+
+#endif /* _SYS_RUMP_BUS_H_ */

Reply via email to