Index: nexusvar.h
===================================================================
RCS file: /space2/ncvs/src/sys/i386/include/nexusvar.h,v
retrieving revision 1.1
diff -u -p -r1.1 nexusvar.h
--- nexusvar.h	28 Sep 2000 00:37:31 -0000	1.1
+++ nexusvar.h	20 Aug 2002 13:17:12 -0000
@@ -33,20 +33,8 @@ enum nexus_device_ivars {
 	NEXUS_IVAR_PCIBUS
 };
 
-#define NEXUS_ACCESSOR(A, B, T)						  \
-									  \
-static __inline T nexus_get_ ## A(device_t dev)				  \
-{									  \
-	uintptr_t v;							  \
-	BUS_READ_IVAR(device_get_parent(dev), dev, NEXUS_IVAR_ ## B, &v); \
-	return (T) v;							  \
-}									  \
-									  \
-static __inline void nexus_set_ ## A(device_t dev, T t)			  \
-{									  \
-	uintptr_t v = (uintptr_t) t;					  \
-	BUS_WRITE_IVAR(device_get_parent(dev), dev, NEXUS_IVAR_ ## B, v); \
-}
+#define NEXUS_ACCESSOR(var, ivar, type)					\
+    __BUS_ACCESSOR(nexus, var, NEXUS, ivar, type)
 
 NEXUS_ACCESSOR(pcibus,			PCIBUS,		u_int32_t)