summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libcpu/sh
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-05-21 16:33:00 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-05-21 16:33:00 +0000
commit6a046fe0ce33fee68994842c22823003619f49a1 (patch)
treeec3373d9a85693d847588863875f5c5d3e9e61cc /c/src/lib/libcpu/sh
parentMerge sparc64-rtems. (diff)
downloadrtems-6a046fe0ce33fee68994842c22823003619f49a1.tar.bz2
2010-05-21 Joel Sherrill <joel.sherrill@oarcorp.com>
* sh7032/score/cpu_asm.c, sh7045/score/cpu_asm.c, sh7750/score/cpu_asm.c, shgdb/score/cpu_asm.c: Spacing.
Diffstat (limited to 'c/src/lib/libcpu/sh')
-rw-r--r--c/src/lib/libcpu/sh/ChangeLog5
-rw-r--r--c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c20
-rw-r--r--c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c20
-rw-r--r--c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c13
-rw-r--r--c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c12
5 files changed, 37 insertions, 33 deletions
diff --git a/c/src/lib/libcpu/sh/ChangeLog b/c/src/lib/libcpu/sh/ChangeLog
index d489114233..8223788a98 100644
--- a/c/src/lib/libcpu/sh/ChangeLog
+++ b/c/src/lib/libcpu/sh/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-21 Joel Sherrill <joel.sherrill@oarcorp.com>
+
+ * sh7032/score/cpu_asm.c, sh7045/score/cpu_asm.c,
+ sh7750/score/cpu_asm.c, shgdb/score/cpu_asm.c: Spacing.
+
2010-04-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* sh7045/include/sci_termios.h, sh7045/sci/sci.c,
diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
index b9f8a4358b..34605a1fc7 100644
--- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
@@ -45,7 +45,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -76,18 +76,18 @@ unsigned int sh_set_irq_priority(
/*
* first check for valid interrupt
*/
- if(( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
+ if (( irq > 113) || (_Hardware_isr_Table[irq] == _dummy_isp))
return -1;
/*
* check for valid irq priority
*/
- if( prio > 15 )
+ if ( prio > 15 )
return -1;
/*
* look up appropriate interrupt priority register
*/
- if( irq > 71)
+ if ( irq > 71)
{
irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -103,7 +103,7 @@ unsigned int sh_set_irq_priority(
else
{
shiftcount = 12 - 4 * ( irq % 4);
- if( irq > 67)
+ if ( irq > 67)
prioreg = INTC_IPRB;
else
prioreg = INTC_IPRA;
@@ -136,8 +136,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -151,7 +151,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -160,9 +160,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if(CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
index 35ce1b3359..9cd38dd723 100644
--- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
@@ -44,7 +44,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -75,18 +75,18 @@ unsigned int sh_set_irq_priority(
/*
* first check for valid interrupt
*/
- if(( irq > 156) || (irq < 64) || (_Hardware_isr_Table[irq] == _dummy_isp))
+ if (( irq > 156) || (irq < 64) || (_Hardware_isr_Table[irq] == _dummy_isp))
return -1;
/*
* check for valid irq priority
*/
- if( prio > 15 )
+ if ( prio > 15 )
return -1;
/*
* look up appropriate interrupt priority register
*/
- if( irq > 71)
+ if ( irq > 71)
{
irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -105,7 +105,7 @@ unsigned int sh_set_irq_priority(
else
{
shiftcount = 12 - 4 * ( irq % 4);
- if( irq > 67)
+ if ( irq > 67)
prioreg = INTC_IPRB;
else
prioreg = INTC_IPRA;
@@ -138,8 +138,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -153,7 +153,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -162,9 +162,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff --git a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
index 11a5dab76f..7c4e7562af 100644
--- a/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
@@ -44,7 +44,7 @@
/* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[];
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -62,8 +62,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -77,7 +77,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -86,9 +86,8 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
-
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif
diff --git a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
index 210e4ee1f4..5a66d18e69 100644
--- a/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
+++ b/c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
@@ -17,7 +17,7 @@
#include <rtems/score/thread.h>
#include <rtems/score/sh.h>
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
unsigned long *_old_stack_ptr;
#endif
@@ -35,8 +35,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+ if ( _ISR_Nest_level == 0 )
{
/* Install irq stack */
_old_stack_ptr = stack_ptr;
@@ -50,7 +50,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level );
/* call isp */
- if( _ISR_Vector_table[ vector])
+ if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level );
@@ -59,9 +59,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--;
-#if( CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
+#if (CPU_HAS_SOFTWARE_INTERRUPT_STACK == TRUE)
- if( _ISR_Nest_level == 0 )
+ if ( _ISR_Nest_level == 0 )
/* restore old stack pointer */
stack_ptr = _old_stack_ptr;
#endif