Skip to content

Commit 3152037

Browse files
CalorineCalorine
authored
Merge pull request #10 from devolo/feature/newFreeRTOS+TCP-multi
Updated FreeRTOS-Plus-TCP-multi to commit 10d2d2b
2 parents 93c7306 + 86ddcb7 commit 3152037

File tree

285 files changed

+42300
-27699
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+42300
-27699
lines changed

‎Applications/.cproject‎

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,10 @@
5050
<option id="gnu.c.compiler.option.optimization.flags.1356079321" name="Other optimization flags" superClass="gnu.c.compiler.option.optimization.flags" useByScannerDiscovery="false" value="-fno-common" valueType="string"/>
5151
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.1756118822" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
5252
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Configuration}&quot;"/>
53-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs}&quot;"/>
54-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/protocols/include}&quot;"/>
55-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC}&quot;"/>
56-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/include}&quot;"/>
57-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOSv9.0.0/portable/GCC/ARM_CM3}&quot;"/>
58-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOSv9.0.0/include}&quot;"/>
53+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs}&quot;"/>
54+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include}&quot;"/>
55+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC}&quot;"/>
56+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/include}&quot;"/>
5957
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/dLAN_Green_PHY_eval_board/inc}&quot;"/>
6058
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/lpc_chip_175x_6x/inc}&quot;"/>
6159
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries}&quot;"/>
@@ -77,10 +75,10 @@
7775
<option id="gnu.both.asm.option.flags.crt.325228274" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" useByScannerDiscovery="false" value="-c -x assembler-with-cpp -D__REDLIB__ -DDEBUG -D__CODE_RED" valueType="string"/>
7876
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.1475968868" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
7977
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Configuration}&quot;"/>
80-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs}&quot;"/>
81-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/protocols/include}&quot;"/>
82-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC}&quot;"/>
83-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/include}&quot;"/>
78+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs}&quot;"/>
79+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include}&quot;"/>
80+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC}&quot;"/>
81+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/include}&quot;"/>
8482
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/dLAN_Green_PHY_eval_board/inc}&quot;"/>
8583
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/lpc_chip_175x_6x/inc}&quot;"/>
8684
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries}&quot;"/>
@@ -108,12 +106,10 @@
108106
<storageModule moduleId="org.eclipse.cdt.core.externalSettings">
109107
<externalSettings containerId="Libraries;com.crt.advproject.config.lib.debug.690962840" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
110108
<externalSetting>
111-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs"/>
112-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/protocols/include"/>
113-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC"/>
114-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/include"/>
115-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOSv9.0.0/portable/GCC/ARM_CM3"/>
116-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOSv9.0.0/include"/>
109+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs"/>
110+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include"/>
111+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC"/>
112+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/include"/>
117113
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/dLAN_Green_PHY_eval_board/inc"/>
118114
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/lpc_chip_175x_6x/inc"/>
119115
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/Libraries"/>
@@ -179,12 +175,10 @@
179175
<option id="gnu.c.compiler.option.optimization.flags.2108310957" name="Other optimization flags" superClass="gnu.c.compiler.option.optimization.flags" useByScannerDiscovery="false" value="-fno-common" valueType="string"/>
180176
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.18170643" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
181177
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Configuration}&quot;"/>
182-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs}&quot;"/>
183-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/protocols/include}&quot;"/>
184-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC}&quot;"/>
185-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/include}&quot;"/>
186-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOSv9.0.0/portable/GCC/ARM_CM3}&quot;"/>
187-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOSv9.0.0/include}&quot;"/>
178+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs}&quot;"/>
179+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include}&quot;"/>
180+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC}&quot;"/>
181+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/include}&quot;"/>
188182
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/dLAN_Green_PHY_eval_board/inc}&quot;"/>
189183
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/lpc_chip_175x_6x/inc}&quot;"/>
190184
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries}&quot;"/>
@@ -206,10 +200,10 @@
206200
<option id="gnu.both.asm.option.flags.crt.1895755960" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" value="-c -x assembler-with-cpp -D__REDLIB__ -DNDEBUG -D__CODE_RED" valueType="string"/>
207201
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.285496512" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
208202
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Configuration}&quot;"/>
209-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs}&quot;"/>
210-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/protocols/include}&quot;"/>
211-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC}&quot;"/>
212-
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP/include}&quot;"/>
203+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs}&quot;"/>
204+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include}&quot;"/>
205+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC}&quot;"/>
206+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/FreeRTOS-Plus-TCP-multi-master/include}&quot;"/>
213207
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/dLAN_Green_PHY_eval_board/inc}&quot;"/>
214208
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries/lpc_chip_175x_6x/inc}&quot;"/>
215209
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Libraries}&quot;"/>
@@ -238,14 +232,12 @@
238232
<externalSettings containerId="Libraries;com.crt.advproject.config.lib.release.502008292" factoryId="org.eclipse.cdt.core.cfg.export.settings.sipplier">
239233
<externalSetting>
240234
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/Libraries"/>
241-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/portable/Compiler/GCC"/>
242-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/include"/>
243-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOSv9.0.0/portable/GCC/ARM_CM3"/>
244-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOSv9.0.0/include"/>
235+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/Compiler/GCC"/>
236+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/include"/>
245237
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/dLAN_Green_PHY_eval_board/inc"/>
246238
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/lpc_chip_175x_6x/inc"/>
247-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/portable/FileSystem/httpd-fs"/>
248-
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP/protocols/include"/>
239+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/portable/FileSystem/httpd-fs"/>
240+
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="includePath" name="/Libraries/FreeRTOS-Plus-TCP-multi-master/source/protocols/include"/>
249241
<entry flags="RESOLVED" kind="macro" name="CORE_M3" value=""/>
250242
<entry flags="RESOLVED" kind="macro" name="__USE_LPCOPEN" value=""/>
251243
<entry flags="RESOLVED" kind="macro" name="__REDLIB__" value=""/>

‎Applications/.project‎

100755100644
File mode changed.

‎Applications/FreeRTOS/src/network.c‎

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "FreeRTOS_IP.h"
4444
#include "FreeRTOS_Sockets.h"
4545
#include "FreeRTOS_Routing.h"
46-
#include "FreeRTOS_HTTP_server.h"
46+
#include "FreeRTOS_TCP_server.h"
4747

4848
/* GreenPHY SDK includes. */
4949
#include "GreenPhySDKNetConfig.h"
@@ -100,27 +100,27 @@
100100
static void prvServerWorkTask( void *pvParameters )
101101
{
102102
const TickType_t xInitialBlockTime = pdMS_TO_TICKS( 200UL );
103-
HTTPServer_t *pxHTTPServer = NULL;
103+
TCPServer_t *pxHTTPServer = NULL;
104104

105105
/* A structure that defines the servers to be created. Which servers are
106106
included in the structure depends on the mainCREATE_HTTP_SERVER and
107107
mainCREATE_FTP_SERVER settings at the top of this file. */
108108
static const struct xSERVER_CONFIG xServerConfiguration =
109109

110110
/* Server type, port number, backlog, root dir. */
111-
{ 80, 0, "" }
111+
{ eSERVER_HTTP, 80, 2, "" }
112112
;
113113

114114
/* Remove compiler warning about unused parameter. */
115115
( void ) pvParameters;
116116

117117
/* Create the servers defined by the xServerConfiguration array above. */
118-
pxHTTPServer = FreeRTOS_CreateHTTPServer( &xServerConfiguration );
118+
pxHTTPServer = FreeRTOS_CreateTCPServer( &xServerConfiguration, 1 );
119119
configASSERT( pxHTTPServer );
120120

121121
for( ;; )
122122
{
123-
FreeRTOS_HTTPServerWork( pxHTTPServer, xInitialBlockTime );
123+
FreeRTOS_TCPServerWork( pxHTTPServer, xInitialBlockTime );
124124
}
125125
}
126126
#endif
@@ -156,11 +156,11 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent, NetworkEn
156156

157157
/* The network is up and configured. Print out the configuration,
158158
which may have been obtained from a DHCP server. */
159-
FreeRTOS_GetAddressConfiguration( pxEndPoint,
160-
&ulIPAddress,
161-
&ulNetMask,
162-
&ulGatewayAddress,
163-
&ulDNSServerAddress );
159+
FreeRTOS_GetEndPointConfiguration( &ulIPAddress,
160+
&ulNetMask,
161+
&ulGatewayAddress,
162+
&ulDNSServerAddress,
163+
pxEndPoint );
164164

165165
/* Convert the IP address to a string then print it out. */
166166
FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
@@ -246,26 +246,13 @@ void vNetworkInit( void )
246246
#endif
247247

248248
#if( netconfigUSE_IP != 0 )
249-
FreeRTOS_FillEndPoint(&xEndPoint, ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress);
249+
FreeRTOS_FillEndPoint(&xBridgeInterface, &xEndPoint, ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress);
250250
xEndPoint.bits.bIsDefault = pdTRUE_UNSIGNED;
251251
#if( netconfigUSE_DHCP != 0 )
252252
{
253253
xEndPoint.bits.bWantDHCP = pdTRUE_UNSIGNED;
254254
}
255255
#endif
256-
#if( netconfigIP_INTERFACE == netconfigETH_INTERFACE )
257-
{
258-
FreeRTOS_AddEndPoint(&xEthInterface, &xEndPoint);
259-
}
260-
#elif( netconfigIP_INTERFACE == netconfigPLC_INTERFACE )
261-
{
262-
FreeRTOS_AddEndPoint(&xPlcInterface, &xEndPoint);
263-
}
264-
#elif( netconfigIP_INTERFACE == netconfigBRIDGE_INTERFACE )
265-
{
266-
FreeRTOS_AddEndPoint(&xBridgeInterface, &xEndPoint);
267-
}
268-
#endif /* netconfigIP_INTERFACE */
269256
#endif /* netconfigUSE_IP */
270257

271258
FreeRTOS_IPStart();

‎Applications/HTTP/bin/makefsdata.py‎

100755100644
File mode changed.

‎Applications/HTTP/httpd-fs/index.html‎

100755100644
File mode changed.

‎Applications/HTTP/httpd-fs/logo.svg‎

100755100644
File mode changed.

‎Applications/HTTP/httpd-fs/main.css‎

100755100644
File mode changed.

‎Applications/HTTP/httpd-fs/main.js‎

100755100644
File mode changed.

‎Applications/HTTP/src/http_demo.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ int8_t cBuffer[ 16 ];
113113
pxEndPoint->xMACAddress.ucBytes[5]
114114
);
115115

116-
FreeRTOS_GetAddressConfiguration( pxEndPoint,
117-
&ulIPAddress,
118-
&ulNetMask,
119-
&ulGatewayAddress,
120-
&ulDNSServerAddress );
116+
FreeRTOS_GetEndPointConfiguration( &ulIPAddress,
117+
&ulNetMask,
118+
&ulGatewayAddress,
119+
&ulDNSServerAddress,
120+
pxEndPoint );
121121

122122
FreeRTOS_inet_ntoa( ulIPAddress, cBuffer );
123123
xCount += snprintf( pcBuffer + xCount, uxBufferLength - xCount, "\"ip\":\"%s\",", cBuffer);

‎Applications/JSON/parson.c‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)