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

[freertos] / FreeRTOS / Demo / ARM7_AT91SAM7S64_IAR / USB / USBSample.c

diff --git a/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c b/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
index cf23e4e5237d202b4c266eb395bff8be63b6e786..924fd55f5cb5e19b295fd0fd677de172ef6a8ac6 100644 (file)
--- a/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
+++ b/FreeRTOS/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 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
@@ -168,9 +168,9 @@ little odd. */
 #define usbMAX_TX_MESSAGE_SIZE                         ( 128 )\r
 #define usbRX_COUNT_MASK                                       ( ( unsigned long ) 0x7ff )\r
 #define AT91C_UDP_STALLSENT                                    AT91C_UDP_ISOERROR\r
-#define usbSHORTEST_DELAY                                      ( ( portTickType ) 1 )\r
-#define usbINIT_DELAY                                          ( ( portTickType ) 500 / portTICK_RATE_MS )\r
-#define usbSHORT_DELAY                                         ( ( portTickType ) 50 / portTICK_RATE_MS )\r
+#define usbSHORTEST_DELAY                                      ( ( TickType_t ) 1 )\r
+#define usbINIT_DELAY                                          ( ( TickType_t ) 500 / portTICK_PERIOD_MS )\r
+#define usbSHORT_DELAY                                         ( ( TickType_t ) 50 / portTICK_PERIOD_MS )\r
 #define usbEND_POINT_RESET_MASK                                ( ( unsigned long ) 0x0f )\r
 #define usbDATA_INC                                                    ( ( char ) 5 )\r
 #define usbEXPECTED_NUMBER_OF_BYTES                    ( ( unsigned long ) 8 )\r
@@ -542,7 +542,7 @@ static xISRStatus xISRMessages[ usbQUEUE_LENGTH + 1 ];
 static xTX_MESSAGE pxCharsForTx;\r
 \r
 /* Queue used to pass messages between the ISR and the task. */\r
-static xQueueHandle xUSBInterruptQueue;\r
+static QueueHandle_t xUSBInterruptQueue;\r
 \r
 /* ISR entry has to be written in the asm file as we want a context switch\r
 to occur from within the ISR.  See the port documentation on the FreeRTOS.org\r