Module Name: src
Committed By: snj
Date: Wed Sep 16 03:40:41 UTC 2009
Modified Files:
src/sys/arch/cobalt/cobalt [netbsd-5]: bus.c
src/sys/arch/cobalt/include [netbsd-5]: bus.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #952):
sys/arch/cobalt/cobalt/bus.c: revision 1.36
sys/arch/cobalt/include/bus.h: revision 1.23
Add an empty bus_space_mmap(9) function as a workaround
for MI pci(4) mmap function in sys/dev/pci/pci_usrreq.c.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.35.8.1 src/sys/arch/cobalt/cobalt/bus.c
cvs rdiff -u -r1.22 -r1.22.10.1 src/sys/arch/cobalt/include/bus.h
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/cobalt/cobalt/bus.c
diff -u src/sys/arch/cobalt/cobalt/bus.c:1.35 src/sys/arch/cobalt/cobalt/bus.c:1.35.8.1
--- src/sys/arch/cobalt/cobalt/bus.c:1.35 Wed Jun 4 12:41:40 2008
+++ src/sys/arch/cobalt/cobalt/bus.c Wed Sep 16 03:40:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.c,v 1.35 2008/06/04 12:41:40 ad Exp $ */
+/* $NetBSD: bus.c,v 1.35.8.1 2009/09/16 03:40:41 snj Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.35 2008/06/04 12:41:40 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus.c,v 1.35.8.1 2009/09/16 03:40:41 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,6 +117,15 @@
return 0;
}
+paddr_t
+bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot,
+ int flags)
+{
+
+ /* XXX not implemented */
+ return -1;
+}
+
/*
* Common function for DMA map creation. May be called by bus-specific
* DMA map creation functions.
Index: src/sys/arch/cobalt/include/bus.h
diff -u src/sys/arch/cobalt/include/bus.h:1.22 src/sys/arch/cobalt/include/bus.h:1.22.10.1
--- src/sys/arch/cobalt/include/bus.h:1.22 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/cobalt/include/bus.h Wed Sep 16 03:40:41 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.22 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: bus.h,v 1.22.10.1 2009/09/16 03:40:41 snj Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -88,6 +88,16 @@
bus_size_t offset, bus_size_t size, bus_space_handle_t *nbshp);
/*
+ * paddr_t bus_space_mmap(bus_space_tag_t t,
+ * bus_addr_t addr, off_t offset, int prot, int flags);
+ *
+ * Mmap bus space for a user application.
+ */
+
+paddr_t bus_space_mmap(bus_space_tag_t t, bus_addr_t addr, off_t off, int prot,
+ int flags);
+
+/*
* int bus_space_alloc(bus_space_tag_t t, bus_addr_t, rstart,
* bus_addr_t rend, bus_size_t size, bus_size_t align,
* bus_size_t boundary, int flags, bus_addr_t *addrp,
