Module Name: src
Committed By: skrll
Date: Thu Jul 23 13:34:26 UTC 2009
Modified Files:
src/sys/arch/hp700/dev: dino.c elroy.c
src/sys/arch/hp700/hp700: mainbus.c
src/sys/arch/hp700/include: bus.h
Log Message:
Provide bus_space_mmap. Still needs implementing.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hp700/dev/dino.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hp700/dev/elroy.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/hp700/hp700/mainbus.c
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/arch/hp700/dev/dino.c:1.14
--- src/sys/arch/hp700/dev/dino.c:1.13 Sun May 24 06:53:34 2009
+++ src/sys/arch/hp700/dev/dino.c Thu Jul 23 13:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: dino.c,v 1.13 2009/05/24 06:53:34 skrll Exp $ */
+/* $NetBSD: dino.c,v 1.14 2009/07/23 13:34:26 skrll 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.13 2009/05/24 06:53:34 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.14 2009/07/23 13:34:26 skrll Exp $");
/* #include "cardbus.h" */
@@ -161,6 +161,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);
+
uint8_t dino_r1(void *, bus_space_handle_t, bus_size_t);
uint16_t dino_r2(void *, bus_space_handle_t, bus_size_t);
uint32_t dino_r4(void *, bus_space_handle_t, bus_size_t);
@@ -569,6 +571,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;
+}
+
uint8_t
dino_r1(void *v, bus_space_handle_t h, bus_size_t o)
{
@@ -1400,7 +1408,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/dev/elroy.c
diff -u src/sys/arch/hp700/dev/elroy.c:1.7 src/sys/arch/hp700/dev/elroy.c:1.8
--- src/sys/arch/hp700/dev/elroy.c:1.7 Thu May 7 15:34:49 2009
+++ src/sys/arch/hp700/dev/elroy.c Thu Jul 23 13:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: elroy.c,v 1.7 2009/05/07 15:34:49 skrll Exp $ */
+/* $NetBSD: elroy.c,v 1.8 2009/07/23 13:34:26 skrll Exp $ */
/* $OpenBSD: elroy.c,v 1.5 2009/03/30 21:24:57 kettenis Exp $ */
@@ -77,6 +77,7 @@
void elroy_barrier(void *, bus_space_handle_t, bus_size_t, bus_size_t, int);
void *elroy_alloc_parent(device_t, struct pci_attach_args *, int);
void *elroy_vaddr(void *, bus_space_handle_t);
+paddr_t elroy_mmap(void *, bus_addr_t, off_t, int, int);
uint8_t elroy_r1(void *, bus_space_handle_t, bus_size_t);
uint16_t elroy_r2(void *, bus_space_handle_t, bus_size_t);
@@ -485,6 +486,13 @@
return ((void *)h);
}
+paddr_t
+elroy_mmap(void *v, bus_addr_t addr, off_t off, int prot, int flags)
+{
+
+ return -1;
+}
+
uint8_t
elroy_r1(void *v, bus_space_handle_t h, bus_size_t o)
{
@@ -1044,7 +1052,7 @@
NULL,
NULL, elroy_unmap, elroy_subregion, NULL, elroy_free,
- elroy_barrier, elroy_vaddr,
+ elroy_barrier, elroy_vaddr, elroy_mmap,
elroy_r1, elroy_r2, elroy_r4, elroy_r8,
elroy_w1, elroy_w2, elroy_w4, elroy_w8,
elroy_rm_1, elroy_rm_2, elroy_rm_4, elroy_rm_8,
Index: src/sys/arch/hp700/hp700/mainbus.c
diff -u src/sys/arch/hp700/hp700/mainbus.c:1.52 src/sys/arch/hp700/hp700/mainbus.c:1.53
--- src/sys/arch/hp700/hp700/mainbus.c:1.52 Wed May 27 09:30:14 2009
+++ src/sys/arch/hp700/hp700/mainbus.c Thu Jul 23 13:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.52 2009/05/27 09:30:14 skrll Exp $ */
+/* $NetBSD: mainbus.c,v 1.53 2009/07/23 13:34:26 skrll 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.52 2009/05/27 09:30:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.53 2009/07/23 13:34:26 skrll Exp $");
#include "locators.h"
#include "power.h"
@@ -154,6 +154,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);
@@ -452,6 +453,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)
{
@@ -806,7 +814,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.13 src/sys/arch/hp700/include/bus.h:1.14
--- src/sys/arch/hp700/include/bus.h:1.13 Sun May 24 06:53:35 2009
+++ src/sys/arch/hp700/include/bus.h Thu Jul 23 13:34:26 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.13 2009/05/24 06:53:35 skrll Exp $ */
+/* $NetBSD: bus.h,v 1.14 2009/07/23 13:34:26 skrll 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);
uint8_t (*hbt_r1)(void *, bus_space_handle_t, bus_size_t);
uint16_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)))
