Replace 'xMDNS_MACAddressIPv6' with 'xMDNS_MacAddressIPv6' to increas…

…e uniformity
FreeRTOS · Jul 10, 2024 · 7208fc6 · 7208fc6
1 parent 3979677
commit 7208fc6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/source/FreeRTOS_DNS.c b/source/FreeRTOS_DNS.c
@@ -150,7 +150,7 @@
  * The MAC-addresses are provided here in case a network
  * interface needs it.
  */
- const MACAddress_t xMDNS_MACAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB } };
+ const MACAddress_t xMDNS_MacAddressIPv6 = { { 0x33, 0x33, 0x00, 0x00, 0x00, 0xFB } };
  #endif /* ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) */
 
 

diff --git a/source/include/FreeRTOS_DNS.h b/source/include/FreeRTOS_DNS.h
@@ -71,7 +71,12 @@ uint32_t ulDNSHandlePacket( const NetworkBufferDescriptor_t * pxNetworkBuffer );
  extern const IPv6_Address_t ipMDNS_IP_ADDR_IPv6;
 
 /* The MDNS IPv6 MAC address is 33:33:00:01:00:03 */
- extern const MACAddress_t xMDNS_MACAddressIPv6;
+
+/* This type-name was formally "misspelled" as
+ * xMDNS_MACAddressIPv6 with "MAC": */
+ extern const MACAddress_t xMDNS_MacAddressIPv6;
+ /* Guarantee backward compatibility. */
+ #define xMDNS_MACAddressIPv6 xMDNS_MacAddressIPv6
 #endif /* ipconfigUSE_MDNS */
 
 /** @brief While doing integration tests, it is necessary to influence the choice

diff --git a/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c b/source/portable/NetworkInterface/DriverSAM/NetworkInterface.c
@@ -787,7 +787,7 @@ static BaseType_t prvGMACInit( NetworkInterface_t * pxInterface )
 
  #if ( ipconfigUSE_MDNS == ipconfigENABLE )
  {
- prvAddAllowedMACAddress( pxInterface, xMDNS_MACAddressIPv6.ucBytes );
+ prvAddAllowedMACAddress( pxInterface, xMDNS_MacAddressIPv6.ucBytes );
  }
  #endif /* ipconfigUSE_MDNS */
  }

diff --git a/source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c b/source/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
@@ -537,7 +537,7 @@ BaseType_t xSTM32F_NetworkInterfaceInitialise( NetworkInterface_t * pxInterface
  #endif
  #if ( ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) )
  {
- prvMACAddressConfig( &xETH, xMACEntry, ( uint8_t * ) xMDNS_MACAddressIPv6.ucBytes );
+ prvMACAddressConfig( &xETH, xMACEntry, ( uint8_t * ) xMDNS_MacAddressIPv6.ucBytes );
  xMACEntry += 8;
  }
  #endif

diff --git a/source/portable/NetworkInterface/Zynq/NetworkInterface.c b/source/portable/NetworkInterface/Zynq/NetworkInterface.c
@@ -288,7 +288,7 @@ static BaseType_t xZynqNetworkInterfaceInitialise( NetworkInterface_t * pxInterf
 
  #if ( ( ipconfigUSE_MDNS == 1 ) && ( ipconfigUSE_IPv6 != 0 ) )
  XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MacAddress.ucBytes );
- XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MACAddressIPv6.ucBytes );
+ XEmacPs_SetHash( pxEMAC_PS, ( void * ) xMDNS_MacAddressIPv6.ucBytes );
  #endif
 
  pxEndPoint = FreeRTOS_NextEndPoint( pxInterface, pxEndPoint );