From 30b2d68d20ff9f4bf182ba96df108cec01e1b0df Mon Sep 17 00:00:00 2001 From: dyoung Date: Wed, 28 Apr 2010 19:17:03 +0000 Subject: On x86, change the bus_space_tag_t to a pointer to a struct bus_space_tag. For now, bus_space_tag's only member is bst_type, the type of space, which is either X86_BUS_SPACE_IO or X86_BUS_SPACE_MEM. In the future, new bus_space_tag members will refer to override-functions installed by a new function, bus_space_tag_create(9). Add pointers to constant struct bus_space_tag, x86_bus_space_io and x86_bus_space_mem. Use them to replace most uses of X86_BUS_SPACE_IO and X86_BUS_SPACE_MEM. Add an x86-specific bus_space_is_equal(9) implementation that compares the two tags' bst_type. --- sys/compat/ndis/nbcompat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/compat') diff --git a/sys/compat/ndis/nbcompat.h b/sys/compat/ndis/nbcompat.h index 4981b263a82..c94aefa63d0 100644 --- a/sys/compat/ndis/nbcompat.h +++ b/sys/compat/ndis/nbcompat.h @@ -43,7 +43,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #define BUS_SPACE_MAXADDR 0xFFFFFFFF #endif #define BUS_SPACE_MAXSIZE_32BIT 0xFFFFFFFF -#define I386_BUS_SPACE_MEM 1 +#define I386_BUS_SPACE_MEM x86_bus_space_mem #define device_get_softc (struct ndis_softc *) #define ticks hardclock_ticks @@ -57,7 +57,7 @@ TAILQ_HEAD(sysctl_ctx_list, sysctl_ctx_entry); #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif -#define I386_BUS_SPACE_IO 0 +#define I386_BUS_SPACE_IO x86_bus_space_io #define device_get_nameunit(dev) device_xname(dev) -- cgit