aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMaxime Henrion <mux@FreeBSD.org>2002-08-20 13:50:17 +0000
committerMaxime Henrion <mux@FreeBSD.org>2002-08-20 13:50:17 +0000
commit579bb370155bf15c63dbf3bdeb1ced99030f5a5c (patch)
tree9abd1e5532534b8a8e07a4578e959f064072bc73 /sys
parent4612010cddf42f04f456351a246afbf9d80bdf2e (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/include/legacyvar.h16
-rw-r--r--sys/i386/include/legacyvar.h16
-rw-r--r--sys/i386/include/nexusvar.h16
3 files changed, 6 insertions, 42 deletions
diff --git a/sys/amd64/include/legacyvar.h b/sys/amd64/include/legacyvar.h
index c9dcf1c16bc3..be38f33a0753 100644
--- a/sys/amd64/include/legacyvar.h
+++ b/sys/amd64/include/legacyvar.h
@@ -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)
diff --git a/sys/i386/include/legacyvar.h b/sys/i386/include/legacyvar.h
index c9dcf1c16bc3..be38f33a0753 100644
--- a/sys/i386/include/legacyvar.h
+++ b/sys/i386/include/legacyvar.h
@@ -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)
diff --git a/sys/i386/include/nexusvar.h b/sys/i386/include/nexusvar.h
index c9dcf1c16bc3..be38f33a0753 100644
--- a/sys/i386/include/nexusvar.h
+++ b/sys/i386/include/nexusvar.h
@@ -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)