Module Name: src
Committed By: snj
Date: Wed Sep 16 03:41:58 UTC 2009
Modified Files:
src/sys/arch/dreamcast/dev/g2 [netbsd-5]: g2bus_bus_mem.c
src/sys/arch/dreamcast/include [netbsd-5]: bus.h
Log Message:
Pull up following revision(s) (requested by mrg in ticket #952):
sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c: revision 1.15
sys/arch/dreamcast/include/bus.h: revision 1.15
Add an empty bus_space_mmap(9) function as a workaround
for MI pci(4) mmap function in sys/dev/pci/pci_usrreq.c.
XXX: no bus_space_subregion(9) for g2bus.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c
cvs rdiff -u -r1.14 -r1.14.10.1 src/sys/arch/dreamcast/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/dreamcast/dev/g2/g2bus_bus_mem.c
diff -u src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14.10.1
--- src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/dev/g2/g2bus_bus_mem.c Wed Sep 16 03:41:57 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: g2bus_bus_mem.c,v 1.14.10.1 2009/09/16 03:41:57 snj Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.14 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: g2bus_bus_mem.c,v 1.14.10.1 2009/09/16 03:41:57 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,6 +53,7 @@
int g2bus_bus_mem_map(void *, bus_addr_t, bus_size_t, int,
bus_space_handle_t *);
void g2bus_bus_mem_unmap(void *, bus_space_handle_t, bus_size_t);
+paddr_t g2bus_bus_mem_mmap(void *, bus_addr_t, off_t, int, int);
uint8_t g2bus_bus_mem_read_1(void *, bus_space_handle_t, bus_size_t);
uint16_t g2bus_bus_mem_read_2(void *, bus_space_handle_t, bus_size_t);
@@ -114,6 +115,7 @@
t->dbs_map = g2bus_bus_mem_map;
t->dbs_unmap = g2bus_bus_mem_unmap;
+ t->dbs_mmap = g2bus_bus_mem_mmap;
t->dbs_r_1 = g2bus_bus_mem_read_1;
t->dbs_r_2 = g2bus_bus_mem_read_2;
@@ -153,6 +155,14 @@
/* Nothing to do. */
}
+paddr_t
+g2bus_bus_mem_mmap(void *v, bus_addr_t addr, off_t offset, int prot, int flags)
+{
+
+ /* XXX not implemented */
+ return -1;
+}
+
/*
* G2 bus cycles must not be interrupted by IRQs or G2 DMA.
* The following paired macros will take the necessary precautions.
Index: src/sys/arch/dreamcast/include/bus.h
diff -u src/sys/arch/dreamcast/include/bus.h:1.14 src/sys/arch/dreamcast/include/bus.h:1.14.10.1
--- src/sys/arch/dreamcast/include/bus.h:1.14 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/dreamcast/include/bus.h Wed Sep 16 03:41:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.14 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: bus.h,v 1.14.10.1 2009/09/16 03:41:58 snj Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -121,6 +121,7 @@
bus_size_t);
int (*dbs_subregion)(void *, bus_space_handle_t,
bus_size_t, bus_size_t, bus_space_handle_t *);
+ paddr_t (*dbs_mmap)(void *, bus_addr_t, off_t, int, int);
/* allocation/deallocation */
int (*dbs_alloc)(void *, bus_addr_t, bus_addr_t,
@@ -270,6 +271,8 @@
(*(t)->dbs_unmap)((t)->dbs_cookie, (h), (s))
#define bus_space_subregion(t, h, o, s, hp) \
(*(t)->dbs_subregion)((t)->dbs_cookie, (h), (o), (s), (hp))
+#define bus_space_mmap(t, a, o, p, f) \
+ (*(t)->dbs_mmap)((t)->dbs_cookie, (a), (o), (p), (f))
#endif /* _KERNEL */
