/*\r
- FreeRTOS.org V4.3.1 - Copyright (C) 2003-2007 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
- Also see http://www.SafeRTOS.com for an IEC 61508 compliant version along\r
- with commercial development and support options.\r
- ***************************************************************************\r
+ FreeRTOS V7.1.0 - Copyright (C) 2011 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
+ http://www.FreeRTOS.org - Documentation, latest information, license and\r
+ contact details.\r
+\r
+ http://www.SafeRTOS.com - A version that is certified for use in safety\r
+ critical systems.\r
+\r
+ http://www.OpenRTOS.com - Commercial support, development, porting,\r
+ licensing and training services.\r
*/\r
\r
/* Scheduler include files. */\r
\r
/* Constants required for interrupt management. */\r
#define tcpCLEAR_VIC_INTERRUPT ( 0 )\r
-#define tcpEINT0_VIC_CHANNEL_BIT ( ( unsigned portLONG ) 0x4000 )\r
+#define tcpEINT0_VIC_CHANNEL_BIT ( ( unsigned long ) 0x4000 )\r
\r
/* EINT0 interrupt handler. This processes interrupts from the WIZnet device. */\r
-void vEINT0_ISR( void ) __attribute__((naked));\r
+void vEINT0_ISR_Wrapper( void ) __attribute__((naked));\r
+\r
+/* The handler that goes with the EINT0 wrapper. */\r
+void vEINT0_ISR_Handler( void );\r
\r
/* Variable is required for its address, but does not otherwise get used. */\r
-static portLONG lDummyVariable;\r
+static long lDummyVariable;\r
\r
/*\r
* When the WIZnet device asserts an interrupt we send an (empty) message to\r
* the TCP task. This wakes the task so the interrupt can be processed. The\r
* source of the interrupt has to be ascertained by the TCP task as this \r
* requires an I2C transaction which cannot be performed from this ISR.\r
+ * Note this code predates the introduction of semaphores, a semaphore should\r
+ * be used in place of the empty queue message.\r
*/\r
-void vEINT0_ISR( void )\r
+void vEINT0_ISR_Handler( void )\r
{\r
- portENTER_SWITCHING_ISR();\r
-\r
- extern xQueueHandle xTCPISRQueue;\r
- portBASE_TYPE xTaskWoken = pdFALSE;\r
+extern xQueueHandle xTCPISRQueue;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
\r
/* Just wake the TCP task so it knows an ISR has occurred. */\r
- xQueueSendFromISR( xTCPISRQueue, ( void * ) &lDummyVariable, xTaskWoken ); \r
+ xQueueSendFromISR( xTCPISRQueue, ( void * ) &lDummyVariable, &xHigherPriorityTaskWoken ); \r
\r
/* We cannot carry on processing interrupts until the TCP task has \r
processed this one - so for now interrupts are disabled. The TCP task will\r
/* Clear the interrupt bit. */ \r
VICVectAddr = tcpCLEAR_VIC_INTERRUPT;\r
\r
- /* Switch to the TCP task immediately so the cause of the interrupt can\r
- be ascertained. It is the responsibility of the TCP task to clear the\r
- interrupts. */\r
- portEXIT_SWITCHING_ISR( ( xTaskWoken ) );\r
+ if( xHigherPriorityTaskWoken )\r
+ {\r
+ portYIELD_FROM_ISR();\r
+ }\r
+}\r
+/*-----------------------------------------------------------*/\r
+\r
+void vEINT0_ISR_Wrapper( void )\r
+{\r
+ /* Save the context of the interrupted task. */\r
+ portSAVE_CONTEXT();\r
+\r
+ /* The handler must be a separate function from the wrapper to\r
+ ensure the correct stack frame is set up. */\r
+ vEINT0_ISR_Handler();\r
+\r
+ /* Restore the context of whichever task is going to run next. */\r
+ portRESTORE_CONTEXT();\r
}\r
\r
\r
projects / freertos / blobdiff