shell: Rename shell to legacy_shell

New shell implementation is on the way. For now old one and all
references are kept to be gradually replaced by new shell.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>

drivers/modem/modem_shell.c

@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <device.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include <misc/printk.h>
 

include/shell/legacy_shell.h

@@ -205,8 +205,8 @@ void shell_register_mcumgr_handler(shell_mcumgr_function_t handler, void *arg);
 int shell_exec(char *line);
 
 /**
-* @}
-*/
+ * @}
+ */
 
 
 #ifdef CONFIG_CONSOLE_SHELL

samples/drivers/flash_shell/src/main.c

@@ -9,7 +9,7 @@
 
 #include <zephyr.h>
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <flash.h>
 #include <device.h>
 #include <soc.h>

samples/mpu/mpu_test/src/main.c

@@ -8,7 +8,7 @@
 #include <zephyr.h>
 #include <flash.h>
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 /* Assumption: our devices have less than 64MB of memory */
 #define RESERVED_MEM_MAP (CONFIG_SRAM_BASE_ADDRESS + 0x4000000)

samples/net/rpl_border_router/src/shell.c

@@ -11,7 +11,7 @@
 #endif
 
 #include <zephyr.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <stdio.h>
 
 #include "../../../subsys/net/ip/rpl.h"

samples/net/syslog_net/src/main.c

@@ -12,7 +12,7 @@
 
 #include <zephyr.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <net/net_core.h>
 #include <net/net_pkt.h>
 

samples/net/wpanusb/src/wpanusb.c

@@ -13,7 +13,7 @@
 #include <net_private.h>
 
 #include <device.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include <usb/usb_device.h>
 #include <usb/usb_common.h>

samples/net/zperf/src/zperf_shell.c

@@ -12,7 +12,7 @@
 
 #include <zephyr.h>
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include <net/net_ip.h>
 #include <net/net_core.h>

samples/subsys/shell/shell_module/src/main.c

@@ -6,7 +6,7 @@
 
 #include <zephyr.h>
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <version.h>
 
 static int shell_cmd_ping(int argc, char *argv[])

subsys/bluetooth/host/mesh/shell.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <zephyr.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #include <settings/settings.h>

subsys/bluetooth/shell/bt.c

@@ -28,7 +28,7 @@
 #include <bluetooth/rfcomm.h>
 #include <bluetooth/sdp.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include "bt.h"
 #include "gatt.h"

subsys/bluetooth/shell/flash.c

@@ -10,7 +10,7 @@
  */
 
 #include <zephyr.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #include <stdlib.h>

subsys/bluetooth/shell/ll.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <zephyr.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #include <bluetooth/hci.h>

subsys/bluetooth/shell/ticker.c

@@ -10,7 +10,7 @@
  */
 
 #include <zephyr.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #if defined(CONFIG_SOC_FAMILY_NRF)

subsys/fs/shell.c

@@ -9,7 +9,7 @@
 #include <string.h>
 
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <init.h>
 #include <fs.h>
 #include <stdio.h>

subsys/mgmt/smp_shell.c

@@ -12,7 +12,7 @@
 #include <zephyr.h>
 #include <init.h>
 #include "net/buf.h"
-#include "shell/shell.h"
+#include "shell/legacy_shell.h"
 #include "mgmt/mgmt.h"
 #include "mgmt/serial.h"
 #include "mgmt/buf.h"

subsys/net/ip/net_shell.c

@@ -13,7 +13,7 @@
 #include <zephyr.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include <net/net_if.h>
 #include <net/dns_resolve.h>

subsys/net/l2/bluetooth/bluetooth_shell.c

@@ -10,7 +10,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #include <net/net_core.h>

subsys/net/l2/ieee802154/ieee802154_shell.c

@@ -11,7 +11,7 @@
 #include <zephyr.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 
 #include <net/net_if.h>

subsys/net/l2/wifi/wifi_shell.c

@@ -11,7 +11,7 @@
 #include <zephyr.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <misc/printk.h>
 #include <init.h>
 

subsys/net/lib/openthread/platform/shell.c

@@ -7,7 +7,7 @@
 #include <kernel.h>
 #include <stdio.h>
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <openthread/cli.h>
 #include <platform.h>
 

subsys/shell/CMakeLists.txt

@@ -4,7 +4,7 @@ zephyr_include_directories_ifdef(CONFIG_CONSOLE_SHELL
 
 zephyr_sources(
   shell_service.c
-  shell.c
+  legacy_shell.c
   )
 
 add_subdirectory(modules)

subsys/shell/legacy_shell.c

@@ -20,7 +20,7 @@
 #include <misc/util.h>
 #include "mgmt/serial.h"
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #if defined(CONFIG_NATIVE_POSIX_CONSOLE)
 #include "drivers/console/native_posix_console.h"
@@ -244,19 +244,16 @@ static int cmd_help(int argc, char *argv[])
 			cmd = get_standalone(cmd_str);
 			if (cmd) {
 				return show_cmd_help(cmd, true);
-			} else {
-				printk("No help found for '%s'\n", cmd_str);
-				return -EINVAL;
-			}
-		} else {
-			cmd = get_module_cmd(module, cmd_str);
-			if (cmd) {
-				return show_cmd_help(cmd, true);
-			} else {
-				printk("Unknown command '%s'\n", cmd_str);
-				return -EINVAL;
 			}
+			printk("No help found for '%s'\n", cmd_str);
+			return -EINVAL;
 		}
+		cmd = get_module_cmd(module, cmd_str);
+		if (cmd) {
+			return show_cmd_help(cmd, true);
+		}
+		printk("Unknown command '%s'\n", cmd_str);
+		return -EINVAL;
 	}
 
 module_help:

subsys/shell/modules/kernel_service.c

@@ -5,7 +5,7 @@
  */
 
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <init.h>
 #include <debug/object_tracing.h>
 #include <misc/reboot.h>

subsys/shell/shell_service.c

@@ -13,7 +13,7 @@
  */
 
 #include <misc/printk.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 #include <init.h>
 
 #define SHELL_PROMPT "shell> "

tests/bluetooth/mesh_shell/src/main.c

@@ -11,7 +11,7 @@
 #include <misc/printk.h>
 #include <zephyr.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 void main(void)
 {

tests/bluetooth/shell/src/main.c

@@ -21,7 +21,7 @@
 #include <misc/byteorder.h>
 #include <zephyr.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #include <gatt/hrs.h>
 

tests/include/tc_util.h

@@ -12,7 +12,7 @@
 #include <zephyr.h>
 
 #include <string.h>
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 #if defined(CONFIG_STDOUT_CONSOLE)
 #include <stdio.h>

tests/shell/src/main.c

@@ -12,7 +12,7 @@
 #include <zephyr.h>
 #include <ztest.h>
 
-#include <shell/shell.h>
+#include <shell/legacy_shell.h>
 
 static void test_shell_exec(const char *line, int result)
 {