RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-05-21 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* sh7032/score/cpu_asm.c, sh7045/score/cpu_asm.c,
	sh7750/score/cpu_asm.c, shgdb/score/cpu_asm.c: Spacing.
This commit is contained in:
Joel Sherrill
2010-05-21 16:33:00 +00:00
parent 2dfedf4a96
commit 6a046fe0ce
5 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
c/src/lib/libcpu/sh/ChangeLog
View File

@@ -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> 2010-04-15 Ralf Corsépius <ralf.corsepius@rtems.org>
* sh7045/include/sci_termios.h, sh7045/sci/sci.c, * sh7045/include/sci_termios.h, sh7045/sci/sci.c,

20
c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c
View File

@@ -45,7 +45,7 @@
/* from cpu_isps.c */ /* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[]; 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; unsigned long *_old_stack_ptr;
#endif #endif
@@ -76,18 +76,18 @@ unsigned int sh_set_irq_priority(
/* /*
* first check for valid interrupt * 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; return -1;
/* /*
* check for valid irq priority * check for valid irq priority
*/ */
if( prio > 15 ) if ( prio > 15 )
return -1; return -1;
/* /*
* look up appropriate interrupt priority register * look up appropriate interrupt priority register
*/ */
if( irq > 71) if ( irq > 71)
{ {
irq = irq - 72; irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16); shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -103,7 +103,7 @@ unsigned int sh_set_irq_priority(
else else
{ {
shiftcount = 12 - 4 * ( irq % 4); shiftcount = 12 - 4 * ( irq % 4);
if( irq > 67) if ( irq > 67)
prioreg = INTC_IPRB; prioreg = INTC_IPRB;
else else
prioreg = INTC_IPRA; prioreg = INTC_IPRA;
@@ -136,8 +136,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++; _Thread_Dispatch_disable_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 )
{ {
/* Install irq stack */ /* Install irq stack */
_old_stack_ptr = stack_ptr; _old_stack_ptr = stack_ptr;
@@ -151,7 +151,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level ); _ISR_Enable( level );
/* call isp */ /* call isp */
if( _ISR_Vector_table[ vector]) if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector ); (*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level ); _ISR_Disable( level );
@@ -160,9 +160,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--; _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 */ /* restore old stack pointer */
stack_ptr = _old_stack_ptr; stack_ptr = _old_stack_ptr;
#endif #endif

20
c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c
View File

@@ -44,7 +44,7 @@
/* from cpu_isps.c */ /* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[]; 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; unsigned long *_old_stack_ptr;
#endif #endif
@@ -75,18 +75,18 @@ unsigned int sh_set_irq_priority(
/* /*
* first check for valid interrupt * 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; return -1;
/* /*
* check for valid irq priority * check for valid irq priority
*/ */
if( prio > 15 ) if ( prio > 15 )
return -1; return -1;
/* /*
* look up appropriate interrupt priority register * look up appropriate interrupt priority register
*/ */
if( irq > 71) if ( irq > 71)
{ {
irq = irq - 72; irq = irq - 72;
shiftcount = 12 - ((irq & ~0x03) % 16); shiftcount = 12 - ((irq & ~0x03) % 16);
@@ -105,7 +105,7 @@ unsigned int sh_set_irq_priority(
else else
{ {
shiftcount = 12 - 4 * ( irq % 4); shiftcount = 12 - 4 * ( irq % 4);
if( irq > 67) if ( irq > 67)
prioreg = INTC_IPRB; prioreg = INTC_IPRB;
else else
prioreg = INTC_IPRA; prioreg = INTC_IPRA;
@@ -138,8 +138,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++; _Thread_Dispatch_disable_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 )
{ {
/* Install irq stack */ /* Install irq stack */
_old_stack_ptr = stack_ptr; _old_stack_ptr = stack_ptr;
@@ -153,7 +153,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level ); _ISR_Enable( level );
/* call isp */ /* call isp */
if( _ISR_Vector_table[ vector]) if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector ); (*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level ); _ISR_Disable( level );
@@ -162,9 +162,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--; _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 */ /* restore old stack pointer */
stack_ptr = _old_stack_ptr; stack_ptr = _old_stack_ptr;
#endif #endif

13
c/src/lib/libcpu/sh/sh7750/score/cpu_asm.c
View File

@@ -44,7 +44,7 @@
/* from cpu_isps.c */ /* from cpu_isps.c */
extern proc_ptr _Hardware_isr_Table[]; 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; unsigned long *_old_stack_ptr;
#endif #endif
@@ -62,8 +62,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++; _Thread_Dispatch_disable_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 )
{ {
/* Install irq stack */ /* Install irq stack */
_old_stack_ptr = stack_ptr; _old_stack_ptr = stack_ptr;
@@ -77,7 +77,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level ); _ISR_Enable( level );
/* call isp */ /* call isp */
if( _ISR_Vector_table[ vector]) if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector ); (*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level ); _ISR_Disable( level );
@@ -86,9 +86,8 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--; _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 */ /* restore old stack pointer */
stack_ptr = _old_stack_ptr; stack_ptr = _old_stack_ptr;
#endif #endif

12
c/src/lib/libcpu/sh/shgdb/score/cpu_asm.c
View File

@@ -17,7 +17,7 @@
#include <rtems/score/thread.h> #include <rtems/score/thread.h>
#include <rtems/score/sh.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; unsigned long *_old_stack_ptr;
#endif #endif
@@ -35,8 +35,8 @@ void __ISR_Handler( uint32_t vector)
_Thread_Dispatch_disable_level++; _Thread_Dispatch_disable_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 )
{ {
/* Install irq stack */ /* Install irq stack */
_old_stack_ptr = stack_ptr; _old_stack_ptr = stack_ptr;
@@ -50,7 +50,7 @@ void __ISR_Handler( uint32_t vector)
_ISR_Enable( level ); _ISR_Enable( level );
/* call isp */ /* call isp */
if( _ISR_Vector_table[ vector]) if ( _ISR_Vector_table[ vector])
(*_ISR_Vector_table[ vector ])( vector ); (*_ISR_Vector_table[ vector ])( vector );
_ISR_Disable( level ); _ISR_Disable( level );
@@ -59,9 +59,9 @@ void __ISR_Handler( uint32_t vector)
_ISR_Nest_level--; _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 */ /* restore old stack pointer */
stack_ptr = _old_stack_ptr; stack_ptr = _old_stack_ptr;
#endif #endif