Module Name: src
Committed By: nakayama
Date: Thu Nov 8 16:36:53 UTC 2012
Modified Files:
src/sys/arch/sparc64/include: ctlreg.h
src/sys/arch/sparc64/sparc64: ipifuncs.c
Log Message:
Rename ASR_IDSR to ASI_IDSR, which is ASI (Address Space Identifier),
not ASR (Ancillary State Register).
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/sparc64/include/ctlreg.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/sparc64/sparc64/ipifuncs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/ctlreg.h
diff -u src/sys/arch/sparc64/include/ctlreg.h:1.58 src/sys/arch/sparc64/include/ctlreg.h:1.59
--- src/sys/arch/sparc64/include/ctlreg.h:1.58 Thu Nov 8 16:30:12 2012
+++ src/sys/arch/sparc64/include/ctlreg.h Thu Nov 8 16:36:53 2012
@@ -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
Index: src/sys/arch/sparc64/sparc64/ipifuncs.c
diff -u src/sys/arch/sparc64/sparc64/ipifuncs.c:1.46 src/sys/arch/sparc64/sparc64/ipifuncs.c:1.47
--- src/sys/arch/sparc64/sparc64/ipifuncs.c:1.46 Wed Jul 4 07:03:30 2012
+++ src/sys/arch/sparc64/sparc64/ipifuncs.c Thu Nov 8 16:36:53 2012
@@ -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 @@ sparc64_send_ipi(int upaid, ipifunc_t fu
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 @@ sparc64_send_ipi(int upaid, ipifunc_t fu
}
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 @@ sparc64_send_ipi(int upaid, ipifunc_t fu
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
