Update version number to 8.1.1 for patch release that re-enables mutexes to be given...

[freertos] / FreeRTOS / Demo / lwIP_Demo_Rowley_ARM7 / USB / USB-CDC.c

diff --git a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
index 573c6a57581ac04cbe1eec7f741f42d92b40405f..7febeb64d869377877052a96f1ee800726137629 100644 (file)
--- a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
+++ b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
@@ -1,5 +1,5 @@
 /*\r
-    FreeRTOS V7.6.0 - Copyright (C) 2013 Real Time Engineers Ltd. \r
+    FreeRTOS V8.1.1 - 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
@@ -90,7 +90,7 @@
 #include "USB-CDC.h"\r
 #include "descriptors.h"\r
 \r
-#define usbNO_BLOCK ( ( portTickType ) 0 )\r
+#define usbNO_BLOCK ( ( TickType_t ) 0 )\r
 \r
 /* Reset all endpoints */\r
 static void prvResetEndPoints( void );\r
@@ -143,12 +143,12 @@ static xCONTROL_MESSAGE pxControlTx;
 static xCONTROL_MESSAGE pxControlRx;\r
 \r
 /* Queue holding pointers to pending messages */\r
-xQueueHandle xUSBInterruptQueue; \r
+QueueHandle_t xUSBInterruptQueue; \r
 \r
 /* Queues used to hold received characters, and characters waiting to be\r
 transmitted.  Rx queue must be larger than FIFO size. */\r
-static xQueueHandle xRxCDC; \r
-static xQueueHandle xTxCDC; \r
+static QueueHandle_t xRxCDC; \r
+static QueueHandle_t xTxCDC; \r
 \r
 /* Line coding - 115,200 baud, N-8-1 */\r
 static const unsigned char pxLineCoding[] = { 0x00, 0xC2, 0x01, 0x00, 0x00, 0x00, 0x08 };\r
@@ -176,7 +176,7 @@ portBASE_TYPE xByte;
                 vDetachUSBInterface();\r
        portEXIT_CRITICAL();\r
        \r
-       vTaskDelay( portTICK_RATE_MS * 60 );\r
+       vTaskDelay( portTICK_PERIOD_MS * 60 );\r
 \r
        /* Init USB interface */\r
        portENTER_CRITICAL();\r