sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CONFIG_NET_MULTICAST to avoid name conflicts

Browse Source
This commit is contained in:
Gregory Nutt 2016-03-20 13:14:36 -06:00
parent 47b36e9de4
commit f7d3b8147f
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/lpc17xx/Kconfig
View File

@ -716,7 +716,7 @@ config NET_HASH
---help--- ---help---
Enable receipt of near-perfect match frames. Enable receipt of near-perfect match frames.
config NET_MULTICAST config LPC17_MULTICAST
bool "Multicast" bool "Multicast"
default y if NET_IGMP default y if NET_IGMP
default n if !NET_IGMP default n if !NET_IGMP

6
arch/arm/src/lpc17xx/lpc17_ethernet.c
View File

@ -114,8 +114,8 @@
/* If IGMP is enabled, then accept multi-cast frames. */ /* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) #if defined(CONFIG_NET_IGMP) && !defined(CONFIG_LPC17_MULTICAST)
# define CONFIG_NET_MULTICAST 1 # define CONFIG_LPC17_MULTICAST 1
#endif #endif
/* If the user did not specify a priority for Ethernet interrupts, set the /* If the user did not specify a priority for Ethernet interrupts, set the
@ -1781,7 +1781,7 @@ static int lpc17_ifup(struct net_driver_s *dev)
*/ */
regval = ETH_RXFLCTRL_PERFEN | ETH_RXFLCTRL_BCASTEN; regval = ETH_RXFLCTRL_PERFEN | ETH_RXFLCTRL_BCASTEN;
#ifdef CONFIG_NET_MULTICAST #ifdef CONFIG_LPC17_MULTICAST
regval |= (ETH_RXFLCTRL_MCASTEN | ETH_RXFLCTRL_UCASTEN); regval |= (ETH_RXFLCTRL_MCASTEN | ETH_RXFLCTRL_UCASTEN);
#endif #endif
#ifdef CONFIG_NET_HASH #ifdef CONFIG_NET_HASH

2
arch/mips/src/pic32mx/Kconfig
View File

@ -1108,7 +1108,7 @@ config NET_HASH
---help--- ---help---
Enable receipt of near-perfect match frames. Enable receipt of near-perfect match frames.
config NET_MULTICAST config PIC32MX_MULTICAST
bool "Multicast" bool "Multicast"
default y if NET_IGMP default y if NET_IGMP
depends on PIC32MX_ETHERNET depends on PIC32MX_ETHERNET

6
arch/mips/src/pic32mx/pic32mx-ethernet.c
View File

@ -110,8 +110,8 @@
/* If IGMP is enabled, then accept multi-cast frames. */ /* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) #if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MX_MULTICAST)
# define CONFIG_NET_MULTICAST 1 # define CONFIG_PIC32MX_MULTICAST 1
#endif #endif
/* Use defaults if the number of discriptors is not provided */ /* Use defaults if the number of discriptors is not provided */
@ -2109,7 +2109,7 @@ static int pic32mx_ifup(struct net_driver_s *dev)
*/ */
regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED; regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED;
#ifdef CONFIG_NET_MULTICAST #ifdef CONFIG_PIC32MX_MULTICAST
regval |= ETH_RXFC_MCEN; regval |= ETH_RXFC_MCEN;
#endif #endif
pic32mx_putreg(regval, PIC32MX_ETH_RXFC); pic32mx_putreg(regval, PIC32MX_ETH_RXFC);

2
arch/mips/src/pic32mz/Kconfig
View File

@ -411,7 +411,7 @@ config NET_HASH
---help--- ---help---
Enable receipt of near-perfect match frames. Enable receipt of near-perfect match frames.
config NET_MULTICAST config PIC32MZ_MULTICAST
bool "Multicast" bool "Multicast"
default y if NET_IGMP default y if NET_IGMP
depends on PIC32MZ_ETHERNET depends on PIC32MZ_ETHERNET

6
arch/mips/src/pic32mz/pic32mz-ethernet.c
View File

@ -110,8 +110,8 @@
/* If IGMP is enabled, then accept multi-cast frames. */ /* If IGMP is enabled, then accept multi-cast frames. */
#if defined(CONFIG_NET_IGMP) && !defined(CONFIG_NET_MULTICAST) #if defined(CONFIG_NET_IGMP) && !defined(CONFIG_PIC32MZ_MULTICAST)
# define CONFIG_NET_MULTICAST 1 # define CONFIG_PIC32MZ_MULTICAST 1
#endif #endif
/* Use defaults if the number of discriptors is not provided */ /* Use defaults if the number of discriptors is not provided */
@ -2132,7 +2132,7 @@ static int pic32mz_ifup(struct net_driver_s *dev)
*/ */
regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED; regval = ETH_RXFC_BCEN | ETH_RXFC_UCEN | ETH_RXFC_PMMODE_DISABLED;
#ifdef CONFIG_NET_MULTICAST #ifdef CONFIG_PIC32MZ_MULTICAST
regval |= ETH_RXFC_MCEN; regval |= ETH_RXFC_MCEN;
#endif #endif
pic32mz_putreg(regval, PIC32MZ_ETH_RXFC); pic32mz_putreg(regval, PIC32MZ_ETH_RXFC);