/*\r
- FreeRTOS.org V4.8.0 - Copyright (C) 2003-2008 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
- ***************************************************************************\r
- * *\r
- * SAVE TIME AND MONEY! Why not get us to quote to get FreeRTOS.org *\r
- * running on your hardware - or even write all or part of your application*\r
- * for you? See http://www.OpenRTOS.com for details. *\r
- * *\r
- ***************************************************************************\r
- ***************************************************************************\r
-\r
- Please ensure to read the configuration and relevant port sections of the\r
- online documentation.\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
+ FreeRTOS V6.0.0 - Copyright (C) 2009 Real Time Engineers Ltd.\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 exception to the GPL is included to allow you to distribute a\r
+ combined work that includes FreeRTOS without being obliged to provide the\r
+ source code for proprietary components outside of the FreeRTOS kernel.\r
+ Alternative commercial license and support terms are also available upon\r
+ request. See the licensing section of http://www.FreeRTOS.org for full\r
+ license details.\r
+\r
+ FreeRTOS is distributed in the hope that it will be useful, but WITHOUT\r
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or\r
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for\r
+ more details.\r
+\r
+ You should have received a copy of the GNU General Public License along\r
+ with FreeRTOS; if not, write to the Free Software Foundation, Inc., 59\r
+ Temple Place, Suite 330, Boston, MA 02111-1307 USA.\r
+\r
+\r
+ ***************************************************************************\r
+ * *\r
+ * The FreeRTOS eBook and reference manual are available to purchase for a *\r
+ * small fee. Help yourself get started quickly while also helping the *\r
+ * FreeRTOS project! See http://www.FreeRTOS.org/Documentation for details *\r
+ * *\r
+ ***************************************************************************\r
+\r
+ 1 tab == 4 spaces!\r
+\r
+ Please ensure to read the configuration and relevant port sections of the\r
+ online documentation.\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
#include "FreeRTOS.h"\r
\r
/* Handler called by the ISR wrapper. This must be kept a separate\r
function to ensure the stack frame is correctly set up. */\r
-void vEMACISR_Handler( void );\r
+void vEMACISR_Handler( void ) __attribute__((noinline));\r
\r
static xSemaphoreHandle xEMACSemaphore;\r
\r
\r
void vEMACISR_Handler( void )\r
{\r
-volatile unsigned portLONG ulIntStatus, ulRxStatus;\r
-portBASE_TYPE xSwitchRequired = pdFALSE;\r
+volatile unsigned long ulIntStatus, ulRxStatus;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
\r
ulIntStatus = AT91C_BASE_EMAC->EMAC_ISR;\r
ulRxStatus = AT91C_BASE_EMAC->EMAC_RSR;\r
{\r
/* A frame has been received, signal the uIP task so it can process\r
the Rx descriptors. */\r
- xSwitchRequired = xSemaphoreGiveFromISR( xEMACSemaphore, pdFALSE );\r
+ xSemaphoreGiveFromISR( xEMACSemaphore, &xHigherPriorityTaskWoken );\r
AT91C_BASE_EMAC->EMAC_RSR = AT91C_EMAC_REC;\r
}\r
\r
AT91C_BASE_AIC->AIC_EOICR = 0;\r
\r
/* Switch to the uIP task. */\r
- if( xSwitchRequired )\r
+ if( xHigherPriorityTaskWoken )\r
{\r
/* If a task of higher priority than the interrupted task was\r
unblocked by the ISR then this call will ensure that the \r
\r
/* Call the handler task to do the actual work. This must be a separate\r
function to ensure the stack frame is correctly set up. */\r
- vEMACISR_Handler();\r
+ __asm volatile ("bl vEMACISR_Handler");\r
\r
/* Restore the context of whichever task is the next to run. */\r
portRESTORE_CONTEXT();\r
projects / freertos / blobdiff