Update the demo directory to use the version 8 type naming conventions.

[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 65fb5585ab9b4bf6a9488a0734586932db11bae1..e3448a90c92279ad75a358d5e092223952cd27cf 100644 (file)
--- a/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
+++ b/FreeRTOS/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
@@ -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