Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/sparc64 Rename ASR_IDSR to ASI_IDSR, which is ASI (...
details: https://anonhg.NetBSD.org/src/rev/8883b65840b9
branches: trunk
changeset: 782603:8883b65840b9
user: nakayama <nakayama%NetBSD.org@localhost>
date: Thu Nov 08 16:36:53 2012 +0000
description:
Rename ASR_IDSR to ASI_IDSR, which is ASI (Address Space Identifier),
not ASR (Ancillary State Register).
diffstat:
sys/arch/sparc64/include/ctlreg.h | 4 ++--
sys/arch/sparc64/sparc64/ipifuncs.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (63 lines):
diff -r 9d8ea8307ecb -r 8883b65840b9 sys/arch/sparc64/include/ctlreg.h
--- a/sys/arch/sparc64/include/ctlreg.h Thu Nov 08 16:33:26 2012 +0000
+++ b/sys/arch/sparc64/include/ctlreg.h Thu Nov 08 16:36:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ctlreg.h,v 1.58 2012/11/08 16:30:12 nakayama Exp $ */
+/* $NetBSD: ctlreg.h,v 1.59 2012/11/08 16:36:53 nakayama Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -411,7 +411,7 @@
#define IRDR_3L 0x78 /* unimplemented */
/* Interrupt Dispatch -- usually reserved for cross-calls */
-#define ASR_IDSR 0x48 /* Interrupt dispatch status reg */
+#define ASI_IDSR 0x48 /* Interrupt dispatch status reg */
#define IDSR 0x00
#define IDSR_NACK 0x02
#define IDSR_BUSY 0x01
diff -r 9d8ea8307ecb -r 8883b65840b9 sys/arch/sparc64/sparc64/ipifuncs.c
--- a/sys/arch/sparc64/sparc64/ipifuncs.c Thu Nov 08 16:33:26 2012 +0000
+++ b/sys/arch/sparc64/sparc64/ipifuncs.c Thu Nov 08 16:36:53 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ipifuncs.c,v 1.46 2012/07/04 07:03:30 jdc Exp $ */
+/* $NetBSD: ipifuncs.c,v 1.47 2012/11/08 16:36:53 nakayama Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.46 2012/07/04 07:03:30 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipifuncs.c,v 1.47 2012/11/08 16:36:53 nakayama Exp $");
#include "opt_ddb.h"
@@ -216,7 +216,7 @@
if (CPU_IS_USIIIi())
shift = (upaid & 0x3) * 2;
- if (ldxa(0, ASR_IDSR) & (IDSR_BUSY << shift))
+ if (ldxa(0, ASI_IDSR) & (IDSR_BUSY << shift))
panic("recursive IPI?");
intr_func = (uint64_t)(u_long)func;
@@ -237,7 +237,7 @@
}
for (ik = 0; ik < 1000000; ik++) {
- if (ldxa(0, ASR_IDSR) & (IDSR_BUSY << shift))
+ if (ldxa(0, ASI_IDSR) & (IDSR_BUSY << shift))
continue;
else
break;
@@ -247,7 +247,7 @@
if (ik == 1000000)
break;
- if ((ldxa(0, ASR_IDSR) & (IDSR_NACK << shift)) == 0)
+ if ((ldxa(0, ASI_IDSR) & (IDSR_NACK << shift)) == 0)
return;
/*
* Wait for a while with enabling interrupts to avoid
Home |
Main Index |
Thread Index |
Old Index