/*\r
- FreeRTOS V7.5.0 - Copyright (C) 2013 Real Time Engineers Ltd.\r
+ FreeRTOS V9.0.1 - Copyright (C) 2017 Real Time Engineers Ltd.\r
+ All rights reserved\r
\r
VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
\r
- ***************************************************************************\r
- * *\r
- * FreeRTOS provides completely free yet professionally developed, *\r
- * robust, strictly quality controlled, supported, and cross *\r
- * platform software that has become a de facto standard. *\r
- * *\r
- * Help yourself get started quickly and support the FreeRTOS *\r
- * project by purchasing a FreeRTOS tutorial book, reference *\r
- * manual, or both from: http://www.FreeRTOS.org/Documentation *\r
- * *\r
- * Thank you! *\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
+ Free Software Foundation >>>> AND MODIFIED BY <<<< the FreeRTOS exception.\r
\r
- >>! NOTE: The modification to the GPL is included to allow you to distribute\r
- >>! a combined work that includes FreeRTOS without being obliged to provide\r
- >>! the source code for proprietary components outside of the FreeRTOS\r
- >>! kernel.\r
+ ***************************************************************************\r
+ >>! NOTE: The modification to the GPL is included to allow you to !<<\r
+ >>! distribute a combined work that includes FreeRTOS without being !<<\r
+ >>! obliged to provide the source code for proprietary components !<<\r
+ >>! outside of the FreeRTOS kernel. !<<\r
+ ***************************************************************************\r
\r
FreeRTOS is distributed in the hope that it will be useful, but WITHOUT ANY\r
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\r
- FOR A PARTICULAR PURPOSE. Full license text is available from the following\r
+ FOR A PARTICULAR PURPOSE. Full license text is available on the following\r
link: http://www.freertos.org/a00114.html\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
+ * FreeRTOS provides completely free yet professionally developed, *\r
+ * robust, strictly quality controlled, supported, and cross *\r
+ * platform software that is more than just the market leader, it *\r
+ * is the industry's de facto standard. *\r
* *\r
- * http://www.FreeRTOS.org/FAQHelp.html *\r
+ * Help yourself get started quickly while simultaneously helping *\r
+ * to support the FreeRTOS project by purchasing a FreeRTOS *\r
+ * tutorial book, reference manual, or both: *\r
+ * http://www.FreeRTOS.org/Documentation *\r
* *\r
***************************************************************************\r
\r
- http://www.FreeRTOS.org - Documentation, books, training, latest versions,\r
- license and Real Time Engineers Ltd. contact details.\r
+ http://www.FreeRTOS.org/FAQHelp.html - Having a problem? Start by reading\r
+ the FAQ page "My application does not run, what could be wrong?". Have you\r
+ defined configASSERT()?\r
+\r
+ http://www.FreeRTOS.org/support - In return for receiving this top quality\r
+ embedded software for free we request you assist our global community by\r
+ participating in the support forum.\r
+\r
+ http://www.FreeRTOS.org/training - Investing in training allows your team to\r
+ be as productive as possible as early as possible. Now you can receive\r
+ FreeRTOS training directly from Richard Barry, CEO of Real Time Engineers\r
+ Ltd, and the world's leading authority on the world's leading RTOS.\r
\r
http://www.FreeRTOS.org/plus - A selection of FreeRTOS ecosystem products,\r
including FreeRTOS+Trace - an indispensable productivity tool, a DOS\r
compatible FAT file system, and our tiny thread aware UDP/IP stack.\r
\r
- http://www.OpenRTOS.com - Real Time Engineers ltd license FreeRTOS to High\r
- Integrity Systems to sell under the OpenRTOS brand. Low cost OpenRTOS\r
- licenses offer ticketed support, indemnification and middleware.\r
+ http://www.FreeRTOS.org/labs - Where new FreeRTOS products go to incubate.\r
+ Come and try FreeRTOS+TCP, our new open source TCP/IP stack for FreeRTOS.\r
+\r
+ http://www.OpenRTOS.com - Real Time Engineers ltd. license FreeRTOS to High\r
+ Integrity Systems ltd. to sell under the OpenRTOS brand. Low cost OpenRTOS\r
+ licenses offer ticketed support, indemnification and commercial middleware.\r
\r
http://www.SafeRTOS.com - High Integrity Systems also provide a safety\r
engineered and independently SIL3 certified version for use in safety and\r
/*-----------------------------------------------------------*/\r
\r
/* The semaphore used to wake the uIP task when data arrives. */\r
-xSemaphoreHandle xEMACSemaphore = NULL;\r
+SemaphoreHandle_t xEMACSemaphore = NULL;\r
\r
/* The semaphore used to wake the interrupt handler task. The peripheral\r
is processed at the task level to prevent the need to read the entire FIFO from\r
within the ISR itself. */\r
-xSemaphoreHandle xMACInterruptSemaphore = NULL;\r
+SemaphoreHandle_t xMACInterruptSemaphore = NULL;\r
\r
/* The buffer used by the uIP stack. In this case the pointer is used to\r
point to one of the Rx buffers. */\r
-unsigned portCHAR *uip_buf;\r
+unsigned char *uip_buf;\r
\r
/* Buffers into which Rx data is placed. */\r
static union\r
{\r
- unsigned portLONG ulJustForAlignment;\r
- unsigned portCHAR ucRxBuffers[ emacNUM_RX_BUFFERS ][ UIP_BUFSIZE + ( 4 * emacFRAM_SIZE_BYTES ) ];\r
+ unsigned long ulJustForAlignment;\r
+ unsigned char 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
+static unsigned long ulRxLength[ emacNUM_RX_BUFFERS ];\r
\r
/* Used to keep a track of the number of bytes to transmit. */\r
-static unsigned portLONG ulNextTxSpace;\r
+static unsigned long ulNextTxSpace;\r
\r
/*-----------------------------------------------------------*/\r
\r
{\r
ulRxLength[ ulTemp ] = 0;\r
}\r
- \r
+\r
/* Create the queue and task used to defer the MAC processing to the\r
task level. */\r
vSemaphoreCreateBinary( xMACInterruptSemaphore );\r
xSemaphoreTake( xMACInterruptSemaphore, 0 );\r
- xReturn = xTaskCreate( vMACHandleTask, ( signed portCHAR * ) "MAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );\r
+ xReturn = xTaskCreate( vMACHandleTask, "MAC", configMINIMAL_STACK_SIZE, NULL, configMAX_PRIORITIES - 1, NULL );\r
vTaskDelay( macNEGOTIATE_DELAY );\r
- \r
+\r
/* We are only interested in Rx interrupts. */\r
IntPrioritySet( INT_ETH, configKERNEL_INTERRUPT_PRIORITY );\r
IntEnable( INT_ETH );\r
{\r
/* Leave room for the size at the start of the buffer. */\r
uip_buf = &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 2 ] );\r
- \r
+\r
ulRxLength[ ulNextRxBuffer ] = 0;\r
- \r
+\r
ulNextRxBuffer++;\r
if( ulNextRxBuffer >= emacNUM_RX_BUFFERS )\r
{\r
}\r
/*-----------------------------------------------------------*/\r
\r
-void vIncrementTxLength( unsigned portLONG ulLength )\r
+void vIncrementTxLength( unsigned long ulLength )\r
{\r
ulNextTxSpace += ulLength;\r
}\r
void vSendBufferToMAC( void )\r
{\r
unsigned long *pulSource;\r
-unsigned portSHORT * pus;\r
-unsigned portLONG ulNextWord;\r
+unsigned short * pus;\r
+unsigned long ulNextWord;\r
\r
/* Locate the data to be send. */\r
- pus = ( unsigned portSHORT * ) uip_buf;\r
+ pus = ( unsigned short * ) uip_buf;\r
\r
/* Add in the size of the data. */\r
pus--;\r
{\r
vTaskDelay( macWAIT_SEND_TIME );\r
}\r
- \r
- pulSource = ( unsigned portLONG * ) pus; \r
- \r
- for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned portLONG ) )\r
+\r
+ pulSource = ( unsigned long * ) pus;\r
+\r
+ for( ulNextWord = 0; ulNextWord < ulNextTxSpace; ulNextWord += sizeof( unsigned long ) )\r
{\r
HWREG(ETH_BASE + MAC_O_DATA) = *pulSource;\r
pulSource++;\r
void vEMAC_ISR( void )\r
{\r
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
-unsigned portLONG ulTemp;\r
+unsigned long ulTemp;\r
\r
/* Clear the interrupt. */\r
ulTemp = EthernetIntStatus( ETH_BASE, pdFALSE );\r
EthernetIntClear( ETH_BASE, ulTemp );\r
- \r
+\r
/* Was it an Rx interrupt? */\r
if( ulTemp & ETH_INT_RX )\r
{\r
xSemaphoreGiveFromISR( xMACInterruptSemaphore, &xHigherPriorityTaskWoken );\r
EthernetIntDisable( ETH_BASE, ETH_INT_RX );\r
}\r
- \r
+\r
/* Switch to the uIP task. */\r
portEND_SWITCHING_ISR( xHigherPriorityTaskWoken );\r
}\r
void vMACHandleTask( void *pvParameters )\r
{\r
unsigned long i, ulInt;\r
-unsigned portLONG ulLength;\r
+unsigned long ulLength;\r
unsigned long *pulBuffer;\r
-static unsigned portLONG ulNextRxBuffer = 0;\r
+static unsigned long ulNextRxBuffer = 0;\r
\r
for( ;; )\r
{\r
/* Wait for something to do. */\r
xSemaphoreTake( xMACInterruptSemaphore, portMAX_DELAY );\r
- \r
+\r
while( ( ulInt = ( EthernetIntStatus( ETH_BASE, pdFALSE ) & ETH_INT_RX ) ) != 0 )\r
- { \r
+ {\r
ulLength = HWREG( ETH_BASE + MAC_O_DATA );\r
- \r
+\r
/* Leave room at the start of the buffer for the size. */\r
- pulBuffer = ( unsigned long * ) &( uxRxBuffers.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 * ) &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 4 ] ); \r
+ /* Get the size of the data. */\r
+ pulBuffer = ( unsigned long * ) &( uxRxBuffers.ucRxBuffers[ ulNextRxBuffer ][ 4 ] );\r
ulLength &= 0xFFFF;\r
- \r
+\r
if( ulLength > 4 )\r
{\r
ulLength -= 4;\r
- \r
+\r
if( ulLength >= UIP_BUFSIZE )\r
{\r
/* The data won't fit in our buffer. Ensure we don't\r
}\r
\r
/* Read out the data into our buffer. */\r
- for( i = 0; i < ulLength; i += sizeof( unsigned portLONG ) )\r
+ for( i = 0; i < ulLength; i += sizeof( unsigned long ) )\r
{\r
*pulBuffer = HWREG( ETH_BASE + MAC_O_DATA );\r
pulBuffer++;\r
}\r
- \r
+\r
/* Store the length of the data into the separate array. */\r
ulRxLength[ ulNextRxBuffer ] = ulLength;\r
- \r
+\r
/* Use the next buffer the next time through. */\r
ulNextRxBuffer++;\r
if( ulNextRxBuffer >= emacNUM_RX_BUFFERS )\r
{\r
ulNextRxBuffer = 0;\r
}\r
- \r
+\r
/* Ensure the uIP task is not blocked as data has arrived. */\r
xSemaphoreGive( xEMACSemaphore );\r
}\r
}\r
- \r
+\r
EthernetIntEnable( ETH_BASE, ETH_INT_RX );\r
- \r
+\r
( void ) ulInt;\r
}\r
}\r
projects / freertos / blobdiff