/*\r
- FreeRTOS.org V4.7.1 - 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
- 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.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
/* Kernel includes. */\r
#include "FreeRTOS.h"\r
-#include "Semphr.h"\r
+#include "semphr.h"\r
#include "task.h"\r
\r
/* Demo includes. */\r
-#include "EMAC.h"\r
+#include "emac.h"\r
\r
/* uIP includes. */\r
#include "uip.h"\r
unsigned portCHAR *uip_buf;\r
\r
/* Buffers into which Rx data is placed. */\r
-static unsigned portCHAR ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ];\r
+static union\r
+{\r
+ unsigned portLONG ulJustForAlignment;\r
+ unsigned portCHAR ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ];\r
+} uxRxBuffers;\r
\r
/* The length of the data within each of the Rx buffers. */\r
static unsigned portLONG ulRxLength[ emacNUM_RX_BUFFERS ];\r
if( iLen != 0 )\r
{\r
/* Leave room for the size at the start of the buffer. */\r
- uip_buf = &( ucRxBuffers[ ulNextRxBuffer ][ 2 ] );\r
+ uip_buf = &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 2 ] );\r
\r
ulRxLength[ ulNextRxBuffer ] = 0;\r
\r
\r
void vEMAC_ISR( void )\r
{\r
-portBASE_TYPE xSwitchRequired = pdFALSE;\r
+portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
unsigned portLONG ulTemp;\r
\r
/* Clear the interrupt. */\r
/* Was it an Rx interrupt? */\r
if( ulTemp & ETH_INT_RX )\r
{\r
- xSwitchRequired = pdTRUE;\r
- xSemaphoreGiveFromISR( xMACInterruptSemaphore, pdFALSE );\r
+ xSemaphoreGiveFromISR( xMACInterruptSemaphore, &xHigherPriorityTaskWoken );\r
EthernetIntDisable( ETH_BASE, ETH_INT_RX );\r
}\r
\r
/* Switch to the uIP task. */\r
- portEND_SWITCHING_ISR( xSwitchRequired );\r
+ portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
}\r
/*-----------------------------------------------------------*/\r
\r
void vMACHandleTask( void *pvParameters )\r
{\r
-unsigned long ulLen = 0, i;\r
-unsigned portLONG ulLength, ulInt;\r
+unsigned long i, ulInt;\r
+unsigned portLONG ulLength;\r
unsigned long *pulBuffer;\r
static unsigned portLONG ulNextRxBuffer = 0;\r
-portBASE_TYPE xSwitchRequired = pdFALSE;\r
\r
for( ;; )\r
{\r
ulLength = HWREG( ETH_BASE + MAC_O_DATA );\r
\r
/* Leave room at the start of the buffer for the size. */\r
- pulBuffer = ( unsigned long * ) &( ucRxBuffers[ ulNextRxBuffer ][ 2 ] ); \r
+ pulBuffer = ( unsigned long * ) &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 2 ] ); \r
*pulBuffer = ( ulLength >> 16 );\r
\r
/* Get the size of the data. */ \r
- pulBuffer = ( unsigned long * ) &( ucRxBuffers[ ulNextRxBuffer ][ 4 ] ); \r
+ pulBuffer = ( unsigned long * ) &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 4 ] ); \r
ulLength &= 0xFFFF;\r
\r
if( ulLength > 4 )\r
}\r
\r
EthernetIntEnable( ETH_BASE, ETH_INT_RX );\r
+ \r
+ ( void ) ulInt;\r
}\r
}\r
\r
projects / freertos / blobdiff