diff options
Diffstat (limited to 'sys/arch/mac68k/dev/nubus.h')
| -rw-r--r-- | sys/arch/mac68k/dev/nubus.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/sys/arch/mac68k/dev/nubus.h b/sys/arch/mac68k/dev/nubus.h index e9699c29dc1..20c50ac3996 100644 --- a/sys/arch/mac68k/dev/nubus.h +++ b/sys/arch/mac68k/dev/nubus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: nubus.h,v 1.19 2005/03/04 00:38:37 martin Exp $ */ +/* $OpenBSD: nubus.h,v 1.20 2005/04/26 21:09:35 martin Exp $ */ /* $NetBSD: nubus.h,v 1.25 1997/05/02 00:54:28 briggs Exp $ */ /* @@ -44,7 +44,6 @@ * and DrHW 1 (TFB). */ -#include <machine/bus.h> #include <machine/cpu.h> #define NUBUS_CATEGORY_BOARD 0x0001 @@ -122,7 +121,6 @@ typedef struct _nubus_slot { u_int32_t crc; u_int32_t length; u_int32_t directory_offset; - vm_offset_t virtual_base; } nubus_slot; /* @@ -265,16 +263,20 @@ struct nubus_softc { }; void nubus_get_main_dir(nubus_slot *slot, nubus_dir *dir_return); -int nubus_find_rsrc(nubus_slot *slot, nubus_dir *dir, u_int8_t rsrcid, - nubus_dirent *dirent_return); void nubus_get_dir_from_rsrc(nubus_slot *slot, nubus_dirent *dirent, - nubus_dir *dir_return); -int nubus_get_ind_data(nubus_slot *slot, nubus_dirent *dirent, - caddr_t data_return, int nbytes); -int nubus_get_c_string(nubus_slot *slot, nubus_dirent *dirent, - caddr_t data_return, int max_bytes); -char *nubus_get_vendor(nubus_slot *slot, int rsrc); -char *nubus_get_card_name(nubus_slot *slot); -char *nubus_mapin(int paddr, int sz); - int paddr, sz; + nubus_dir *dir_return); +int nubus_find_rsrc(bus_space_tag_t, bus_space_handle_t, + nubus_slot *slot, nubus_dir *dir, u_int8_t rsrcid, + nubus_dirent *dirent_return); +int nubus_get_ind_data(bus_space_tag_t, bus_space_handle_t, + nubus_slot *slot, nubus_dirent *dirent, + caddr_t data_return, int nbytes); +int nubus_get_c_string(bus_space_tag_t, bus_space_handle_t, + nubus_slot *slot, nubus_dirent *dirent, + caddr_t data_return, int max_bytes); + +char *nubus_get_vendor(bus_space_tag_t, bus_space_handle_t, + nubus_slot *slot, int rsrc); +char *nubus_get_card_name(bus_space_tag_t, bus_space_handle_t, + nubus_slot *slot); |