diff options
Diffstat (limited to 'FreeRTOS/Demo/WizNET_DEMO_TERN_186')
| -rw-r--r-- | FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WizNET_DEMO_TERN_186/HTTPTask.c | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WizNET_DEMO_TERN_186/main.c | 2 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c | 18 | ||||
| -rw-r--r-- | FreeRTOS/Demo/WizNET_DEMO_TERN_186/tern_code/socket.c | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h index 36baecaaa..1e28d3dbf 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h @@ -82,7 +82,7 @@ #define configUSE_IDLE_HOOK 1
#define configUSE_TICK_HOOK 0
#define configCPU_CLOCK_HZ ( ( unsigned long ) 80000000 )
-#define configTICK_RATE_HZ ( ( portTickType ) 1000 )
+#define configTICK_RATE_HZ ( ( TickType_t ) 1000 )
#define configMAX_PRIORITIES ( 5 )
#define configMINIMAL_STACK_SIZE ( ( unsigned short ) 256 ) /* This can be made smaller if required. */
#define configTOTAL_HEAP_SIZE ( ( size_t ) ( 20 * 1024 ) )
diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/HTTPTask.c b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/HTTPTask.c index aff800111..13c25e5a6 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/HTTPTask.c +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/HTTPTask.c @@ -147,7 +147,7 @@ unsigned char ucSocketBuffer[ httpSOCKET_BUFFER_SIZE ]; /* The semaphore used by the Ethernet ISR to signal that the task should wake
and process whatever caused the interrupt. */
-xSemaphoreHandle xTCPSemaphore = NULL;
+SemaphoreHandle_t xTCPSemaphore = NULL;
/*-----------------------------------------------------------*/
void vHTTPTask( void * pvParameters )
diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/main.c b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/main.c index 2d0dd9ef3..8f59e7938 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/main.c +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/main.c @@ -91,7 +91,7 @@ #include "comtest.h"
/* How often should the "check" task execute? */
-#define mainCHECK_DELAY ( 3000 / portTICK_RATE_MS )
+#define mainCHECK_DELAY ( 3000 / portTICK_PERIOD_MS )
/* Priorities allocated to the various tasks. */
#define mainQUEUE_POLL_PRIORITY ( tskIDLE_PRIORITY + 2 )
diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c index 20bf92322..e70f1e33c 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/serial/serial.c @@ -104,7 +104,7 @@ #define serCLEAR_ALL_STATUS_BITS ( ( unsigned short ) 0x00 )
#define serINTERRUPT_PRIORITY ( ( unsigned short ) 0x01 ) /*< Just below the scheduler priority. */
-#define serDONT_BLOCK ( ( portTickType ) 0 )
+#define serDONT_BLOCK ( ( TickType_t ) 0 )
typedef enum
{
@@ -176,12 +176,12 @@ typedef struct xCOM_PORT unsigned short usIRQVector;
/* Queues used for communications with com test task. */
- xQueueHandle xRxedChars;
- xQueueHandle xCharsForTx;
+ QueueHandle_t xRxedChars;
+ QueueHandle_t xCharsForTx;
/* This semaphore does nothing useful except test a feature of the
scheduler. */
- xSemaphoreHandle xTestSem;
+ SemaphoreHandle_t xTestSem;
} xComPort;
@@ -201,8 +201,8 @@ static unsigned long prvBaud( eBaud eWantedBaud ); /* These prototypes are repeated here so we don't have to include the serial header. This allows
the xComPortHandle structure details to be private to this file. */
xComPortHandle xSerialPortInit( eCOMPort ePort, eBaud eWantedBaud, eParity eWantedParity, eDataBits eWantedDataBits, eStopBits eWantedStopBits, unsigned portBASE_TYPE uxBufferLength );
-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime );
-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime );
+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, TickType_t xBlockTime );
+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, TickType_t xBlockTime );
void vSerialClose( xComPortHandle xPort );
short sSerialWaitForSemaphore( xComPortHandle xPort );
/*-----------------------------------------------------------*/
@@ -359,7 +359,7 @@ char *pcNextChar; }
/*-----------------------------------------------------------*/
-portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickType xBlockTime )
+portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, TickType_t xBlockTime )
{
/* Get the next character from the buffer, note that this routine is only
called having checked that the is (at least) one to get */
@@ -374,7 +374,7 @@ portBASE_TYPE xSerialGetChar( xComPortHandle pxPort, char *pcRxedChar, portTickT }
/*-----------------------------------------------------------*/
-portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType xBlockTime )
+portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, TickType_t xBlockTime )
{
if( xQueueSend( pxPort->xCharsForTx, &cOutChar, xBlockTime ) != pdPASS )
{
@@ -389,7 +389,7 @@ portBASE_TYPE xSerialPutChar( xComPortHandle pxPort, char cOutChar, portTickType portBASE_TYPE xSerialWaitForSemaphore( xComPortHandle xPort )
{
-const portTickType xBlockTime = ( portTickType ) 0xffff;
+const TickType_t xBlockTime = ( TickType_t ) 0xffff;
/* This function does nothing interesting, but test the
semaphore from ISR mechanism. */
diff --git a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/tern_code/socket.c b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/tern_code/socket.c index adfc54814..8d81f2ad3 100644 --- a/FreeRTOS/Demo/WizNET_DEMO_TERN_186/tern_code/socket.c +++ b/FreeRTOS/Demo/WizNET_DEMO_TERN_186/tern_code/socket.c @@ -79,7 +79,7 @@ Function Implementation Section portBASE_TYPE prvProcessISR( void )
{
unsigned char status;
-extern xSemaphoreHandle xTCPSemaphore;
+extern SemaphoreHandle_t xTCPSemaphore;
portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;
#ifdef I2CHIP_WINDOW
|