Skip to content

Commit

Permalink
Fix inconsistent use of ipconfigCOMPATIBLE_WITH_SINGLE & ipconfigIPv4…
Browse files Browse the repository at this point in the history 
…_BACKWARD_COMPATIBLE (#1134)
  • Loading branch information
@tony-josi-aws
tony-josi-aws authored Apr 8, 2024
1 parent aa7f9f0 commit 1bc37d3
Show file tree
Hide file tree
Showing 13 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion source/FreeRTOS_IP.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,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 )
{
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/MPS2_AN385/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/MPS3_AN552/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/MPS4_CS315/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions source/portable/NetworkInterface/NXP1060/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion source/portable/NetworkInterface/STM32Hxx/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/WinPCap/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/Zynq/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/esp32/NetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions source/portable/NetworkInterface/loopback/loopbackNetworkInterface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions source/portable/NetworkInterface/pic32mzef/NetworkInterface_eth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1bc37d3

Please sign in to comment.