Remove the two separate ports, instead use two demo apps that use a conditional compilation to select the method of interrupt management to use.

This commit is contained in:
Richard Barry 2008-10-23 19:16:29 +00:00
parent a91c6302e7
commit 53b376b6b8
5 changed files with 159 additions and 29 deletions

View file

@ -200,9 +200,7 @@ signed portBASE_TYPE xReturn;
}
/*-----------------------------------------------------------*/
#ifdef MSP_ROWLEY_RB_PORT
/* Serial interrupt service routines for the RB port. */
#if configINTERRUPT_EXAMPLE_METHOD == 1
/*
* UART RX interrupt service routine.
@ -226,6 +224,7 @@ signed portBASE_TYPE xReturn;
taskYIELD();
}
/* Make sure any low power mode bits are clear before leaving the ISR. */
__bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF );
}
/*-----------------------------------------------------------*/
@ -252,17 +251,16 @@ signed portBASE_TYPE xReturn;
sTHREEmpty = pdTRUE;
}
/* Make sure any low power mode bits are clear before leaving the ISR. */
__bic_SR_register_on_exit( SCG1 + SCG0 + OSCOFF + CPUOFF );
}
/*-----------------------------------------------------------*/
#endif
/*-----------------------------------------------------------*/
#elif configINTERRUPT_EXAMPLE_METHOD == 2
#ifdef MSP_ROWLEY_MP_PORT
/* Serial port interrupts for the alternative port code. */
void ISRCom1Rx( void )
/* This is a standard C function as an assembly file wrapper is used as an
interrupt entry point. */
void vRxISR( void )
{
signed portCHAR cChar;
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
@ -273,17 +271,16 @@ signed portBASE_TYPE xReturn;
xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );
if( xHigherPriorityTaskWoken )
{
/*If the post causes a task to wake force a context switch
as the woken task may have a higher priority than the task we have
interrupted. */
portEXIT_SWITCHING_ISR( pdTRUE );
}
/*If the post causes a task to wake force a context switch
as the woken task may have a higher priority than the task we have
interrupted. */
portYIELD_FROM_ISR( xHigherPriorityTaskWoken );
}
/*-----------------------------------------------------------*/
void ISRCom1Tx( void )
/* This is a standard C function as an assembly file wrapper is used as an
interrupt entry point. */
void vTxISR( void )
{
signed portCHAR cChar;
portBASE_TYPE xTaskWoken = pdFALSE;
@ -303,5 +300,5 @@ signed portBASE_TYPE xReturn;
}
}
#endif
#endif /* configINTERRUPT_EXAMPLE_METHOD */
/*-----------------------------------------------------------*/

View file

@ -0,0 +1,101 @@
/*
FreeRTOS.org V5.0.4 - Copyright (C) 2003-2008 Richard Barry.
This file is part of the FreeRTOS.org distribution.
FreeRTOS.org is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
FreeRTOS.org is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with FreeRTOS.org; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
A special exception to the GPL can be applied should you wish to distribute
a combined work that includes FreeRTOS.org, without being obliged to provide
the source code for any proprietary components. See the licensing section
of http://www.FreeRTOS.org for full details of how and when the exception
can be applied.
***************************************************************************
***************************************************************************
* *
* SAVE TIME AND MONEY! We can port FreeRTOS.org to your own hardware, *
* and even write all or part of your application on your behalf. *
* See http://www.OpenRTOS.com for details of the services we provide to *
* expedite your project. *
* *
***************************************************************************
***************************************************************************
Please ensure to read the configuration and relevant port sections of the
online documentation.
http://www.FreeRTOS.org - Documentation, latest information, license and
contact details.
http://www.SafeRTOS.com - A version that is certified for use in safety
critical systems.
http://www.OpenRTOS.com - Commercial support, development, porting,
licensing and training services.
*/
#include "FreeRTOSConfig.h"
#include "portasm.h"
/* These wrappers are only used when interrupt method 2 is being used. See
FreeRTOSConfig.h for an explanation. */
#if configINTERRUPT_EXAMPLE_METHOD == 2
.CODE
/* Wrapper for the Rx UART interrupt. */
_vUARTRx_Wrapper
portSAVE_CONTEXT
call #_vRxISR
portRESTORE_CONTEXT
/*-----------------------------------------------------------*/
/* Wrapper for the Tx UART interrupt. */
_vUARTTx_Wrapper
portSAVE_CONTEXT
call #_vTxISR
portRESTORE_CONTEXT
/*-----------------------------------------------------------*/
/* Place the UART ISRs in the correct vectors. */
.VECTORS
.KEEP
ORG UART1RX_VECTOR
DW _vUARTRx_Wrapper
ORG UART1TX_VECTOR
DW _vUARTTx_Wrapper
#endif /* configINTERRUPT_EXAMPLE_METHOD */
END