Module Name: src
Committed By: snj
Date: Tue Sep 29 22:56:48 UTC 2009
Modified Files:
src/sys/arch/hp700/dev [netbsd-5]: dino.c
src/sys/arch/hp700/hp700 [netbsd-5]: mainbus.c
src/sys/arch/hp700/include [netbsd-5]: bus.h
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1035):
sys/arch/hp700/dev/dino.c: revision 1.14 via patch
sys/arch/hp700/hp700/mainbus.c: revision 1.53
sys/arch/hp700/include/bus.h: revision 1.14
Provide bus_space_mmap. Still needs implementing.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.45 -r1.45.6.1 src/sys/arch/hp700/hp700/mainbus.c
cvs rdiff -u -r1.12 -r1.12.54.1 src/sys/arch/hp700/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/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.6 src/sys/arch/hp700/dev/dino.c:1.6.4.1
--- src/sys/arch/hp700/dev/dino.c:1.6 Thu Aug 28 08:25:46 2008
+++ src/sys/arch/hp700/dev/dino.c Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $ */
/* $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6 2008/08/28 08:25:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.6.4.1 2009/09/29 22:56:48 snj Exp $");
/* #include "cardbus.h" */
@@ -160,6 +160,8 @@
void dino_free(void *, bus_space_handle_t, bus_size_t);
void dino_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
void *dino_vaddr(void *, bus_space_handle_t);
+paddr_t dino_mmap(void *, bus_addr_t, off_t, int, int);
+
u_int8_t dino_r1(void *, bus_space_handle_t, bus_size_t);
u_int16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
u_int32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
@@ -568,6 +570,12 @@
return bus_space_vaddr(sc->sc_bt, h);
}
+paddr_t
+dino_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
+ return -1;
+}
+
u_int8_t
dino_r1(void *v, bus_space_handle_t h, bus_size_t o)
{
@@ -1399,7 +1407,7 @@
NULL,
NULL, dino_unmap, dino_subregion, NULL, dino_free,
- dino_barrier, dino_vaddr,
+ dino_barrier, dino_vaddr, dino_mmap,
dino_r1, dino_r2, dino_r4, dino_r8,
dino_w1, dino_w2, dino_w4, dino_w8,
dino_rm_1, dino_rm_2, dino_rm_4, dino_rm_8,
Index: src/sys/arch/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.45 src/sys/arch/hp700/hp700/mainbus.c:1.45.6.1
--- src/sys/arch/hp700/hp700/mainbus.c:1.45 Fri Jun 13 09:41:44 2008
+++ src/sys/arch/hp700/hp700/mainbus.c Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.45 2008/06/13 09:41:44 cegger Exp $ */
+/* $NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.45 2008/06/13 09:41:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.45.6.1 2009/09/29 22:56:48 snj Exp $");
#include "locators.h"
#include "opt_power_switch.h"
@@ -156,6 +156,7 @@
int mbus_subregion(void *, bus_space_handle_t, bus_size_t, bus_size_t, bus_space_handle_t *);
void mbus_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
void *mbus_vaddr(void *, bus_space_handle_t);
+paddr_t mbus_mmap(void *, bus_addr_t, off_t, int, int);
int mbus_dmamap_create(void *, bus_size_t, int, bus_size_t, bus_size_t, int, bus_dmamap_t *);
void mbus_dmamap_destroy(void *, bus_dmamap_t);
@@ -456,6 +457,13 @@
return (void*)h;
}
+paddr_t
+mbus_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
+
+ return -1;
+}
+
u_int8_t
mbus_r1(void *v, bus_space_handle_t h, bus_size_t o)
{
@@ -810,7 +818,7 @@
NULL,
mbus_map, mbus_unmap, mbus_subregion, mbus_alloc, mbus_free,
- mbus_barrier, mbus_vaddr,
+ mbus_barrier, mbus_vaddr, mbus_mmap,
mbus_r1, mbus_r2, mbus_r4, mbus_r8,
mbus_w1, mbus_w2, mbus_w4, mbus_w8,
mbus_rm_1, mbus_rm_2, mbus_rm_4, mbus_rm_8,
Index: src/sys/arch/hp700/include/bus.h
diff -u src/sys/arch/hp700/include/bus.h:1.12 src/sys/arch/hp700/include/bus.h:1.12.54.1
--- src/sys/arch/hp700/include/bus.h:1.12 Sun Mar 4 05:59:51 2007
+++ src/sys/arch/hp700/include/bus.h Tue Sep 29 22:56:48 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.12 2007/03/04 05:59:51 christos Exp $ */
+/* $NetBSD: bus.h,v 1.12.54.1 2009/09/29 22:56:48 snj Exp $ */
/* $OpenBSD: bus.h,v 1.13 2001/07/30 14:15:59 art Exp $ */
@@ -64,6 +64,7 @@
void (*hbt_barrier)(void *v, bus_space_handle_t h,
bus_size_t o, bus_size_t l, int op);
void *(*hbt_vaddr)(void *, bus_space_handle_t);
+ paddr_t (*hbt_mmap)(void *, bus_addr_t, off_t, int, int);
u_int8_t (*hbt_r1)(void *, bus_space_handle_t, bus_size_t);
u_int16_t (*hbt_r2)(void *, bus_space_handle_t, bus_size_t);
@@ -198,6 +199,8 @@
((t)->hbt_barrier((t)->hbt_cookie, (h), (o), (l), (op)))
#define bus_space_vaddr(t,h) \
(((t)->hbt_vaddr)((t)->hbt_cookie,(h)))
+#define bus_space_mmap(t, a, o, p, f) \
+ (*(t)->hbt_mmap)((t)->hbt_cookie, (a), (o), (p), (f))
#define bus_space_read_1(t,h,o) (((t)->hbt_r1)((t)->hbt_cookie,(h),(o)))
#define bus_space_read_2(t,h,o) (((t)->hbt_r2)((t)->hbt_cookie,(h),(o)))
