From 3e2fc1bb21e67310e10ff7c7ea903a52d1d146c5 Mon Sep 17 00:00:00 2001
From: Per Fogelstrom <pefo@cvs.openbsd.org>
Date: Thu, 9 Sep 2004 22:11:40 +0000
Subject: Kernel moves to 64 bit. A few more tweaks when binutils is updated.

---
 sys/arch/sgi/localbus/macebus.c  | 12 ++++++++++--
 sys/arch/sgi/localbus/macectrl.S |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'sys/arch/sgi/localbus')

diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index 07529a93fa7..aff96b984d3 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macebus.c,v 1.5 2004/08/11 15:13:35 deraadt Exp $ */
+/*	$OpenBSD: macebus.c,v 1.6 2004/09/09 22:11:39 pefo Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -322,7 +322,11 @@ mace_read_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
 u_int64_t
 mace_read_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o)
 {
+#ifdef __LP64__
+	return *(volatile u_int64_t *)(h + o);
+#else
 	return lp32_read8((u_int64_t *)(h + o));
+#endif
 }
 
 void
@@ -346,7 +350,11 @@ mace_write_4(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int32_t v)
 void
 mace_write_8(bus_space_tag_t t, bus_space_handle_t h, bus_size_t o, u_int64_t v)
 {
+#ifdef __LP64__
+	*(volatile u_int64_t *)(h + o) = v;
+#else
 	lp32_write8((u_int64_t *)(h + o), v);
+#endif
 }
 
 int
@@ -725,7 +733,7 @@ macebus_aux(intrmask_t hwpend, struct trap_frame *cf)
 	}
 	bus_space_write_8(&macebus_tag, mace_h, MACE_ISA_MISC_REG, mask);
 
-	if (maceticks++ > 100*15) {
+	if (maceticks++ > 100*5) {
 		maceticks = 0;
 	}
 
diff --git a/sys/arch/sgi/localbus/macectrl.S b/sys/arch/sgi/localbus/macectrl.S
index 83e6820a8a9..153ce326cc9 100644
--- a/sys/arch/sgi/localbus/macectrl.S
+++ b/sys/arch/sgi/localbus/macectrl.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macectrl.S,v 1.2 2004/08/10 19:16:18 deraadt Exp $ */
+/*	$OpenBSD: macectrl.S,v 1.3 2004/09/09 22:11:39 pefo Exp $ */
 
 /*
  * Copyright (c) 2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -52,4 +52,4 @@ END(hw_setintrmask)
 
 	.data
 	.globl	hwmask_addr
-hwmask_addr: .long 0
+hwmask_addr: PTR_VAL 0
-- 
cgit v1.2.3