Skip to content

Commit

Permalink
treewide: fix conditionals on deprecated module
Browse files Browse the repository at this point in the history
As a leftovers from RIOT-OS#18355 are still
present that check for `MODULE_SHELL_COMMANDS` rather than
`MODULE_SHELL_CMDS`. This updates the conditionals as needed.
  • Loading branch information
maribu committed Sep 21, 2022
1 parent 3876f38 commit f29ba73
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/dfplayer/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ menuconfig MODULE_DFPLAYER
select MODULE_XTIMER
select HAVE_MULTIMEDIA_DEVICE
# Perhaps this could be moved to its own symbol to enable the dfplayer commands
select MODULE_FMT if MODULE_SHELL_COMMANDS
select MODULE_FMT if MODULE_SHELL_CMDS

config DFPLAYER_NO_STRERROR
bool
prompt "Avoid using strerror in shell command" if !(HAS_ARCH_AVR8 || HAS_ARCH_MSP430)
depends on MODULE_DFPLAYER
depends on MODULE_SHELL_COMMANDS
depends on MODULE_SHELL_CMDS
# no strerror() on AVR and MSP430
default y if (HAS_ARCH_AVR8 || HAS_ARCH_MSP430)
help
Expand Down
2 changes: 1 addition & 1 deletion pkg/lwip/include/lwipopts.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ extern "C" {
#define LWIP_NETCONN 0
#endif /* MODULE_LWIP_SOCK */

#ifdef MODULE_SHELL_COMMANDS
#ifdef MODULE_SHELL_CMD_LWIP_NETIF
#define LWIP_DEBUG 1
#endif

Expand Down
2 changes: 1 addition & 1 deletion pkg/nimble/contrib/nimble_riot.c
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ void nimble_riot_init(void)
#ifdef MODULE_NIMBLE_NETIF
extern void nimble_netif_init(void);
nimble_netif_init();
#ifdef MODULE_SHELL_COMMANDS
#ifdef MODULE_SHELL_CMDS
extern void sc_nimble_netif_init(void);
sc_nimble_netif_init();
#endif
Expand Down

0 comments on commit f29ba73

Please sign in to comment.