summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com>2023-03-01 14:18:32 -0800
committerAniruddha Kanhere <60444055+AniruddhaKanhere@users.noreply.github.com>2023-03-01 14:18:32 -0800
commit3d4037d83e62f84f4cefb755af00d11b05b4ba9e (patch)
tree566407997e061ab1dd7d9d1b32f0bbad10ca15d5
parente18eb15f7952aa662536874935685c8bdb5bbf67 (diff)
downloadfreertos-git-3d4037d83e62f84f4cefb755af00d11b05b4ba9e.tar.gz
Fix comments and make MAC address configurable
-rw-r--r--FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c22
1 files changed, 8 insertions, 14 deletions
diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c
index b0862e549..063eacf99 100644
--- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c
+++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c
@@ -141,27 +141,20 @@ void vApplicationIPNetworkEventHook( eIPCallbackEvent_t eNetworkEvent )
void vPlatformInitIpStack( void )
{
- UBaseType_t uxRandomNumber;
BaseType_t xResult;
uint8_t ucIPAddress[ 4 ];
- uint8_t ucNetMask[ 4 ] = { 255, 255, 0, 0 };
+ uint8_t ucNetMask[ 4 ] = { configNET_MASK0, configNET_MASK1, configNET_MASK2, configNET_MASK3 };
uint8_t ucMACAddress[ 6 ];
uint8_t ucDNSServerAddress[ 4 ];
uint8_t ucGatewayAddress[ 4 ];
- /* Generate a random number */
- uxRandomNumber = uxRand();
+ ucMACAddress[ 0 ] = configMAC_ADDR0;
+ ucMACAddress[ 1 ] = configMAC_ADDR1;
+ ucMACAddress[ 2 ] = configMAC_ADDR2;
+ ucMACAddress[ 3 ] = configMAC_ADDR3;
+ ucMACAddress[ 4 ] = configMAC_ADDR4;
+ ucMACAddress[ 5 ] = configMAC_ADDR5;
- /* Generate a random MAC address in the reserved range */
- ucMACAddress[ 0 ] = 0x00;
- ucMACAddress[ 1 ] = 0x11;
- ucMACAddress[ 2 ] = ( uxRandomNumber & 0xFF );
- ucMACAddress[ 3 ] = ( ( uxRandomNumber >> 8 ) & 0xFF );
- ucMACAddress[ 4 ] = ( ( uxRandomNumber >> 16 ) & 0xFF );
- ucMACAddress[ 5 ] = ( ( uxRandomNumber >> 24 ) & 0xFF );
-
-
- /* Assign a link-local address in the 169.254.0.0/16 range */
ucIPAddress[ 0 ] = configIP_ADDR0;
ucIPAddress[ 1 ] = configIP_ADDR1;
ucIPAddress[ 2 ] = configIP_ADDR2;
@@ -178,6 +171,7 @@ void vPlatformInitIpStack( void )
ucGatewayAddress[ 3 ] = configGATEWAY_ADDR3;
xResult = FreeRTOS_IPInit( ucIPAddress, ucNetMask, ucGatewayAddress, ucDNSServerAddress, ucMACAddress );
+
configASSERT( xResult == pdTRUE );
}