Update version number to 8.1.2 after moving the defaulting of configUSE_PORT_OPTIMISE...

[freertos] / FreeRTOS / Demo / lwIP_Demo_Rowley_ARM7 / EMAC / SAM7_EMAC.c

diff --git a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
index 3b1ab624972064339e1e9b8346627778dfe9996b..c82aa2ac8235791f58b01dbaabefc334d3acaf4d 100644 (file)
--- a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
+++ b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V8.0.0:rc1 - Copyright (C) 2014 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.2 - Copyright (C) 2014 Real Time Engineers Ltd. \r
     All rights reserved\r
 \r
     VISIT http://www.FreeRTOS.org TO ENSURE YOU ARE USING THE LATEST VERSION.\r
@@ -24,10 +24,10 @@
     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
 \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
+    >>!   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
     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
@@ -136,7 +136,7 @@ one not be immediately available when trying to transmit a frame. */
 #define emacMAX_WAIT_CYCLES                    ( ( portBASE_TYPE ) ( configTICK_RATE_HZ / 40 ) )\r
 \r
 /* The time to block waiting for input. */\r
-#define emacBLOCK_TIME_WAITING_FOR_INPUT       ( ( portTickType ) 100 )\r
+#define emacBLOCK_TIME_WAITING_FOR_INPUT       ( ( TickType_t ) 100 )\r
 \r
 /* Peripheral setup for the EMAC. */\r
 #define emacPERIPHERAL_A_SETUP                 ( ( unsigned long ) AT91C_PB2_ETX0                      ) | \\r
@@ -162,7 +162,7 @@ one not be immediately available when trying to transmit a frame. */
 #define emacINTERRUPT_LEVEL                    ( 5 )\r
 #define emacNO_DELAY                           ( 0 )\r
 #define emacTOTAL_FRAME_HEADER_SIZE    ( 54 )\r
-#define emacPHY_INIT_DELAY                     ( 5000 / portTICK_RATE_MS )\r
+#define emacPHY_INIT_DELAY                     ( 5000 / portTICK_PERIOD_MS )\r
 #define emacRESET_KEY                          ( ( unsigned long ) 0xA5000000 )\r
 #define emacRESET_LENGTH                       ( ( unsigned long ) ( 0x01 << 8 ) )\r
 \r
@@ -224,7 +224,7 @@ static portBASE_TYPE prvProbePHY( void );
 \r
 \r
 /* The semaphore used by the EMAC ISR to wake the EMAC task. */\r
-static xSemaphoreHandle xSemaphore = NULL;\r
+static SemaphoreHandle_t xSemaphore = NULL;\r
 \r
 /* Holds the index to the next buffer from which data will be read. */\r
 static volatile unsigned long ulNextRxBuffer = 0;\r
@@ -485,7 +485,7 @@ register unsigned long ulBytesRemainingInBuffer, ulRemainingSectionBytes;
 /*-----------------------------------------------------------*/\r
 \r
 /* See the header file for descriptions of public functions. */\r
-xSemaphoreHandle xEMACInit( void )\r
+SemaphoreHandle_t xEMACInit( void )\r
 {\r
        /* Code supplied by Atmel -------------------------------*/\r
 \r