len0rd/FreeRTOS-Kernel
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS-Kernel.git synced 2025-10-14 08:47:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove ipLOCAL_MAC_ADDRESS from demo files (#1244)

Browse source 
* Remove ipLOCAL_MAC_ADDRESS from demo files

* Add return variable for IP_Init fucntions
This commit is contained in:
Rahul Kar 2024-08-14 11:56:38 +05:30 • committed by GitHub
parent 8582188293
commit a004a21b13
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Posix/main_networking.c
View file

@ -135,6 +135,7 @@ static UBaseType_t ulNextRand;
void main_tcp_echo_client_tasks( void ) void main_tcp_echo_client_tasks( void )
{ {
BaseType_t xResult;
const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL ); const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL );
/* /*
@ -157,8 +158,6 @@ void main_tcp_echo_client_tasks( void )
/* Initialise the network interface.*/ /* Initialise the network interface.*/
FreeRTOS_debug_printf( ( "FreeRTOS_IPInit\r\n" ) ); FreeRTOS_debug_printf( ( "FreeRTOS_IPInit\r\n" ) );
memcpy( ipLOCAL_MAC_ADDRESS, ucMACAddress, sizeof( ucMACAddress ) );
#if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) #if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 )
extern NetworkInterface_t * pxLibslirp_FillInterfaceDescriptor( BaseType_t xEMACIndex, extern NetworkInterface_t * pxLibslirp_FillInterfaceDescriptor( BaseType_t xEMACIndex,
NetworkInterface_t * pxInterface ); NetworkInterface_t * pxInterface );
@ -173,12 +172,14 @@ void main_tcp_echo_client_tasks( void )
} }
#endif /* ( ipconfigUSE_DHCP != 0 ) */ #endif /* ( ipconfigUSE_DHCP != 0 ) */
FreeRTOS_IPInit_Multi(); xResult = FreeRTOS_IPInit_Multi();
#else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
/* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */ /* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */
FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress ); xResult = FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );
#endif /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #endif /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
configASSERT( xResult == pdTRUE );
/* Start the RTOS scheduler. */ /* Start the RTOS scheduler. */
FreeRTOS_debug_printf( ( "vTaskStartScheduler\n" ) ); FreeRTOS_debug_printf( ( "vTaskStartScheduler\n" ) );
vTaskStartScheduler(); vTaskStartScheduler();

6
FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/main_networking.c
View file

@ -140,6 +140,7 @@ static UBaseType_t ulNextRand;
void main_tcp_echo_client_tasks( void ) void main_tcp_echo_client_tasks( void )
{ {
BaseType_t xReturn;
const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL ); const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL );
/* /*
@ -180,12 +181,13 @@ void main_tcp_echo_client_tasks( void )
} }
#endif /* ( ipconfigUSE_DHCP != 0 ) */ #endif /* ( ipconfigUSE_DHCP != 0 ) */
FreeRTOS_IPInit_Multi(); xReturn = FreeRTOS_IPInit_Multi();
#else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
/* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */ /* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */
FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress ); xReturn = FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );
#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
configASSERT( xReturn == pdTRUE );
/* Start the RTOS scheduler. */ /* Start the RTOS scheduler. */
FreeRTOS_debug_printf( ( "vTaskStartScheduler\n" ) ); FreeRTOS_debug_printf( ( "vTaskStartScheduler\n" ) );

5
FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c
View file

@ -189,6 +189,7 @@ NetworkInterface_t * pxWinPcap_FillInterfaceDescriptor( BaseType_t xEMACIndex,
int main( void ) int main( void )
{ {
BaseType_t xReturn;
const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL ); const uint32_t ulLongTime_ms = pdMS_TO_TICKS( 1000UL );
/* /*
@ -314,7 +315,9 @@ int main( void )
} }
#endif /* ( mainNETWORK_UP_COUNT >= 3U ) */ #endif /* ( mainNETWORK_UP_COUNT >= 3U ) */
FreeRTOS_IPInit_Multi(); xReturn = FreeRTOS_IPInit_Multi();
configASSERT( xReturn == pdTRUE );
/* Start the RTOS scheduler. */ /* Start the RTOS scheduler. */
FreeRTOS_debug_printf( ( "vTaskStartScheduler\r\n" ) ); FreeRTOS_debug_printf( ( "vTaskStartScheduler\r\n" ) );

9
FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_UDP_Mode_CLI_Windows_Simulator/main.c
View file

@ -130,6 +130,7 @@ static UBaseType_t ulNextRand;
int main( void ) int main( void )
{ {
BaseType_t xResult;
const uint32_t ulLongTime_ms = 250UL; const uint32_t ulLongTime_ms = 250UL;
/* Create a mutex that is used to guard against the console being accessed /* Create a mutex that is used to guard against the console being accessed
@ -157,13 +158,15 @@ int main( void )
xEndPoints[ 0 ].bits.bWantDHCP = pdTRUE; xEndPoints[ 0 ].bits.bWantDHCP = pdTRUE;
} }
#endif /* ( ipconfigUSE_DHCP != 0 ) */ #endif /* ( ipconfigUSE_DHCP != 0 ) */
memcpy( ipLOCAL_MAC_ADDRESS, ucMACAddress, sizeof( ucMACAddress ) );
FreeRTOS_IPInit_Multi(); xResult = FreeRTOS_IPInit_Multi();
#else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
/* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */ /* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */
FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress ); xResult = FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );
#endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #endif /* defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
configASSERT( xResult == pdTRUE );
/* Initialise the logging. */ /* Initialise the logging. */
uint32_t ulLoggingIPAddress; uint32_t ulLoggingIPAddress;

2
FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c
View file

@ -228,7 +228,7 @@ void vPlatformInitIpStack( void )
xEndPoints[ 0 ].bits.bWantDHCP = pdTRUE; xEndPoints[ 0 ].bits.bWantDHCP = pdTRUE;
} }
#endif /* ( ipconfigUSE_DHCP != 0 ) */ #endif /* ( ipconfigUSE_DHCP != 0 ) */
memcpy( ipLOCAL_MAC_ADDRESS, ucMACAddress, sizeof( ucMACAddress ) );
xResult = FreeRTOS_IPInit_Multi(); xResult = FreeRTOS_IPInit_Multi();
#else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */ #else /* if defined( ipconfigIPv4_BACKWARD_COMPATIBLE ) && ( ipconfigIPv4_BACKWARD_COMPATIBLE == 0 ) */
/* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */ /* Using the old /single /IPv4 library, or using backward compatible mode of the new /multi library. */