diff options
| -rw-r--r-- | sys/arch/hppa/dev/dino.c | 4 | ||||
| -rw-r--r-- | sys/arch/hppa/dev/elroy.c | 6 | ||||
| -rw-r--r-- | sys/arch/hppa/hppa/mainbus.c | 10 | ||||
| -rw-r--r-- | sys/arch/hppa/include/bus.h | 7 |
4 files changed, 17 insertions, 10 deletions
diff --git a/sys/arch/hppa/dev/dino.c b/sys/arch/hppa/dev/dino.c index 8bae9d1d76e..639fe3da2c4 100644 --- a/sys/arch/hppa/dev/dino.c +++ b/sys/arch/hppa/dev/dino.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dino.c,v 1.21 2007/05/18 16:00:17 kettenis Exp $ */ +/* $OpenBSD: dino.c,v 1.22 2007/05/23 18:07:19 kettenis Exp $ */ /* * Copyright (c) 2003-2005 Michael Shalayeff @@ -1475,7 +1475,7 @@ const struct hppa_bus_space_tag dino_iomemt = { NULL, NULL, dino_unmap, dino_subregion, NULL, dino_free, - dino_barrier, + dino_barrier, NULL, 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, diff --git a/sys/arch/hppa/dev/elroy.c b/sys/arch/hppa/dev/elroy.c index 94dc261df6b..2004b85c629 100644 --- a/sys/arch/hppa/dev/elroy.c +++ b/sys/arch/hppa/dev/elroy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: elroy.c,v 1.1 2007/05/21 22:43:38 kettenis Exp $ */ +/* $OpenBSD: elroy.c,v 1.2 2007/05/23 18:07:19 kettenis Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -905,7 +905,7 @@ const struct hppa_bus_space_tag elroy_iomemt = { NULL, NULL, elroy_unmap, elroy_subregion, NULL, elroy_free, - elroy_barrier, + elroy_barrier, NULL, 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, @@ -1088,7 +1088,7 @@ elroy_attach(struct device *parent, struct device *self, void *aux) return; } - sc->sc_regs = r = (void *)bus_space_vaddr(sc->sc_bt, sc->sc_bh); + sc->sc_regs = r = bus_space_vaddr(sc->sc_bt, sc->sc_bh); elroy_write32(&r->pci_cmdstat, htole32(PCI_COMMAND_IO_ENABLE | PCI_COMMAND_MEM_ENABLE | PCI_COMMAND_MASTER_ENABLE)); diff --git a/sys/arch/hppa/hppa/mainbus.c b/sys/arch/hppa/hppa/mainbus.c index b81cd980221..6a77e98c978 100644 --- a/sys/arch/hppa/hppa/mainbus.c +++ b/sys/arch/hppa/hppa/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.63 2005/10/26 18:35:44 martin Exp $ */ +/* $OpenBSD: mainbus.c,v 1.64 2007/05/23 18:07:19 kettenis Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -254,6 +254,12 @@ mbus_barrier(void *v, bus_space_handle_t h, bus_size_t o, bus_size_t l, int op) sync_caches(); } +void * +mbus_vaddr(void *v, bus_space_handle_t h) +{ + return ((void *)h); +} + u_int8_t mbus_r1(void *v, bus_space_handle_t h, bus_size_t o) { @@ -576,7 +582,7 @@ const struct hppa_bus_space_tag hppa_bustag = { NULL, mbus_map, mbus_unmap, mbus_subregion, mbus_alloc, mbus_free, - mbus_barrier, + mbus_barrier, mbus_vaddr, 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, diff --git a/sys/arch/hppa/include/bus.h b/sys/arch/hppa/include/bus.h index 1f7da0e0745..68810683dbd 100644 --- a/sys/arch/hppa/include/bus.h +++ b/sys/arch/hppa/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.24 2005/01/09 06:58:51 mickey Exp $ */ +/* $OpenBSD: bus.h,v 1.25 2007/05/23 18:07:19 kettenis Exp $ */ /* * Copyright (c) 1998-2004 Michael Shalayeff @@ -56,6 +56,7 @@ struct hppa_bus_space_tag { void (*hbt_free)(void *, bus_space_handle_t, bus_size_t); void (*hbt_barrier)(void *v, bus_space_handle_t h, bus_size_t o, bus_size_t l, int op); + void *(*hbt_vaddr)(void *v, bus_space_handle_t h); 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); @@ -287,8 +288,8 @@ extern const struct hppa_bus_space_tag hppa_bustag; #define bus_space_barrier(t,h,o,l,op) \ ((t)->hbt_barrier((t)->hbt_cookie, (h), (o), (l), (op))) -#define bus_space_vaddr(t,h,o,l,op) \ - ((t)->hbt_vaddr((t)->hbt_cookie, (h), (o), (l), (op))) +#define bus_space_vaddr(t,h) \ + ((t)->hbt_vaddr((t)->hbt_cookie, (h))) #define BUS_DMA_WAITOK 0x000 /* safe to sleep (pseudo-flag) */ #define BUS_DMA_NOWAIT 0x001 /* not safe to sleep */ |