/*\r
- FreeRTOS V7.5.2 - 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
\r
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
\r
/******************************************************************************\r
*\r
- * See the following web page for essential TwoEchoClient.c usage and \r
+ * See the following web page for essential TwoEchoClient.c usage and\r
* configuration details:\r
* http://www.FreeRTOS.org/FreeRTOS-Plus/FreeRTOS_Plus_UDP/Embedded_Ethernet_Examples/Common_Echo_Clients.shtml\r
*\r
#include "FreeRTOS_Sockets.h"\r
\r
/* Small delay used between attempts to obtain a zero copy buffer. */\r
-#define echoTINY_DELAY ( ( portTickType ) 2 )\r
+#define echoTINY_DELAY ( ( TickType_t ) 2 )\r
\r
/* The echo tasks create a socket, send out a number of echo requests\r
(listening for each echo reply), then close the socket again before\r
starting over. This delay is used between each iteration to ensure the\r
-network does not get too congested. The delay is shorter when the Windows\r
-simulator is used because simulated time is slower than real time. */\r
-#ifdef _WINDOWS_\r
- #define echoLOOP_DELAY ( ( portTickType ) 10 / portTICK_RATE_MS )\r
-#else\r
- #define echoLOOP_DELAY ( ( portTickType ) 150 / portTICK_RATE_MS )\r
-#endif /* _WINDOWS_ */\r
+network does not get too congested. */\r
+#define echoLOOP_DELAY ( ( TickType_t ) 250 / portTICK_RATE_MS )\r
\r
#if ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1\r
/* When the trace recorder code is included user events are generated to\r
/* The receive timeout is set shorter when the windows simulator is used\r
because simulated time is slower than real time. */\r
#ifdef _WINDOWS_\r
- const portTickType xReceiveTimeOut = 50 / portTICK_RATE_MS;\r
+ const TickType_t xReceiveTimeOut = 50 / portTICK_RATE_MS;\r
#else\r
- const portTickType xReceiveTimeOut = 500 / portTICK_RATE_MS;\r
+ const TickType_t xReceiveTimeOut = 500 / portTICK_RATE_MS;\r
#endif\r
\r
/*-----------------------------------------------------------*/\r
\r
-void vStartEchoClientTasks( uint16_t usTaskStackSize, unsigned portBASE_TYPE uxTaskPriority )\r
+void vStartEchoClientTasks( uint16_t usTaskStackSize, UBaseType_t uxTaskPriority )\r
{\r
/* Create the echo client task that does not use the zero copy interface. */\r
- xTaskCreate( prvEchoClientTask, /* The function that implements the task. */\r
- ( const signed char * const ) "Echo0", /* Just a text name for the task to aid debugging. */\r
- usTaskStackSize, /* The stack size is defined in FreeRTOSIPConfig.h. */\r
- NULL, /* The task parameter, not used in this case. */\r
- uxTaskPriority, /* The priority assigned to the task is defined in FreeRTOSConfig.h. */\r
- NULL ); /* The task handle is not used. */\r
+ xTaskCreate( prvEchoClientTask, /* The function that implements the task. */\r
+ "Echo0", /* Just a text name for the task to aid debugging. */\r
+ usTaskStackSize, /* The stack size is defined in FreeRTOSIPConfig.h. */\r
+ NULL, /* The task parameter, not used in this case. */\r
+ uxTaskPriority, /* The priority assigned to the task is defined in FreeRTOSConfig.h. */\r
+ NULL ); /* The task handle is not used. */\r
\r
/* Create the echo client task that does use the zero copy interface. */\r
- xTaskCreate( prvZeroCopyEchoClientTask, /* The function that implements the task. */\r
- ( const signed char * const ) "Echo1", /* Just a text name for the task to aid debugging. */\r
- usTaskStackSize, /* The stack size is defined in FreeRTOSIPConfig.h. */\r
- NULL, /* The task parameter, not used in this case. */\r
- uxTaskPriority, /* The priority assigned to the task is defined in FreeRTOSConfig.h. */\r
- NULL ); /* The task handle is not used. */\r
+ xTaskCreate( prvZeroCopyEchoClientTask, /* The function that implements the task. */\r
+ "Echo1", /* Just a text name for the task to aid debugging. */\r
+ usTaskStackSize, /* The stack size is defined in FreeRTOSIPConfig.h. */\r
+ NULL, /* The task parameter, not used in this case. */\r
+ uxTaskPriority, /* The priority assigned to the task is defined in FreeRTOSConfig.h. */\r
+ NULL ); /* The task handle is not used. */\r
}\r
/*-----------------------------------------------------------*/\r
\r
{\r
xSocket_t xSocket;\r
struct freertos_sockaddr xEchoServerAddress;\r
-int8_t cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these. Turn on stack overflow checking during debug to be sure. */\r
+char cTxString[ 25 ], cRxString[ 25 ]; /* Make sure the stack is large enough to hold these. Turn on stack overflow checking during debug to be sure. */\r
int32_t lLoopCount = 0UL;\r
const int32_t lMaxLoopCount = 50;\r
volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;\r
for( lLoopCount = 0; lLoopCount < lMaxLoopCount; lLoopCount++ )\r
{\r
/* Create the string that is sent to the echo server. */\r
- sprintf( ( char * ) cTxString, "Message number %u\r\n", ulTxCount );\r
+ sprintf( cTxString, "Message number %u\r\n", ( unsigned int ) ulTxCount );\r
\r
/* Send the string to the socket. ulFlags is set to 0, so the zero\r
copy interface is not used. That means the data from cTxString is\r
to ensure the NULL string terminator is sent as part of the message. */\r
FreeRTOS_sendto( xSocket, /* The socket being sent to. */\r
( void * ) cTxString, /* The data being sent. */\r
- strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent. */\r
+ strlen( cTxString ) + 1,/* The length of the data being sent. */\r
0, /* ulFlags with the FREERTOS_ZERO_COPY bit clear. */\r
&xEchoServerAddress, /* The destination address. */\r
sizeof( xEchoServerAddress ) );\r
&xAddressLength );\r
\r
/* Compare the transmitted string to the received string. */\r
- if( strcmp( ( char * ) cRxString, ( char * ) cTxString ) == 0 )\r
+ if( strcmp( cRxString, cTxString ) == 0 )\r
{\r
/* The echo reply was received without error. */\r
ulRxCount++;\r
{\r
xSocket_t xSocket;\r
struct freertos_sockaddr xEchoServerAddress;\r
-static int8_t cTxString[ 40 ];\r
+static char cTxString[ 40 ];\r
int32_t lLoopCount = 0UL;\r
volatile uint32_t ulRxCount = 0UL, ulTxCount = 0UL;\r
uint32_t xAddressLength = sizeof( xEchoServerAddress );\r
uint8_t *pucUDPPayloadBuffer;\r
\r
const int32_t lMaxLoopCount = 50;\r
-const uint8_t * const pucStringToSend = ( const uint8_t * const ) "Zero copy message number";\r
+const char * const pcStringToSend = "Zero copy message number";\r
/* The buffer is large enough to hold the string, a number, and the string terminator. */\r
-const size_t xBufferLength = strlen( ( char * ) pucStringToSend ) + 15;\r
+const size_t xBufferLength = strlen( pcStringToSend ) + 15;\r
\r
#if ipconfigINCLUDE_EXAMPLE_FREERTOS_PLUS_TRACE_CALLS == 1\r
{\r
/* A buffer was successfully obtained. Create the string that is\r
sent to the echo server. Note the string is written directly\r
into the buffer obtained from the IP stack. */\r
- sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", ( const char * ) "Zero copy message number", ulTxCount );\r
+ sprintf( ( char * ) pucUDPPayloadBuffer, "%s %u\r\n", "Zero copy message number", ( unsigned int ) ulTxCount );\r
\r
/* Also copy the string into a local buffer so it can be compared\r
with the string that is later received back from the echo server. */\r
- strcpy( ( char * ) cTxString, ( char * ) pucUDPPayloadBuffer );\r
+ strcpy( cTxString, ( char * ) pucUDPPayloadBuffer );\r
\r
/* Pass the buffer into the send function. ulFlags has the\r
FREERTOS_ZERO_COPY bit set so the IP stack will take control of\r
echoMARK_SEND_IN_TRACE_BUFFER( xZeroCopySendEvent );\r
lReturned = FreeRTOS_sendto( xSocket, /* The socket being sent to. */\r
( void * ) pucUDPPayloadBuffer, /* The buffer being passed into the IP stack. */\r
- strlen( ( const char * ) cTxString ) + 1, /* The length of the data being sent. Plus 1 to ensure the null terminator is part of the data. */\r
+ strlen( cTxString ) + 1, /* The length of the data being sent. Plus 1 to ensure the null terminator is part of the data. */\r
FREERTOS_ZERO_COPY, /* ulFlags with the zero copy bit is set. */\r
&xEchoServerAddress, /* Where the data is being sent. */\r
sizeof( xEchoServerAddress ) );\r
{\r
/* Compare the string sent to the echo server with the string\r
received back from the echo server. */\r
- if( strcmp( ( char * ) pucUDPPayloadBuffer, ( char * ) cTxString ) == 0 )\r
+ if( strcmp( ( char * ) pucUDPPayloadBuffer, cTxString ) == 0 )\r
{\r
/* The strings matched. */\r
ulRxCount++;\r
projects / freertos / blobdiff