From 012a7c9b61ece5aec5c3a98e728e59fdcc9329ae Mon Sep 17 00:00:00 2001
From: rtel <rtel@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Date: Tue, 11 Feb 2014 12:04:59 +0000
Subject: Update the demo directory to use the version 8 type naming
 conventions.

git-svn-id: http://svn.code.sf.net/p/freertos/code/trunk@2202 1d2547de-c912-0410-9cb9-b8ca96c0e9e2
---
 FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h     | 2 +-
 FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c               | 4 ++--
 FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c | 2 +-
 FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c     | 2 +-
 FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo')

diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 3f9090c80..56453917a 100644
--- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -95,7 +95,7 @@
 #define configUSE_IDLE_HOOK         0
 #define configUSE_TICK_HOOK         1
 #define configCPU_CLOCK_HZ          ( ( unsigned long ) 48000000 )	/* =12Mhz xtal multiplied by 5 using the PLL. */
-#define configTICK_RATE_HZ          ( ( portTickType ) 1000 )
+#define configTICK_RATE_HZ          ( ( TickType_t ) 1000 )
 #define configMAX_PRIORITIES		( 4 )
 #define configMINIMAL_STACK_SIZE	( ( unsigned short ) 104 )
 #define configTOTAL_HEAP_SIZE		( ( size_t ) ( 18 * 1024 ) )
diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
index ad0d4e529..d723b37d8 100644
--- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
@@ -105,7 +105,7 @@
 
 /* Demo application definitions. */
 #define mainQUEUE_SIZE						( 3 )
-#define mainCHECK_DELAY						( ( portTickType ) 5000 / portTICK_RATE_MS )
+#define mainCHECK_DELAY						( ( TickType_t ) 5000 / portTICK_PERIOD_MS )
 #define mainBASIC_WEB_STACK_SIZE            ( configMINIMAL_STACK_SIZE * 6 )
 
 /* Task priorities. */
@@ -152,7 +152,7 @@ static void vLCDTask( void *pvParameters );
 static void prvSetupHardware( void );
 
 /* The queue used to send messages to the LCD task. */
-xQueueHandle xLCDQueue;
+QueueHandle_t xLCDQueue;
 
 /*-----------------------------------------------------------*/
 
diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
index 6d7b55310..8140babcd 100644
--- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
@@ -8,7 +8,7 @@ void vEMAC_ISR_Wrapper( void ) __attribute__((naked));
 /* The handler that does the actual work. */
 void vEMAC_ISR_Handler( void ) __attribute__((noinline));
 
-extern xSemaphoreHandle xEMACSemaphore;
+extern SemaphoreHandle_t xEMACSemaphore;
 
 
 void vEMAC_ISR_Handler( void )
diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c
index 98db4f265..294cfb145 100644
--- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/emac.c
@@ -23,7 +23,7 @@
 #include "emac.h"
 
 /* The semaphore used to wake the uIP task when data arives. */
-xSemaphoreHandle xEMACSemaphore = NULL;
+SemaphoreHandle_t xEMACSemaphore = NULL;
 
 static unsigned short *rptr;
 static unsigned short *tptr;
diff --git a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
index 488177ac1..f97daccb2 100644
--- a/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
+++ b/FreeRTOS/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
@@ -127,7 +127,7 @@ clock_time_t clock_time( void );
 /*-----------------------------------------------------------*/
 
 /* The semaphore used by the ISR to wake the uIP task. */
-extern xSemaphoreHandle xEMACSemaphore;
+extern SemaphoreHandle_t xEMACSemaphore;
 
 /*-----------------------------------------------------------*/
 
@@ -285,7 +285,7 @@ void vApplicationProcessFormInput( char *pcInputString, portBASE_TYPE xInputLeng
 {
 char *c, *pcText;
 static char cMessageForDisplay[ 32 ];
-extern xQueueHandle xLCDQueue;
+extern QueueHandle_t xLCDQueue;
 xLCDMessage xLCDMessage;
 
 	/* Process the form input sent by the IO page of the served HTML. */
-- 
cgit v1.2.1