Bluetooth: Host: Update configuration macros and comment out unused shell commands

bug: v/77156

Fix the definition conflict caused by the macro `CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC`.

Remove the `static` declaration in macro `shell_static_entry` to ensure that the shell command definitions can be referenced by `_shell_root_cmds_list` in defines.c.

Modify `defines.c` to comment out unused commands in `_shell_root_cmds_list` and manage the `net_buf_pool` segments of each shell command in `_net_buf_pool_list` using the macro `CONFIG_BT_MC_SHELL`. Also, comment out the `net_buf_pool` for unused commands.

Fix the incorrect parameter passing in the `adv-create` command.

Comment out invalid header file includes in `mible_test.c`.

Signed-off-by: chejinxian1 <[email protected]>

Author: chejinxian

include/zephyr/sys/time_units.h

@@ -73,7 +73,7 @@ static inline int z_impl_sys_clock_hw_cycles_per_sec_runtime_get(void)
 #if defined(CONFIG_TIMER_READS_ITS_FREQUENCY_AT_RUNTIME)
 #define sys_clock_hw_cycles_per_sec() sys_clock_hw_cycles_per_sec_runtime_get()
 #else
-#define sys_clock_hw_cycles_per_sec() CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC
+#define sys_clock_hw_cycles_per_sec() CONFIG_ZBLUE_SYS_CLOCK_HW_CYCLES_PER_SEC
 #endif
 
 /** @internal

port/include/zephyr/shell/shell.h

@@ -225,7 +225,7 @@ struct shell_static_entry {
  */
 #define SHELL_CMD_ARG_REGISTER(syntax, subcmd, help, handler,		   \
 			       mandatory, optional)			   \
-	static const struct shell_static_entry UTIL_CAT(_shell_, syntax) = \
+	const struct shell_static_entry UTIL_CAT(_shell_, syntax) = \
 	SHELL_CMD_ARG(syntax, subcmd, help, handler, mandatory, optional); \
 	const TYPE_SECTION_ITERABLE(union shell_cmd_entry,	   \
 		UTIL_CAT(shell_cmd_, syntax), shell_root_cmds,		   \

port/sections/defines.c

@@ -244,7 +244,7 @@ struct net_buf_pool *_net_buf_pool_list[] = {
 #endif /* CONFIG_BT_MESH_FRIEND */
 #endif /* CONFIG_BT_MESH */
 
-#if defined(CONFIG_BT_SHELL)
+#if defined(CONFIG_BT_MC_SHELL)
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
 	&data_rx_pool,
 	&data_tx_pool,
@@ -255,23 +255,23 @@ struct net_buf_pool *_net_buf_pool_list[] = {
 #if defined(CONFIG_BT_A2DP)
 	// &a2dp_tx_pool,
 #endif /* CONFIG_BT_A2DP */
-#if defined(CONFIG_BT_RFCOMM)
-	&pool,
-#endif /* CONFIG_BT_RFCOMM */
+// #if defined(CONFIG_BT_RFCOMM)
+// 	&pool,
+// #endif /* CONFIG_BT_RFCOMM */
 #endif /* CONFIG_BT_CLASSIC */
-#if defined(CONFIG_BT_ISO)
-	&bis_tx_pool,
-	&tx_pool,
-#endif /* CONFIG_BT_ISO */
-#if defined(CONFIG_BT_BAP_STREAM)
-	&sine_tx_pool,
-#endif /* CONFIG_BT_BAP_STREAM */
-#if defined(CONFIG_BT_AUDIO_TX)
-	&tx_pool,
-#endif /* CONFIG_BT_AUDIO_TX */
-#if defined(CONFIG_USB_DEVICE_AUDIO)
-	&usb_out_buf_pool,
-#endif /* CONFIG_USB_DEVICE_AUDIO */
+// #if defined(CONFIG_BT_ISO)
+// 	&bis_tx_pool,
+// 	&tx_pool,
+// #endif /* CONFIG_BT_ISO */
+// #if defined(CONFIG_BT_BAP_STREAM)
+// 	&sine_tx_pool,
+// #endif /* CONFIG_BT_BAP_STREAM */
+// #if defined(CONFIG_BT_AUDIO_TX)
+// 	&tx_pool,
+// #endif /* CONFIG_BT_AUDIO_TX */
+// #if defined(CONFIG_USB_DEVICE_AUDIO)
+// 	&usb_out_buf_pool,
+// #endif /* CONFIG_USB_DEVICE_AUDIO */
 #endif /* CONFIG_BT_SHELL */
 	NULL,
 };
@@ -321,7 +321,7 @@ const union shell_cmd_entry *_shell_root_cmds_list[] = {
 #if defined(CONFIG_BT_CLASSIC)
     &shell_cmd_br,
 #if defined(CONFIG_BT_RFCOMM)
-    &shell_cmd_rfcomm,
+    // &shell_cmd_rfcomm,
 #endif /* CONFIG_BT_RFCOMM */
 #if defined(CONFIG_BT_A2DP)
     // &shell_cmd_a2dp,
@@ -331,7 +331,7 @@ const union shell_cmd_entry *_shell_root_cmds_list[] = {
 #endif /* CONFIG_BT_AVRCP */
 #endif /* CONFIG_BT_CLASSIC */
 #if defined(CONFIG_BT_CONN)
-    &shell_cmd_gatt,
+    // &shell_cmd_gatt,
 #if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
     &shell_cmd_l2cap,
 #endif /* CONFIG_BT_L2CAP_DYNAMIC_CHANNEL */

port/subsys/bluetooth/host/shell/bt.c

@@ -2302,7 +2302,7 @@ static int cmd_adv_create(const struct shell *sh, size_t argc, char *argv[])
 
 	dev_id = strtoul(argv[1], NULL, 10);
 
-	if (!adv_param_parse(argc-1, argv+1, &param)) {
+	if (!adv_param_parse(argc-1, argv, &param)) {
 		shell_help(sh);
 		return -ENOEXEC;
 	}

port/subsys/bluetooth/host/shell/mible_test.c

@@ -16,7 +16,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/byteorder.h>
-#include <zephyr.h>
+// #include <zephyr.h>
 
 #include <settings/settings.h>