[rtems commit] libcpu/powerpc/mpc5xx: use THREAD_DISABLE_DISPATCH_LEVEL in asm

[Gedare Bloom]

Module:    rtems
Branch:    master
Commit:    e626c60af4618faa0ea58678f2fa85e552e79c5c
Changeset: http://git.rtems.org/rtems/commit/?id=e626c60af4618faa0ea58678f2fa85e552e79c5c

Author:    Chirayu Desai <cdesai at cyanogenmod.org>
Date:      Fri Dec  6 23:02:57 2013 +0530

libcpu/powerpc/mpc5xx: use THREAD_DISABLE_DISPATCH_LEVEL in asm

---

 c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_asm.S |   26 ++++++++++++------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_asm.S b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_asm.S
index 33d6e3c..c428eae 100644
--- a/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_asm.S
+++ b/c/src/lib/libcpu/powerpc/mpc5xx/irq/irq_asm.S
@@ -110,9 +110,9 @@ SYM (dispatch_irq_handler):
 	addi	r14, r1, 0
 
 	/*
-	 * store part of _Thread_Dispatch_disable_level address in R15
+	 * store part of THREAD_DISPATCH_DISABLE_LEVEL address in R15
 	 */
-	addis r15, 0, _Thread_Dispatch_disable_level at ha
+	addis r15, 0, THREAD_DISPATCH_DISABLE_LEVEL at ha
 
 	/*
 	 * Retrieve current nesting level from _ISR_Nest_level
@@ -135,9 +135,9 @@ nested:
 	addi	r3, r3, 1
 
 	/*
-	 * Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level
+	 * Start Incrementing THREAD_DISPATCH_DISABLE_LEVEL R4 = THREAD_DISPATCH_DISABLE_LEVEL
 	 */
-	lwz	r6, _Thread_Dispatch_disable_level at l(r15)
+	lwz	r6, THREAD_DISPATCH_DISABLE_LEVEL at l(r15)
 
 	/* store new nesting level in _ISR_Nest_level */
 	stw	r3, ISR_NEST_LEVEL at l(r7)
@@ -145,9 +145,9 @@ nested:
 	addi	r6, r6, 1
 
 	/*
-	 * store new _Thread_Dispatch_disable_level value
+	 * store new THREAD_DISPATCH_DISABLE_LEVEL value
 	 */
-	stw	r6, _Thread_Dispatch_disable_level at l(r15)
+	stw	r6, THREAD_DISPATCH_DISABLE_LEVEL at l(r15)
 
 	/*
 	 * We are now running on the interrupt stack. External and decrementer
@@ -167,21 +167,21 @@ nested:
 	/*
 	 * start decrementing nesting level. Note : do not test result against 0
 	 * value as an easy exit condition because if interrupt nesting level > 1
-	 * then _Thread_Dispatch_disable_level > 1
+	 * then THREAD_DISPATCH_DISABLE_LEVEL > 1
 	 */
 	lis		r7, ISR_NEST_LEVEL at ha
 	lwz		r4, ISR_NEST_LEVEL at l(r7)
 
 	/*
-	 * start decrementing _Thread_Dispatch_disable_level
+	 * start decrementing THREAD_DISPATCH_DISABLE_LEVEL
 	 */
-	lwz	r3,_Thread_Dispatch_disable_level at l(r15)
+	lwz	r3,THREAD_DISPATCH_DISABLE_LEVEL at l(r15)
 
 	addi	r4, r4, -1	/* Continue decrementing nesting level */
-	addi	r3, r3, -1	/* Continue decrementing _Thread_Dispatch_disable_level */
+	addi	r3, r3, -1	/* Continue decrementing THREAD_DISPATCH_DISABLE_LEVEL */
 
 	stw	r4, ISR_NEST_LEVEL at l(r7) /* End decrementing nesting level */
-	stw	r3,_Thread_Dispatch_disable_level at l(r15) /* End decrementing _Thread_Dispatch_disable_level */
+	stw	r3,THREAD_DISPATCH_DISABLE_LEVEL at l(r15) /* End decrementing THREAD_DISPATCH_DISABLE_LEVEL */
 
 	cmpwi	r3, 0
 
@@ -190,11 +190,11 @@ nested:
 	 * contention. Could have been done before...)
 	 */
 	addi	r1, r14, 0
-	bne	easy_exit /* if (_Thread_Dispatch_disable_level != 0) goto easy_exit */
+	bne	easy_exit /* if (THREAD_DISPATCH_DISABLE_LEVEL != 0) goto easy_exit */
 
 	/*
 	 * Here we are running again on the thread system stack.
-	 * We have interrupt nesting level = _Thread_Dispatch_disable_level = 0.
+	 * We have interrupt nesting level = THREAD_DISPATCH_DISABLE_LEVEL = 0.
 	 * Interrupt are still disabled. Time to check if scheduler request to
 	 * do something with the current thread...
 	 */