/*\r
- FreeRTOS.org V4.0.2 - Copyright (C) 2003-2006 Richard Barry.\r
-\r
- This file is part of the FreeRTOS.org distribution.\r
-\r
- FreeRTOS.org is free software; you can redistribute it and/or modify\r
- it under the terms of the GNU General Public License as published by\r
- the Free Software Foundation; either version 2 of the License, or\r
- (at your option) any later version.\r
-\r
- FreeRTOS.org is distributed in the hope that it will be useful,\r
- but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- GNU General Public License for more details.\r
-\r
- You should have received a copy of the GNU General Public License\r
- along with FreeRTOS.org; if not, write to the Free Software\r
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA\r
-\r
- A special exception to the GPL can be applied should you wish to distribute\r
- a combined work that includes FreeRTOS.org, without being obliged to provide\r
- the source code for any proprietary components. See the licensing section\r
- of http://www.FreeRTOS.org for full details of how and when the exception\r
- can be applied.\r
-\r
- ***************************************************************************\r
- See http://www.FreeRTOS.org for documentation, latest information, license\r
- and contact details. Please ensure to read the configuration and relevant\r
- port sections of the online documentation.\r
- ***************************************************************************\r
+ FreeRTOS V7.1.1 - Copyright (C) 2012 Real Time Engineers Ltd.\r
+ \r
+\r
+ ***************************************************************************\r
+ * *\r
+ * FreeRTOS tutorial books are available in pdf and paperback. *\r
+ * Complete, revised, and edited pdf reference manuals are also *\r
+ * available. *\r
+ * *\r
+ * Purchasing FreeRTOS documentation will not only help you, by *\r
+ * ensuring you get running as quickly as possible and with an *\r
+ * in-depth knowledge of how to use FreeRTOS, it will also help *\r
+ * the FreeRTOS project to continue with its mission of providing *\r
+ * professional grade, cross platform, de facto standard solutions *\r
+ * for microcontrollers - completely free of charge! *\r
+ * *\r
+ * >>> See http://www.FreeRTOS.org/Documentation for details. <<< *\r
+ * *\r
+ * Thank you for using FreeRTOS, and thank you for your support! *\r
+ * *\r
+ ***************************************************************************\r
+\r
+\r
+ This file is part of the FreeRTOS distribution.\r
+\r
+ FreeRTOS is free software; you can redistribute it and/or modify it under\r
+ the terms of the GNU General Public License (version 2) as published by the\r
+ Free Software Foundation AND MODIFIED BY the FreeRTOS exception.\r
+ >>>NOTE<<< The modification to the GPL is included to allow you to\r
+ distribute a combined work that includes FreeRTOS without being obliged to\r
+ provide the source code for proprietary components outside of the FreeRTOS\r
+ kernel. FreeRTOS is distributed in the hope that it will be useful, but\r
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY\r
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
+ more details. You should have received a copy of the GNU General Public\r
+ License and the FreeRTOS license exception along with FreeRTOS; if not it\r
+ can be viewed here: http://www.freertos.org/a00114.html and also obtained\r
+ by writing to Richard Barry, contact details for whom are available on the\r
+ FreeRTOS WEB site.\r
+\r
+ 1 tab == 4 spaces!\r
+ \r
+ ***************************************************************************\r
+ * *\r
+ * Having a problem? Start by reading the FAQ "My application does *\r
+ * not run, what could be wrong? *\r
+ * *\r
+ * http://www.FreeRTOS.org/FAQHelp.html *\r
+ * *\r
+ ***************************************************************************\r
+\r
+ \r
+ http://www.FreeRTOS.org - Documentation, training, latest information, \r
+ license and contact details.\r
+ \r
+ http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
+ including FreeRTOS+Trace - an indispensable productivity tool.\r
+\r
+ Real Time Engineers ltd license FreeRTOS to High Integrity Systems, who sell \r
+ the code with commercial support, indemnification, and middleware, under \r
+ the OpenRTOS brand: http://www.OpenRTOS.com. High Integrity Systems also\r
+ provide a safety engineered and independently SIL3 certified version under \r
+ the SafeRTOS brand: http://www.SafeRTOS.com.\r
*/\r
\r
-/* \r
-Changes from V3.2.4\r
-\r
- + Also read the EMAC_RSR register in the EMAC ISR as a work around the \r
- the EMAC bug that can reset the RX bit in EMAC_ISR register before the\r
- bit has been read.\r
-\r
-Changes from V4.0.1\r
-\r
- + Only check the interrupt status register to see if an EMAC Tx interrupt\r
- has occurred. Previously the TSR register was also inspected.\r
-*/\r
\r
#include "FreeRTOS.h"\r
#include "task.h"\r
task. */\r
static xSemaphoreHandle xSemaphore = NULL;\r
\r
-void vEMACISR( void ) __attribute__((naked));\r
+/* The interrupt entry point is naked so we can control the context saving. */\r
+void vEMACISR_Wrapper( void ) __attribute__((naked));\r
+\r
+/* The interrupt handler function must be separate from the entry function\r
+to ensure the correct stack frame is set up. */\r
+void vEMACISR_Handler( void );\r
\r
/*-----------------------------------------------------------*/\r
/*\r
* The EMAC ISR. Handles both Tx and Rx complete interrupts.\r
*/\r
-void vEMACISR( void )\r
+void vEMACISR_Handler( void )\r
{\r
- /* This ISR can cause a context switch, so the first statement must be a\r
- call to the portENTER_SWITCHING_ISR() macro. This must be BEFORE any\r
- variable declarations. */\r
- portENTER_SWITCHING_ISR();\r
-\r
- /* Variable definitions can be made now. */\r
- volatile unsigned portLONG ulIntStatus, ulEventStatus;\r
- portBASE_TYPE xSwitchRequired = pdFALSE;\r
- extern void vClearEMACTxBuffer( void );\r
+volatile unsigned long ulIntStatus, ulEventStatus;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+extern void vClearEMACTxBuffer( void );\r
\r
/* Find the cause of the interrupt. */\r
ulIntStatus = AT91C_BASE_EMAC->EMAC_ISR;\r
{\r
/* A frame has been received, signal the lwIP task so it can process\r
the Rx descriptors. */\r
- xSwitchRequired = xSemaphoreGiveFromISR( xSemaphore, pdFALSE );\r
+ xSemaphoreGiveFromISR( xSemaphore, &xHigherPriorityTaskWoken );\r
AT91C_BASE_EMAC->EMAC_RSR = AT91C_EMAC_REC;\r
}\r
\r
AT91C_BASE_AIC->AIC_EOICR = 0;\r
\r
/* If a task was woken by either a frame being received then we may need to \r
- switch to another task. */\r
- portEXIT_SWITCHING_ISR( xSwitchRequired );\r
+ switch to another task. If the unblocked task was of higher priority then\r
+ the interrupted task it will then execute immediately that the ISR\r
+ completes. */\r
+ if( xHigherPriorityTaskWoken )\r
+ {\r
+ portYIELD_FROM_ISR();\r
+ }\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vEMACISR_Wrapper( void )\r
+{\r
+ /* Save the context of the interrupted task. */\r
+ portSAVE_CONTEXT();\r
+\r
+ /* Call the handler to do the work. This must be a separate\r
+ function to ensure the stack frame is set up correctly. */\r
+ vEMACISR_Handler();\r
+\r
+ /* Restore the context of whichever task will execute next. */\r
+ portRESTORE_CONTEXT();\r
}\r
/*-----------------------------------------------------------*/\r
\r
projects / freertos / blobdiff