len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-04-19 21:11:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Correct merge.

Browse source
This commit is contained in:
Richard Barry 2008-02-16 21:10:19 +00:00
parent 7306d9b428
commit 2f75980fca
1 changed files with 22 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
Demo/MB91460_Softune/SRC/partest/partest.c
View file

@ -47,26 +47,20 @@
#define partstNUM_LEDs 8 #define partstNUM_LEDs 8
static unsigned portCHAR sState[ 2 ] = { 0xFF, 0xFF }; static unsigned portCHAR sState[ partstNUM_LEDs ] = { pdFALSE };
static unsigned portSHORT sState1[ partstNUM_LEDs ] = { pdFALSE }; static unsigned portCHAR sState1[ partstNUM_LEDs ] = { pdFALSE };
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
void vParTestInitialise( void ) void vParTestInitialise( void )
{ {
<<<<<<< .mine
/* Set port for LED outputs. */ /* Set port for LED outputs. */
DDR16 = 0xFF; DDR16 = 0xFF;
DDR25 = 0xFF; DDR25 = 0xFF;
/* Start with LEDs off. */ /* Start with LEDs off. */
PDR16 = 0x00;
PDR25 = 0x00; PDR25 = 0x00;
======= PDR16 = 0x00;
DDR00 = 0xFF;
PDR00 = 0xFF;
DDR09 = 0xFF;
PDR09 = 0xFF;
>>>>>>> .r192
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -74,16 +68,8 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
{ {
if( uxLED < partstNUM_LEDs ) if( uxLED < partstNUM_LEDs )
{ {
<<<<<<< .mine
taskENTER_CRITICAL(); taskENTER_CRITICAL();
=======
vTaskSuspendAll();
/* Toggle the state of the single genuine on board LED. */
if( ( sState[ 0 ] & ( ( unsigned portCHAR ) ( 1 << uxLED ) ) ) == 0 )
>>>>>>> .r192
{ {
<<<<<<< .mine
/* Toggle the state of the single genuine on board LED. */ /* Toggle the state of the single genuine on board LED. */
if( sState[ uxLED ] ) if( sState[ uxLED ] )
{ {
@ -97,20 +83,7 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
sState[uxLED] = !( sState[ uxLED ] ); sState[uxLED] = !( sState[ uxLED ] );
} }
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
=======
PDR09 |= ( 1 << uxLED );
sState[ 0 ] |= ( 1 << uxLED );
} }
else
{
PDR09 &= ~( 1 << uxLED );
sState[ 0 ] &= ~( 1 << uxLED );
}
xTaskResumeAll();
>>>>>>> .r192
}
<<<<<<< .mine
else else
{ {
uxLED -= partstNUM_LEDs; uxLED -= partstNUM_LEDs;
@ -134,27 +107,6 @@ void vParTestToggleLED( unsigned portBASE_TYPE uxLED )
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
} }
} }
=======
else
{
vTaskSuspendAll();
uxLED -= partstNUM_LEDs;
if( ( sState[ 1 ] & ( ( unsigned portCHAR ) ( 1 << uxLED ) ) ) == 0 )
{
PDR00 |= ( 1 << uxLED );
sState[ 1 ] |= ( 1 << uxLED );
}
else
{
PDR00 &= ~( 1 << uxLED );
sState[ 1 ] &= ~( 1 << uxLED );
}
xTaskResumeAll();
}
>>>>>>> .r192
} }
/*-----------------------------------------------------------*/ /*-----------------------------------------------------------*/
@ -163,29 +115,25 @@ void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
/* Set or clear the output [in this case show or hide the '*' character. */ /* Set or clear the output [in this case show or hide the '*' character. */
if( uxLED < partstNUM_LEDs ) if( uxLED < partstNUM_LEDs )
{ {
vTaskSuspendAll(); taskENTER_CRITICAL();
{ {
if( xValue ) if( xValue )
{ {
PDR09 &= ~( 1 << uxLED ); PDR25 |= ( 1 << uxLED );
sState[ 0 ] &= ~( 1 << uxLED ); sState[ uxLED ] = 1;
} }
else else
{ {
PDR09 |= ( 1 << uxLED ); PDR25 &= ~( 1 << uxLED );
sState[ 0 ] |= ( 1 << uxLED ); sState[ uxLED ] = 0;
} }
} }
taskEXIT_CRITICAL();
xTaskResumeAll();
} }
<<<<<<< .mine
else else
{ {
uxLED -= partstNUM_LEDs; uxLED -= partstNUM_LEDs;
if( uxLED < partstNUM_LEDs )
{
taskENTER_CRITICAL(); taskENTER_CRITICAL();
{ {
if( xValue ) if( xValue )
@ -202,25 +150,4 @@ void vParTestSetLED( unsigned portBASE_TYPE uxLED, signed portBASE_TYPE xValue )
taskEXIT_CRITICAL(); taskEXIT_CRITICAL();
} }
} }
=======
else
{
vTaskSuspendAll();
{
if( xValue )
{
PDR00 &= ~( 1 << uxLED );
sState[ 1 ] &= ~( 1 << uxLED );
}
else
{
PDR00 |= ( 1 << uxLED );
sState[ 1 ] |= ( 1 << uxLED );
}
}
xTaskResumeAll();
}
>>>>>>> .r192
}