OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix a naming collision introduced in last big commit

This commit is contained in:
Gregory Nutt 2016-12-03 18:19:08 -06:00
parent 4f1b96b29b
commit 920a9592d1
12 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/tiva/Kconfig
View File

@ -913,19 +913,19 @@ config TIVA_BADCRC
choice
prompt "Work queue"
default TIVA_ETHERNET_LPWORK if SCHED_LPWORK
default TIVA_ETHERNET_HPWORK if !SCHED_LPWORK && SCHED_HPWORK
default LM3S_ETHERNET_LPWORK if SCHED_LPWORK
default LM3S_ETHERNET_HPWORK if !SCHED_LPWORK && SCHED_HPWORK
depends on SCHED_WORKQUEUE
---help---
Work queue support is required to use the Ethernet driver. If the
low priority work queue is available, then it should be used by the
driver.
config TIVA_ETHERNET_HPWORK
config LM3S_ETHERNET_HPWORK
bool "High priority"
depends on SCHED_HPWORK
config TIVA_ETHERNET_LPWORK
config LM3S_ETHERNET_LPWORK
bool "Low priority"
depends on SCHED_LPWORK
@ -1139,6 +1139,7 @@ config TIVA_ETHERNET_LPWORK
depends on SCHED_LPWORK
endchoice # Work queue
config TIVA_ETHERNET_REGDEBUG
bool "Register-Level Debug"
default n

6
arch/arm/src/tiva/lm3s_ethernet.c
View File

@ -83,12 +83,12 @@
/* Use the low priority work queue if possible */
# if defined(CONFIG_TIVA_ETHERNET_HPWORK)
# if defined(CONFIG_LM3S_ETHERNET_HPWORK)
# define ETHWORK HPWORK
# elif defined(CONFIG_TIVA_ETHERNET_LPWORK)
# elif defined(CONFIG_LM3S_ETHERNET_LPWORK)
# define ETHWORK LPWORK
# else
# error Neither CONFIG_TIVA_ETHERNET_HPWORK nor CONFIG_TIVA_ETHERNET_LPWORK defined
# error Neither CONFIG_LM3S_ETHERNET_HPWORK nor CONFIG_LM3S_ETHERNET_LPWORK defined
# endif
#endif

2
configs/eagle100/httpd/defconfig
View File

@ -257,7 +257,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
CONFIG_TIVA_BOARDMAC=y

2
configs/eagle100/nettest/defconfig
View File

@ -257,7 +257,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
CONFIG_TIVA_BOARDMAC=y

2
configs/eagle100/nsh/defconfig
View File

@ -257,7 +257,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
CONFIG_TIVA_BOARDMAC=y

2
configs/eagle100/thttpd/defconfig
View File

@ -250,7 +250,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
CONFIG_TIVA_BOARDMAC=y

2
configs/ekk-lm3s9b96/nsh/defconfig
View File

@ -252,7 +252,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
# CONFIG_TIVA_BOARDMAC is not set

2
configs/lm3s6432-s2e/nsh/defconfig
View File

@ -247,7 +247,7 @@ CONFIG_TIVA_GPIOB_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
CONFIG_TIVA_BOARDMAC=y

2
configs/lm3s6965-ek/discover/defconfig
View File

@ -251,7 +251,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
# CONFIG_TIVA_BOARDMAC is not set

2
configs/lm3s6965-ek/nsh/defconfig
View File

@ -251,7 +251,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
# CONFIG_TIVA_BOARDMAC is not set

2
configs/lm3s6965-ek/tcpecho/defconfig
View File

@ -250,7 +250,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
# CONFIG_TIVA_BOARDMAC is not set

2
configs/lm3s8962-ek/nsh/defconfig
View File

@ -261,7 +261,7 @@ CONFIG_TIVA_GPIOG_IRQS=y
# CONFIG_TIVA_PROMISCUOUS is not set
# CONFIG_TIVA_TIMESTAMP is not set
# CONFIG_TIVA_BADCRC is not set
CONFIG_TIVA_ETHERNET_HPWORK=y
CONFIG_LM3S_ETHERNET_HPWORK=y
# CONFIG_TIVA_DUMPPACKET is not set
# CONFIG_TIVA_BOARDMAC is not set