summaryrefslogtreecommitdiffstats
path: root/sys/sparc64/include/ofw_nexus.h
diff options
context:
space:
mode:
authortmm <tmm@FreeBSD.org>2002-01-02 18:27:13 +0000
committertmm <tmm@FreeBSD.org>2002-01-02 18:27:13 +0000
commitcec7ec547befb842623ced03b548a9157a372ecf (patch)
tree340672f4fc1ef14cda5cb9c13bc47efc91a816f0 /sys/sparc64/include/ofw_nexus.h
parentf1283775d702bbaa087e2e8e72de588f95648646 (diff)
downloadFreeBSD-src-cec7ec547befb842623ced03b548a9157a372ecf.zip
FreeBSD-src-cec7ec547befb842623ced03b548a9157a372ecf.tar.gz
Correct the defintion of struct ofw_upa_regs, and use it instead of
struct ofw_nexus_reg. Implement UPA device memory management in the nexus driver. Adapt the psycho driver to these changes, and do some minor cleanup work while being there.
Diffstat (limited to 'sys/sparc64/include/ofw_nexus.h')
-rw-r--r--sys/sparc64/include/ofw_nexus.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/sparc64/include/ofw_nexus.h b/sys/sparc64/include/ofw_nexus.h
index c920a9c..7ee0c40 100644
--- a/sys/sparc64/include/ofw_nexus.h
+++ b/sys/sparc64/include/ofw_nexus.h
@@ -41,7 +41,6 @@
struct upa_regs {
u_int32_t phys_hi;
- u_int32_t phys_mid;
u_int32_t phys_lo;
u_int32_t size_hi;
u_int32_t size_lo;
@@ -57,6 +56,11 @@ struct upa_ranges {
u_int32_t size_lo;
};
+#define UPA_REG_PHYS(r) \
+ (((u_int64_t)(r)->phys_hi << 32) | (u_int64_t)(r)->phys_lo)
+#define UPA_REG_SIZE(r) \
+ (((u_int64_t)(r)->size_hi << 32) | (u_int64_t)(r)->size_lo)
+
#define UPA_RANGE_CHILD(r) \
(((u_int64_t)(r)->child_hi << 32) | (u_int64_t)(r)->child_lo)
#define UPA_RANGE_PHYS(r) \
OpenPOWER on IntegriCloud