Merge branch 'main' into MCast_PR

Emil Popov · Emil Popov · commit bddae6658768 · 2024-04-09T11:19:14.000-04:00
diff --git a/source/FreeRTOS_IP.c b/source/FreeRTOS_IP.c
@@ -956,7 +956,7 @@ void * FreeRTOS_GetUDPPayloadBuffer_Multi( size_t uxRequestedSizeBytes,
 
         /* IF the following function should be declared in the NetworkInterface.c
          * linked in the project. */
-        pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) );
+        ( void ) pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) );
         FreeRTOS_FillEndPoint( &( xInterfaces[ 0 ] ), &( xEndPoints[ 0 ] ), ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );
         #if ( ipconfigUSE_DHCP != 0 )
         {
diff --git a/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c b/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
@@ -522,15 +522,15 @@ static BaseType_t prvSAM_NetworkInterfaceInitialise( NetworkInterface_t * pxInte
 }
 /*-----------------------------------------------------------*/
 
-#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxSAM_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxSAM_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c b/source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c
@@ -398,15 +398,15 @@ static BaseType_t xMPS2_GetPhyLinkStatus( NetworkInterface_t * pxInterface )
 
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxMPS2_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxMPS2_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c b/source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c
@@ -507,15 +507,15 @@ static BaseType_t xLAN91C111_GetPhyLinkStatus( NetworkInterface_t * pxInterface
 
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialise the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c b/source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c
@@ -507,15 +507,15 @@ static BaseType_t xLAN91C111_GetPhyLinkStatus( NetworkInterface_t * pxInterface
 
 /*-----------------------------------------------------------*/
 
-#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialise the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/NXP1060/NetworkInterface.c b/source/portable/NetworkInterface/NXP1060/NetworkInterface.c
@@ -269,18 +269,18 @@ NetworkInterface_t * pxNXP1060_FillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                         NetworkInterface_t * pxInterface );
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigCOMPATIBLE_WITH_SINGLE != 0 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxNXP1060_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxNXP1060_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
-#endif /* ( ipconfigCOMPATIBLE_WITH_SINGLE != 0 ) */
+#endif /* ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 ) */
 /*-----------------------------------------------------------*/
 
 NetworkInterface_t * pxNXP1060_FillInterfaceDescriptor( BaseType_t xEMACIndex,
diff --git a/source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
@@ -353,7 +353,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkInterface_t * pxInterface,
     return xSTM32F_NetworkInterfaceOutput( pxInterface, pxBuffer, bReleaseAfterSend );
 }
 
-#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
diff --git a/source/portable/NetworkInterface/STM32Hxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32Hxx/NetworkInterface.c
@@ -535,7 +535,7 @@ static BaseType_t xSTM32H_GetPhyLinkStatus( NetworkInterface_t * pxInterface )
 }
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
diff --git a/source/portable/NetworkInterface/WinPCap/NetworkInterface.c b/source/portable/NetworkInterface/WinPCap/NetworkInterface.c
@@ -347,7 +347,7 @@ static BaseType_t xWinPcap_GetPhyLinkStatus( NetworkInterface_t * pxInterface )
 }
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 
 /* Do not call the following function directly. It is there for downward compatibility.
@@ -356,7 +356,7 @@ static BaseType_t xWinPcap_GetPhyLinkStatus( NetworkInterface_t * pxInterface )
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxWinPcap_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxWinPcap_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/Zynq/NetworkInterface.c b/source/portable/NetworkInterface/Zynq/NetworkInterface.c
@@ -523,15 +523,15 @@ static BaseType_t xZynqGetPhyLinkStatus( NetworkInterface_t * pxInterface )
 }
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxZynq_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxZynq_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/esp32/NetworkInterface.c b/source/portable/NetworkInterface/esp32/NetworkInterface.c
@@ -60,15 +60,15 @@ NetworkInterface_t * pxESP32_Eth_FillInterfaceDescriptor( BaseType_t xEMACIndex,
 
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxESP32_Eth_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxESP32_Eth_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
 #endif
diff --git a/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c b/source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c
@@ -75,18 +75,18 @@ static BaseType_t prvLoopback_Initialise( NetworkInterface_t * pxInterface )
 }
 /*-----------------------------------------------------------*/
 
-#if ( ipconfigCOMPATIBLE_WITH_SINGLE != 0 )
+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
     NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                     NetworkInterface_t * pxInterface )
     {
-        pxLoopback_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+        return pxLoopback_FillInterfaceDescriptor( xEMACIndex, pxInterface );
     }
 
-#endif /* ( ipconfigCOMPATIBLE_WITH_SINGLE != 0 ) */
+#endif /* ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 ) */
 /*-----------------------------------------------------------*/
 
 NetworkInterface_t * pxLoopback_FillInterfaceDescriptor( BaseType_t xEMACIndex,
diff --git a/source/portable/NetworkInterface/pic32mzef/NetworkInterface_eth.c b/source/portable/NetworkInterface/pic32mzef/NetworkInterface_eth.c
@@ -219,15 +219,15 @@
         };
     #endif /* (PIC32_MAC_DEBUG_COMMANDS != 0) */
 
-    #if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+    #if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )
 
 /* Do not call the following function directly. It is there for downward compatibility.
  * The function FreeRTOS_IPInit() will call it to initialice the interface and end-point
  * objects.  See the description in FreeRTOS_Routing.h. */
         NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,
                                                         NetworkInterface_t * pxInterface )
         {
-            pxPIC32_Eth_FillInterfaceDescriptor( xEMACIndex, pxInterface );
+            return pxPIC32_Eth_FillInterfaceDescriptor( xEMACIndex, pxInterface );
         }
 
     #endif

Original file line number	Diff line number	Diff line change
`@@ -956,7 +956,7 @@ void * FreeRTOS_GetUDPPayloadBuffer_Multi( size_t uxRequestedSizeBytes,`
`956`	`956`
`957`	`957`	`/* IF the following function should be declared in the NetworkInterface.c`
`958`	`958`	`* linked in the project. */`
`959`		`- pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) );`
	`959`	`+ ( void ) pxFillInterfaceDescriptor( 0, &( xInterfaces[ 0 ] ) );`
`960`	`960`	`FreeRTOS_FillEndPoint( &( xInterfaces[ 0 ] ), &( xEndPoints[ 0 ] ), ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );`
`961`	`961`	`#if ( ipconfigUSE_DHCP != 0 )`
`962`	`962`	`{`
Original file line number	Diff line number	Diff line change
`@@ -522,15 +522,15 @@ static BaseType_t prvSAM_NetworkInterfaceInitialise( NetworkInterface_t * pxInte`
`522`	`522`	`}`
`523`	`523`	`/-----------------------------------------------------------/`
`524`	`524`
`525`		`-#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`525`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`526`	`526`
`527`	`527`	`/* Do not call the following function directly. It is there for downward compatibility.`
`528`	`528`	`* The function FreeRTOS_IPInit() will call it to initialice the interface and end-point`
`529`	`529`	`* objects. See the description in FreeRTOS_Routing.h. */`
`530`	`530`	`NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,`
`531`	`531`	`NetworkInterface_t * pxInterface )`
`532`	`532`	`{`
`533`		`- pxSAM_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
	`533`	`+ return pxSAM_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -398,15 +398,15 @@ static BaseType_t xMPS2_GetPhyLinkStatus( NetworkInterface_t * pxInterface )`
`398`	`398`
`399`	`399`	`/-----------------------------------------------------------/`
`400`	`400`
`401`		`-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`401`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`402`	`402`
`403`	`403`	`/* Do not call the following function directly. It is there for downward compatibility.`
`404`	`404`	`* The function FreeRTOS_IPInit() will call it to initialice the interface and end-point`
`405`	`405`	`* objects. See the description in FreeRTOS_Routing.h. */`
`406`	`406`	`NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,`
`407`	`407`	`NetworkInterface_t * pxInterface )`
`408`	`408`	`{`
`409`		`- pxMPS2_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
	`409`	`+ return pxMPS2_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -507,15 +507,15 @@ static BaseType_t xLAN91C111_GetPhyLinkStatus( NetworkInterface_t * pxInterface`
`507`	`507`
`508`	`508`	`/-----------------------------------------------------------/`
`509`	`509`
`510`		`-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`510`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`511`	`511`
`512`	`512`	`/* Do not call the following function directly. It is there for downward compatibility.`
`513`	`513`	`* The function FreeRTOS_IPInit() will call it to initialise the interface and end-point`
`514`	`514`	`* objects. See the description in FreeRTOS_Routing.h. */`
`515`	`515`	`NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,`
`516`	`516`	`NetworkInterface_t * pxInterface )`
`517`	`517`	`{`
`518`		`- pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
	`518`	`+ return pxLAN91C111_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
`519`	`519`	`}`
`520`	`520`
`521`	`521`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ BaseType_t xNetworkInterfaceOutput( NetworkInterface_t * pxInterface,`
`353`	`353`	`return xSTM32F_NetworkInterfaceOutput( pxInterface, pxBuffer, bReleaseAfterSend );`
`354`	`354`	`}`
`355`	`355`
`356`		`-#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`356`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`357`	`357`
`358`	`358`	`/* Do not call the following function directly. It is there for downward compatibility.`
`359`	`359`	`* The function FreeRTOS_IPInit() will call it to initialice the interface and end-point`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ static BaseType_t xSTM32H_GetPhyLinkStatus( NetworkInterface_t * pxInterface )`
`535`	`535`	`}`
`536`	`536`	`/-----------------------------------------------------------/`
`537`	`537`
`538`		`-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`538`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`539`	`539`
`540`	`540`	`/* Do not call the following function directly. It is there for downward compatibility.`
`541`	`541`	`* The function FreeRTOS_IPInit() will call it to initialice the interface and end-point`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ static BaseType_t xWinPcap_GetPhyLinkStatus( NetworkInterface_t * pxInterface )`
`347`	`347`	`}`
`348`	`348`	`/-----------------------------------------------------------/`
`349`	`349`
`350`		`-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`350`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`351`	`351`
`352`	`352`
`353`	`353`	`/* Do not call the following function directly. It is there for downward compatibility.`
`@@ -356,7 +356,7 @@ static BaseType_t xWinPcap_GetPhyLinkStatus( NetworkInterface_t * pxInterface )`
`356`	`356`	`NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,`
`357`	`357`	`NetworkInterface_t * pxInterface )`
`358`	`358`	`{`
`359`		`- pxWinPcap_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
	`359`	`+ return pxWinPcap_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -523,15 +523,15 @@ static BaseType_t xZynqGetPhyLinkStatus( NetworkInterface_t * pxInterface )`
`523`	`523`	`}`
`524`	`524`	`/-----------------------------------------------------------/`
`525`	`525`
`526`		`-#if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )`
	`526`	`+#if ( ipconfigIPv4_BACKWARD_COMPATIBLE != 0 )`
`527`	`527`
`528`	`528`	`/* Do not call the following function directly. It is there for downward compatibility.`
`529`	`529`	`* The function FreeRTOS_IPInit() will call it to initialice the interface and end-point`
`530`	`530`	`* objects. See the description in FreeRTOS_Routing.h. */`
`531`	`531`	`NetworkInterface_t * pxFillInterfaceDescriptor( BaseType_t xEMACIndex,`
`532`	`532`	`NetworkInterface_t * pxInterface )`
`533`	`533`	`{`
`534`		`- pxZynq_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
	`534`	`+ return pxZynq_FillInterfaceDescriptor( xEMACIndex, pxInterface );`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`#endif`