[PATCH BlueZ v2 1/5] tools: Use '>' as prompt end marker

[PATCH BlueZ v2 1/5] tools: Use '>' as prompt end marker

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This replaces the use of '#' with '>' as prompt end marker since the
former is used to describe comments on the script which might be
confused with prompt.
---
 client/main.c            | 6 +++---
 client/mgmt.c            | 6 +++---
 tools/bluetooth-player.c | 2 +-
 tools/btpclientctl.c     | 2 +-
 tools/mesh-cfgclient.c   | 2 +-
 tools/mesh-gatt/util.c   | 2 +-
 tools/mesh/util.c        | 2 +-
 tools/meshctl.c          | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/client/main.c b/client/main.c
index 3f8143dde4b8..9258b44655dd 100644
--- a/client/main.c
+++ b/client/main.c
@@ -43,7 +43,7 @@
 #define COLORED_CHG	COLOR_YELLOW "CHG" COLOR_OFF
 #define COLORED_DEL	COLOR_RED "DEL" COLOR_OFF
 
-#define PROMPT_ON	"[bluetooth]# "
+#define PROMPT_ON	"[bluetoothctl]> "
 #define PROMPT_OFF	"Waiting to connect to bluetoothd..."
 
 static DBusConnection *dbus_conn;
@@ -333,7 +333,7 @@ static void set_default_device(GDBusProxy *proxy, const char *attribute)
 	path = g_dbus_proxy_get_path(proxy);
 
 	dbus_message_iter_get_basic(&iter, &desc);
-	desc = g_strdup_printf("[%s%s%s]# ", desc,
+	desc = g_strdup_printf("[%s%s%s]> ", desc,
 				attribute ? ":" : "",
 				attribute ? attribute + strlen(path) : "");
 
@@ -2099,7 +2099,7 @@ static void set_default_local_attribute(char *attr)
 	default_local_attr = attr;
 	default_attr = NULL;
 
-	desc = g_strdup_printf("[%s]# ", attr);
+	desc = g_strdup_printf("[%s]> ", attr);
 
 	bt_shell_set_prompt(desc, COLOR_BLUE);
 	g_free(desc);
diff --git a/client/mgmt.c b/client/mgmt.c
index 59dcb3135344..1946d65d2fe2 100644
--- a/client/mgmt.c
+++ b/client/mgmt.c
@@ -71,16 +71,16 @@ static int pending_index = 0;
 #define MIN(x, y) ((x) < (y) ? (x) : (y))
 #endif
 
-#define PROMPT_ON	COLOR_BLUE "[mgmt]" COLOR_OFF "# "
+#define PROMPT_ON	COLOR_BLUE "[mgmt]" COLOR_OFF "> "
 
 static void update_prompt(uint16_t index)
 {
 	char str[32];
 
 	if (index == MGMT_INDEX_NONE)
-		snprintf(str, sizeof(str), "[mgmt]# ");
+		snprintf(str, sizeof(str), "[mgmt]> ");
 	else
-		snprintf(str, sizeof(str), "[hci%u]# ", index);
+		snprintf(str, sizeof(str), "[hci%u]> ", index);
 
 	bt_shell_set_prompt(str, COLOR_BLUE);
 }
diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c
index 83045ca3fe41..63a95b878fb8 100644
--- a/tools/bluetooth-player.c
+++ b/tools/bluetooth-player.c
@@ -33,7 +33,7 @@
 #include "src/shared/shell.h"
 #include "client/player.h"
 
-#define PROMPT	"[bluetooth]# "
+#define PROMPT	"[bluetooth-player]> "
 
 static DBusConnection *dbus_conn;
 
diff --git a/tools/btpclientctl.c b/tools/btpclientctl.c
index eb97463148d2..f6f61ed5d651 100644
--- a/tools/btpclientctl.c
+++ b/tools/btpclientctl.c
@@ -34,7 +34,7 @@
 
 #define DEFAULT_SOCKET_PATH	"/tmp/bt-stack-tester"
 
-#define PROMPT_ON	COLOR_BLUE "[btpclient]" COLOR_OFF "# "
+#define PROMPT_ON	COLOR_BLUE "[btpclient]" COLOR_OFF "> "
 
 #define EVT_OPCODE_BASE	0x80
 
diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c
index e64950a9cc65..3bd2b673ad7f 100644
--- a/tools/mesh-cfgclient.c
+++ b/tools/mesh-cfgclient.c
@@ -38,7 +38,7 @@
 #include "tools/mesh/model.h"
 #include "tools/mesh/remote.h"
 
-#define PROMPT_ON	"[mesh-cfgclient]# "
+#define PROMPT_ON	"[mesh-cfgclient]> "
 #define PROMPT_OFF	"Waiting to connect to bluetooth-meshd..."
 
 #define CFG_SRV_MODEL	0x0000
diff --git a/tools/mesh-gatt/util.c b/tools/mesh-gatt/util.c
index 58f240a7748e..84fa7b5eedb0 100644
--- a/tools/mesh-gatt/util.c
+++ b/tools/mesh-gatt/util.c
@@ -29,7 +29,7 @@ void set_menu_prompt(const char *name, const char *id)
 {
 	char *prompt;
 
-	prompt = g_strdup_printf("[%s%s%s]# ", name,
+	prompt = g_strdup_printf("[%s%s%s]> ", name,
 					id ? ": Target = " : "", id ? id : "");
 	bt_shell_set_prompt(prompt, COLOR_BLUE);
 	g_free(prompt);
diff --git a/tools/mesh/util.c b/tools/mesh/util.c
index 310aae0c63e6..6e81bf5f0285 100644
--- a/tools/mesh/util.c
+++ b/tools/mesh/util.c
@@ -28,7 +28,7 @@ void set_menu_prompt(const char *name, const char *id)
 {
 	char *prompt;
 
-	prompt = l_strdup_printf("[%s%s%s]# ", name,
+	prompt = l_strdup_printf("[%s%s%s]> ", name,
 					id ? ": Target = " : "", id ? id : "");
 	bt_shell_set_prompt(prompt, COLOR_BLUE);
 	l_free(prompt);
diff --git a/tools/meshctl.c b/tools/meshctl.c
index 00a68a3d1d57..7b9c44b11e49 100644
--- a/tools/meshctl.c
+++ b/tools/meshctl.c
@@ -54,7 +54,7 @@
 #define COLORED_CHG	COLOR_YELLOW "CHG" COLOR_OFF
 #define COLORED_DEL	COLOR_RED "DEL" COLOR_OFF
 
-#define PROMPT_ON	"[meshctl]# "
+#define PROMPT_ON	"[meshctl]> "
 #define PROMPT_OFF	"Waiting to connect to bluetoothd..."
 
 #define MESH_PROV_DATA_IN_UUID_STR	"00002adb-0000-1000-8000-00805f9b34fb"
@@ -603,7 +603,7 @@ static void set_connected_device(GDBusProxy *proxy)
 			goto done;
 
 	dbus_message_iter_get_basic(&iter, &desc);
-	desc = g_strdup_printf(COLOR_BLUE "[%s%s%s]" COLOR_OFF "# ", desc,
+	desc = g_strdup_printf(COLOR_BLUE "[%s%s%s]" COLOR_OFF "> ", desc,
 			       (desc && mesh) ? "-" : "",
 				mesh ? buf : "");
 
-- 
2.47.1

[PATCH BlueZ v2 2/5] bluetoothctl: Update documentation to use '>' as prompt end marker

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This replaces the use of '#' with '>' as prompt end marker since the
former is used to describe comments on the script which might be
confused with prompt.
---
 client/bluetoothctl-admin.rst     |   6 +-
 client/bluetoothctl-advertise.rst |  38 ++++----
 client/bluetoothctl-assistant.rst |   4 +-
 client/bluetoothctl-endpoint.rst  | 136 ++++++++++++++--------------
 client/bluetoothctl-gatt.rst      |  42 ++++-----
 client/bluetoothctl-mgmt.rst      | 146 +++++++++++++++---------------
 client/bluetoothctl-monitor.rst   |  16 ++--
 client/bluetoothctl-player.rst    |  38 ++++----
 client/bluetoothctl-scan.rst      |  20 ++--
 client/bluetoothctl-transport.rst |  18 ++--
 client/bluetoothctl.rst           |  48 +++++-----
 11 files changed, 256 insertions(+), 256 deletions(-)

diff --git a/client/bluetoothctl-admin.rst b/client/bluetoothctl-admin.rst
index 774af0530e45..fcc0d35c918f 100644
--- a/client/bluetoothctl-admin.rst
+++ b/client/bluetoothctl-admin.rst
@@ -26,9 +26,9 @@ allow
 
 Allow service UUIDs and block rest of them.
 
-:Usage: **# allow [clear/uuid1 uuid2 ...]**
-:Example: **# allow 0x1101 0x1102 0x1103**
-:Example: **# allow clear**
+:Usage: **> allow [clear/uuid1 uuid2 ...]**
+:Example: **> allow 0x1101 0x1102 0x1103**
+:Example: **> allow clear**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-advertise.rst b/client/bluetoothctl-advertise.rst
index 4b56324813ba..226ec6605372 100644
--- a/client/bluetoothctl-advertise.rst
+++ b/client/bluetoothctl-advertise.rst
@@ -26,17 +26,17 @@ uuids
 
 Set/Get advertise uuids.
 
-:Usage: **# uuids [all/uuid1 uuid2 ...]**
-:Example: **# uuids 0x1234**
-:Example: **# uuids 0x12345678**
-:Example: **# uuids 90f95193-35de-4306-a6e9-699328f15059**
+:Usage: **> uuids [all/uuid1 uuid2 ...]**
+:Example: **> uuids 0x1234**
+:Example: **> uuids 0x12345678**
+:Example: **> uuids 90f95193-35de-4306-a6e9-699328f15059**
 
 service
 -------
 
 Set/Get advertise service data.
 
-:Usage: **# service [uuid] [data=xx xx ...]**
+:Usage: **> service [uuid] [data=xx xx ...]**
 
 manufacturer
 ------------
@@ -50,7 +50,7 @@ maximum has been exceeded so you  may receive an error from bluetoothd that it
 "Failed to register advertisement" which means you need to reduce your
 manufacturer data length.
 
-:Usage: **# manufacturer [id] [data=xx xx ...]**
+:Usage: **> manufacturer [id] [data=xx xx ...]**
 
 data
 ----
@@ -68,8 +68,8 @@ You can modify the advertising data while it is advertising.
 
 To get the currently set data use the command data without any arguments.
 
-:Usage: **# data [type] [data=xx xx ...]**
-:Example: **# data 0x0C 01 0x0F 13**
+:Usage: **> data [type] [data=xx xx ...]**
+:Example: **> data 0x0C 01 0x0F 13**
 
 discoverable
 ------------
@@ -85,7 +85,7 @@ will be ignored.
 
 Entering the command by itself will show the status of the setting
 
-:Usage: **# discoverable [on/off]**
+:Usage: **> discoverable [on/off]**
 
 discoverable-timeout
 --------------------
@@ -101,7 +101,7 @@ discoverable [on] must be set to use this feature.
 
 Entering the command by itself will show the current value set.
 
-:Usage: **# discoverable-timeout [seconds]**
+:Usage: **> discoverable-timeout [seconds]**
 
 tx-power
 --------
@@ -119,7 +119,7 @@ This feature can be modified while advertising.
 
 Entering the command by itself will show the current value set.
 
-:Usage: **# tx-power [on/off] [power]**
+:Usage: **> tx-power [on/off] [power]**
 
 name
 ----
@@ -133,15 +133,15 @@ If the string is too big to fit into the packet it will be truncated.
 It will either advertise as a complete local name or if it has to be truncated
 then a shortened local name.
 
-:Usage: **# name [on/off/name]**
-:Example: **# name "0123456789abcdef0123456789abcdef"**
+:Usage: **> name [on/off/name]**
+:Example: **> name "0123456789abcdef0123456789abcdef"**
 
 appearance
 ----------
 
 Configure custom appearance to be advertised.
 
-:Usage: **# appearance [on/off/value]**
+:Usage: **> appearance [on/off/value]**
 
 duration
 --------
@@ -172,21 +172,21 @@ The advertising interval is determined by the advertising parameters that are
 set for each Instance. The advertising interval is the maximum of the
 advertising intervals set for each Instance.
 
-:Usage: **# duration [seconds]**
+:Usage: **> duration [seconds]**
 
 timeout
 -------
 
 Set/Get advertise timeout.
 
-:Usage: **# timeout [seconds]**
+:Usage: **> timeout [seconds]**
 
 secondary
 ---------
 
 Set/Get advertise secondary channel.
 
-:Usage: **# secondary [1M/2M/Coded]**
+:Usage: **> secondary [1M/2M/Coded]**
 
 interval
 --------
@@ -213,7 +213,7 @@ set for each Instance.
 The advertising interval is the maximum of the advertising intervals set for
 each Instance.
 
-:Usage: **# interval [milliseconds]**
+:Usage: **> interval [milliseconds]**
 
 clear
 -----
@@ -226,7 +226,7 @@ If you want to change the advertise configuration while advertising you must
 first clear the advertise configuration and then set the new advertise
 configuration.
 
-:Usage: **# clear [uuids/service/manufacturer/config-name...]**
+:Usage: **> clear [uuids/service/manufacturer/config-name...]**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-assistant.rst b/client/bluetoothctl-assistant.rst
index fb8c3a0d803f..643476b8c922 100644
--- a/client/bluetoothctl-assistant.rst
+++ b/client/bluetoothctl-assistant.rst
@@ -51,8 +51,8 @@ If the auto value is chosen when prompted for the Broadcast
 Code, a zero filled array will be sent to the peer. Otherwise,
 the string entered by the user will be sent as an array of bytes.
 
-:Usage: **# push <assistant>**
-:Example: | **# push /org/bluez/hci0/src_05_1F_EE_F3_F8_7D/dev_00_60_37_31_7E_3F/bis1**
+:Usage: **> push <assistant>**
+:Example: | **> push /org/bluez/hci0/src_05_1F_EE_F3_F8_7D/dev_00_60_37_31_7E_3F/bis1**
           | **[Assistant] Enter Metadata (auto/value): 0x03 0x02 0x04 0x00**
           | **[Assistant] Enter Broadcast Code (auto/value): Borne House**
 
diff --git a/client/bluetoothctl-endpoint.rst b/client/bluetoothctl-endpoint.rst
index d13f37cd97e9..a9e973eb0ce3 100644
--- a/client/bluetoothctl-endpoint.rst
+++ b/client/bluetoothctl-endpoint.rst
@@ -26,52 +26,52 @@ list
 
 List available endpoints.
 
-:Usage: **# list [local]**
+:Usage: **> list [local]**
 
 show
 ----
 
 Endpoint information.
 
-:Usage: **# show [endpoint]**
+:Usage: **> show [endpoint]**
 
 register
 --------
 
 Register Endpoint.
 
-:Usage: **# register <UUID> <codec[:company]> [capabilities...]**
+:Usage: **> register <UUID> <codec[:company]> [capabilities...]**
 :Example LC3 BAP source:
-	 | **#endpoint.register 00002bcb-0000-1000-8000-00805f9b34fb 0x06**
-	 | **#Auto Accept (yes/no):** y
-	 | **#Max Transports (auto/value):** a
-	 | **#Locations:** a
-	 | **#Supported Context (value):** 3
-	 | **#Context (value):** 3
-	 | **#CIG (auto/value):** a
-	 | **#CIS (auto/value):** a
+	 | **>endpoint.register 00002bcb-0000-1000-8000-00805f9b34fb 0x06**
+	 | **>Auto Accept (yes/no):** y
+	 | **>Max Transports (auto/value):** a
+	 | **>Locations:** a
+	 | **>Supported Context (value):** 3
+	 | **>Context (value):** 3
+	 | **>CIG (auto/value):** a
+	 | **>CIS (auto/value):** a
 :Example LC3 BAP sink with extra capabilities:
-	 | **#endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0x06 "0x03 0xe5 0x03 0x00 0x02 0xe6 0x07"**
-	 | **#Enter Metadata (value/no):** n
-	 | **#Auto Accept (yes/no):** y
-	 | **#Max Transports (auto/value):** a
-	 | **#Locations:** a
-	 | **#Supported Context (value):** 3
-	 | **#Context (value):** 3
-	 | **#CIG (auto/value):** a
-	 | **#CIS (auto/value):** a
+	 | **>endpoint.register 00002bc9-0000-1000-8000-00805f9b34fb 0x06 "0x03 0xe5 0x03 0x00 0x02 0xe6 0x07"**
+	 | **>Enter Metadata (value/no):** n
+	 | **>Auto Accept (yes/no):** y
+	 | **>Max Transports (auto/value):** a
+	 | **>Locations:** a
+	 | **>Supported Context (value):** 3
+	 | **>Context (value):** 3
+	 | **>CIG (auto/value):** a
+	 | **>CIS (auto/value):** a
 :Example LC3 BAP Broadcast source:
-	 | **#endpoint.register 00001852-0000-1000-8000-00805f9b34fb 0x06**
-	 | **#Auto Accept (yes/no):** y
-	 | **#Max Transports (auto/value):** a
-	 | **#Locations:** 3
-	 | **#Supported Context (value):** 1
+	 | **>endpoint.register 00001852-0000-1000-8000-00805f9b34fb 0x06**
+	 | **>Auto Accept (yes/no):** y
+	 | **>Max Transports (auto/value):** a
+	 | **>Locations:** 3
+	 | **>Supported Context (value):** 1
 :Example LC3 BAP Broadcast sink:
-	 | **#endpoint.register 00001851-0000-1000-8000-00805f9b34fb 0x06**
-	 | **#Auto Accept (yes/no):** y
-	 | **#Max Transports (auto/value):** a
-	 | **#Locations:** 3
-	 | **#Supported Context (value):** 1
+	 | **>endpoint.register 00001851-0000-1000-8000-00805f9b34fb 0x06**
+	 | **>Auto Accept (yes/no):** y
+	 | **>Max Transports (auto/value):** a
+	 | **>Locations:** 3
+	 | **>Supported Context (value):** 1
 
 Note:
 
@@ -85,7 +85,7 @@ unregister
 
 Unregister Endpoint.
 
-:Usage: **# unregister <UUID/object>**
+:Usage: **> unregister <UUID/object>**
 
 Note:
 
@@ -97,7 +97,7 @@ config
 
 Configure Endpoint.
 
-:Usage: **# config <endpoint> <local endpoint> [preset]**
+:Usage: **> config <endpoint> <local endpoint> [preset]**
 
 Note:
 
@@ -109,54 +109,54 @@ presets
 
 List available presets.
 
-:Usage: **# presets <endpoint>/<UUID> [codec[:company]] [preset] [codec config] [metadata]**
+:Usage: **> presets <endpoint>/<UUID> [codec[:company]] [preset] [codec config] [metadata]**
 :Example using endpoint:
-	  | **#presets /local/endpoint/ep0 32_1_1**
-	  | **#presets /local/endpoint/ep0**
+	  | **>presets /local/endpoint/ep0 32_1_1**
+	  | **>presets /local/endpoint/ep0**
 	  | Preset 32_1_1
-	  | Configuration.#0: len 0x02 type 0x01
+	  | Configuration.**>0: len 0x02 type 0x01
           | Configuration.Sampling Frequency: 32 Khz (0x06)
-          | Configuration.#1: len 0x02 type 0x02
+          | Configuration.**>1: len 0x02 type 0x02
           | Configuration.Frame Duration: 7.5 ms (0x00)
-          | Configuration.#2: len 0x03 type 0x04
+          | Configuration.**>2: len 0x03 type 0x04
           | Configuration.Frame Length: 60 (0x003c)
 :Example using UUID:
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 32_1_1**
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 32_1_1**
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
 	  | ...
 	  | ***32_1_1**
 :Example setting up LC3 custom preset:
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 custom**
-	  | **#[Codec] Enter frequency (Khz):** 48
-	  | **#[Codec] Enter frame duration (ms):** 10
-	  | **#[Codec] Enter channel allocation:** 3
-	  | **#[Codec] Enter frame length:** 100
-	  | **#[QoS] Enter Target Latency (Low, Balance, High):** Low
-	  | **#[QoS] Enter SDU Interval (us):** 1000
-	  | **#[QoS] Enter Framing (Unframed, Framed):** Unframed
-	  | **#[QoS] Enter PHY (1M, 2M):** 2M
-	  | **#[QoS] Enter Max SDU:** 200
-	  | **#[QoS] Enter RTN:** 3
-	  | **#[QoS] Enter Max Transport Latency (ms):** 10
-	  | **#[QoS] Enter Presentation Delay (us):** 20000
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 custom**
+	  | **>[Codec] Enter frequency (Khz):** 48
+	  | **>[Codec] Enter frame duration (ms):** 10
+	  | **>[Codec] Enter channel allocation:** 3
+	  | **>[Codec] Enter frame length:** 100
+	  | **>[QoS] Enter Target Latency (Low, Balance, High):** Low
+	  | **>[QoS] Enter SDU Interval (us):** 1000
+	  | **>[QoS] Enter Framing (Unframed, Framed):** Unframed
+	  | **>[QoS] Enter PHY (1M, 2M):** 2M
+	  | **>[QoS] Enter Max SDU:** 200
+	  | **>[QoS] Enter RTN:** 3
+	  | **>[QoS] Enter Max Transport Latency (ms):** 10
+	  | **>[QoS] Enter Presentation Delay (us):** 20000
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
 	  | ...
 	  | ***custom**
 :Example setting up LC3 custom preset with extra configuration:
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 custom "0x03 0xe8 0x00 0x00 0x02 0xe9 0x00"**
-	  | **#[Codec] Enter frequency (Khz):** 48
-	  | **#[Codec] Enter frame duration (ms):** 10
-	  | **#[Codec] Enter channel allocation:** 3
-	  | **#[Codec] Enter frame length:** 100
-	  | **#[QoS] Enter Target Latency (Low, Balance, High):** Low
-	  | **#[QoS] Enter SDU Interval (us):** 1000
-	  | **#[QoS] Enter Framing (Unframed, Framed):** Unframed
-	  | **#[QoS] Enter PHY (1M, 2M):** 2M
-	  | **#[QoS] Enter Max SDU:** 200
-	  | **#[QoS] Enter RTN:** 3
-	  | **#[QoS] Enter Max Transport Latency (ms):** 10
-	  | **#[QoS] Enter Presentation Delay (us):** 20000
-	  | **#presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06 custom "0x03 0xe8 0x00 0x00 0x02 0xe9 0x00"**
+	  | **>[Codec] Enter frequency (Khz):** 48
+	  | **>[Codec] Enter frame duration (ms):** 10
+	  | **>[Codec] Enter channel allocation:** 3
+	  | **>[Codec] Enter frame length:** 100
+	  | **>[QoS] Enter Target Latency (Low, Balance, High):** Low
+	  | **>[QoS] Enter SDU Interval (us):** 1000
+	  | **>[QoS] Enter Framing (Unframed, Framed):** Unframed
+	  | **>[QoS] Enter PHY (1M, 2M):** 2M
+	  | **>[QoS] Enter Max SDU:** 200
+	  | **>[QoS] Enter RTN:** 3
+	  | **>[QoS] Enter Max Transport Latency (ms):** 10
+	  | **>[QoS] Enter Presentation Delay (us):** 20000
+	  | **>presets 00002bc9-0000-1000-8000-00805f9b34fb 0x06**
 	  | ...
 	  | ***custom**
 
diff --git a/client/bluetoothctl-gatt.rst b/client/bluetoothctl-gatt.rst
index 2a239beca83e..8a157021043f 100644
--- a/client/bluetoothctl-gatt.rst
+++ b/client/bluetoothctl-gatt.rst
@@ -27,147 +27,147 @@ list-attributes
 
 List attributes.
 
-:Usage: **# list-attributes <attribute/UUID>**
+:Usage: **> list-attributes <attribute/UUID>**
 
 select-attribute
 ----------------
 
 Select attribute.
 
-:Usage: **# select-attribute <attribute/UUID>**
+:Usage: **> select-attribute <attribute/UUID>**
 
 attribute-info
 --------------
 
 Select attribute.
 
-:Usage: **# attribute-info [attribute/UUID]**
+:Usage: **> attribute-info [attribute/UUID]**
 
 read
 ----
 
 Read attribute value.
 
-:Usage: **# read [offset]**
+:Usage: **> read [offset]**
 
 write
 -----
 
 Write attribute value.
 
-:Usage: **# write <data=xx xx ...> [offset] [type]**
+:Usage: **> write <data=xx xx ...> [offset] [type]**
 
 acquire-write
 -------------
 
 Acquire Write file descriptor.
 
-:Usage: **# acquire-write**
+:Usage: **> acquire-write**
 
 release-write
 -------------
 
 Release Write file descriptor.
 
-:Usage: **# release-write**
+:Usage: **> release-write**
 
 acquire-notify
 --------------
 
 Acquire Notify file descriptor.
 
-:Usage: **# acquire-notify**
+:Usage: **> acquire-notify**
 
 release-notify
 --------------
 
 Release Notify file descriptor.
 
-:Usage: **# release-notify**
+:Usage: **> release-notify**
 
 notify
 ------
 
 Notify attribute value.
 
-:Usage: **# notify <on/off>**
+:Usage: **> notify <on/off>**
 
 clone
 -----
 
 Clone a device or attribute.
 
-:Usage: **# clone [dev/attribute/UUID]**
+:Usage: **> clone [dev/attribute/UUID]**
 
 register-application
 --------------------
 
 Register application.
 
-:Usage: **# register-application [UUID ...]**
+:Usage: **> register-application [UUID ...]**
 
 unregister-application
 ----------------------
 
 Unregister application
 
-:Usage: **# unregister-application**
+:Usage: **> unregister-application**
 
 register-service
 ----------------
 
 Register application service.
 
-:Usage: **# register-service <UUID> [handle]**
+:Usage: **> register-service <UUID> [handle]**
 
 unregister-service
 ------------------
 
 Unregister application service
 
-:Usage: **# unregister-service <UUID/object>**
+:Usage: **> unregister-service <UUID/object>**
 
 register-includes
 -----------------
 
 Register as Included service.
 
-:Usage: **#r egister-includes <UUID> [handle]**
+:Usage: **>r egister-includes <UUID> [handle]**
 
 unregister-includes
 -------------------
 
 Unregister Included service.
 
-:Usage: **# unregister-includes <Service-UUID><Inc-UUID>**
+:Usage: **> unregister-includes <Service-UUID><Inc-UUID>**
 
 register-characteristic
 -----------------------
 
 Register service characteristic.
 
-:Usage: **# register-characteristic <UUID> <Flags=read,write,notify...> [handle]**
+:Usage: **> register-characteristic <UUID> <Flags=read,write,notify...> [handle]**
 
 unregister-characteristic
 -------------------------
 
 Unregister service characteristic.
 
-:Usage: **# unregister-characteristic <UUID/object>**
+:Usage: **> unregister-characteristic <UUID/object>**
 
 register-descriptor
 -------------------
 
 Register characteristic descriptor.
 
-:Usage: **# register-descriptor <UUID> <Flags=read,write...> [handle]**
+:Usage: **> register-descriptor <UUID> <Flags=read,write...> [handle]**
 
 unregister-descriptor
 ---------------------
 
 Unregister characteristic descriptor.
 
-:Usage: **# unregister-descriptor <UUID/object>**
+:Usage: **> unregister-descriptor <UUID/object>**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-mgmt.rst b/client/bluetoothctl-mgmt.rst
index 4baed6480c14..b82141206f57 100644
--- a/client/bluetoothctl-mgmt.rst
+++ b/client/bluetoothctl-mgmt.rst
@@ -26,217 +26,217 @@ select
 
 Select a different index
 
-:Usage: **# select <index>**
+:Usage: **> select <index>**
 
 revision
 --------
 
 Get the MGMT Revision
 
-:Usage: **# revision**
+:Usage: **> revision**
 
 commands
 --------
 
 List supported commands
 
-:Usage: **# commands**
+:Usage: **> commands**
 
 config
 ------
 
 Show configuration info
 
-:Usage: **# config**
+:Usage: **> config**
 
 info
 ----
 
 Show controller info
 
-:Usage: **# info**
+:Usage: **> info**
 
 extinfo
 -------
 
 Show extended controller info
 
-:Usage: **# extinfo**
+:Usage: **> extinfo**
 
 auto-power
 ----------
 
 Power all available features
 
-:Usage: **# auto-power**
+:Usage: **> auto-power**
 
 power
 -----
 
 Toggle powered state
 
-:Usage: **# power <on/off>**
+:Usage: **> power <on/off>**
 
 discov
 ------
 
 Toggle discoverable state
 
-:Usage: **# discov <yes/no/limited> [timeout]**
+:Usage: **> discov <yes/no/limited> [timeout]**
 
 connectable
 -----------
 
 Toggle connectable state
 
-:Usage: **# connectable <on/off>**
+:Usage: **> connectable <on/off>**
 
 fast-conn
 ---------
 
 Toggle fast connectable state
 
-:Usage: **# fast-conn <on/off>**
+:Usage: **> fast-conn <on/off>**
 
 bondable
 --------
 
 Toggle bondable state
 
-:Usage: **# bondable <on/off>**
+:Usage: **> bondable <on/off>**
 
 pairable
 --------
 
 Toggle bondable state
 
-:Usage: **# pairable <on/off>**
+:Usage: **> pairable <on/off>**
 
 linksec
 -------
 
 Toggle link level security
 
-:Usage: **# linksec <on/off>**
+:Usage: **> linksec <on/off>**
 
 ssp
 ---
 
 Toggle SSP mode
 
-:Usage: **# spp <on/off>**
+:Usage: **> spp <on/off>**
 
 sc
 --
 
 Toggle SC support
 
-:Usage: **# sc <on/off/only>**
+:Usage: **> sc <on/off/only>**
 
 hs
 --
 
 Toggle HS support
 
-:Usage: **# hs <on/off>**
+:Usage: **> hs <on/off>**
 
 le
 --
 
 Toggle LE support
 
-:Usage: **# le <on/off>**
+:Usage: **> le <on/off>**
 
 advertising
 -----------
 
 Toggle LE advertising
 
-:Usage: **# advertise <on/off>**
+:Usage: **> advertise <on/off>**
 
 bredr
 -----
 
 Toggle BR/EDR support
 
-:Usage: **# bredr <on/off>**
+:Usage: **> bredr <on/off>**
 
 privacy
 -------
 
 Toggle privacy support
 
-:Usage: **# privacy <on/off> [irk]**
+:Usage: **> privacy <on/off> [irk]**
 
 class
 -----
 
 Set device major/minor class
 
-:Usage: **# class <major> <minor>**
+:Usage: **> class <major> <minor>**
 
 disconnect
 ----------
 
 Disconnect device
 
-:Usage: **# disconnect [-t type] <remote address>**
+:Usage: **> disconnect [-t type] <remote address>**
 
 con
 ---
 
 List connections
 
-:Usage: **# con**
+:Usage: **> con**
 
 find
 ----
 
 Discover nearby devices
 
-:Usage: **# find [-l|-b] [-L]**
+:Usage: **> find [-l|-b] [-L]**
 
 find-service
 ------------
 
 Discover nearby service
 
-:Usage: **# find-service [-u UUID] [-r RSSI_Threshold] [-l|-b]**
+:Usage: **> find-service [-u UUID] [-r RSSI_Threshold] [-l|-b]**
 
 stop-find
 ---------
 
 Stop discovery
 
-:Usage: **# stop-find [-l|-b]**
+:Usage: **> stop-find [-l|-b]**
 
 name
 ----
 
 Set local name
 
-:Usage: **# name <name> [shortname]**
+:Usage: **> name <name> [shortname]**
 
 pair
 ----
 
 Pair with a remote device
 
-:Usage: **# pair [-c cap] [-t type] <remote address>**
+:Usage: **> pair [-c cap] [-t type] <remote address>**
 
 cancelpair
 ----------
 
 Cancel pairing
 
-:Usage: **# cancelpair [-t type] <remote address>**
+:Usage: **> cancelpair [-t type] <remote address>**
 
 unpair
 ------
 
 Unpair device
 
-:Usage: **# unpair [-t type] <remote address>**
+:Usage: **> unpair [-t type] <remote address>**
 
 keys
 ----
@@ -250,63 +250,63 @@ ltks
 
 Load Long Term Keys
 
-:Usage: **# ltks**
+:Usage: **> ltks**
 
 irks
 ----
 
 Load Identity Resolving Keys
 
-:Usage: **# irks [--local index] [--file file path]**
+:Usage: **> irks [--local index] [--file file path]**
 
 block
 -----
 
 Block Device
 
-:Usage: **# block [-t type] <remote address>**
+:Usage: **> block [-t type] <remote address>**
 
 unblock
 -------
 
 Unblock Device
 
-:Usage: **# unblock [-t type] <remote address>**
+:Usage: **> unblock [-t type] <remote address>**
 
 add-uuid
 --------
 
 Add UUID
 
-:Usage: **# add-uuid <UUID> <service class hint>**
+:Usage: **> add-uuid <UUID> <service class hint>**
 
 rm-uuid
 -------
 
 Remove UUID
 
-:Usage: **# rm-uuid <UUID>**
+:Usage: **> rm-uuid <UUID>**
 
 clr-uuids
 ---------
 
 Clear UUIDs
 
-:Usage: **# clear-uuids**
+:Usage: **> clear-uuids**
 
 local-oob
 ---------
 
 Local OOB data
 
-:Usage: **# local-oob**
+:Usage: **> local-oob**
 
 remote-oob
 ----------
 
 Remote OOB data
 
-:Usage: **# remote-oob [-t <addr_type>] [-r <rand192>] [-h <hash192>]
+:Usage: **> remote-oob [-t <addr_type>] [-r <rand192>] [-h <hash192>]
 	[-R <rand256>] [-H <hash256>] <addr>**
 
 did
@@ -314,161 +314,161 @@ did
 
 Set Device ID
 
-:Usage: **# did <source>:<vendor>:<product>:<version>**
+:Usage: **> did <source>:<vendor>:<product>:<version>**
 
 static-addr
 -----------
 
 Set static address
 
-:Usage: **# static-addr <address>**
+:Usage: **> static-addr <address>**
 
 public-addr
 -----------
 
 Set public address
 
-:Usage: **# public-addr <address>**
+:Usage: **> public-addr <address>**
 
 ext-config
 ----------
 
 External configuration
 
-:Usage: **# ext-config <on/off>**
+:Usage: **> ext-config <on/off>**
 
 debug-keys
 ----------
 
 Toggle debug keys
 
-:Usage: **# debug-keys <on/off>**
+:Usage: **> debug-keys <on/off>**
 
 conn-info
 ---------
 
 Get connection information
 
-:Usage: **# conn-info [-t type] <remote address>**
+:Usage: **> conn-info [-t type] <remote address>**
 
 io-cap
 ------
 
 Set IO Capability
 
-:Usage: **# io-cap <cap>**
+:Usage: **> io-cap <cap>**
 
 scan-params
 -----------
 
 Set Scan Parameters
 
-:Usage: **# scan-params <interval> <window>**
+:Usage: **> scan-params <interval> <window>**
 
 get-clock
 ---------
 
 Get Clock Information
 
-:Usage: **# get-clock [address]**
+:Usage: **> get-clock [address]**
 
 add-device
 ----------
 
 Add Device
 
-:Usage: **# add-device [-a action] [-t type] <address>**
+:Usage: **> add-device [-a action] [-t type] <address>**
 
 del-device
 ----------
 
 Remove Device
 
-:Usage: **# del-device [-t type] <address>**
+:Usage: **> del-device [-t type] <address>**
 
 clr-devices
 -----------
 
 Clear Devices
 
-:Usage: **# clr-devices**
+:Usage: **> clr-devices**
 
 bredr-oob
 ---------
 
 Local OOB data (BR/EDR)
 
-:Usage: **# bredr-oob**
+:Usage: **> bredr-oob**
 
 le-oob
 ------
 
 Local OOB data (LE)
 
-:Usage: **# le-oob**
+:Usage: **> le-oob**
 
 advinfo
 -------
 
 Show advertising features
 
-:Usage: **# advinfo**
+:Usage: **> advinfo**
 
 advsize
 -------
 
 Show advertising size info
 
-:Usage: **# advsize [options] <instance_id>**
+:Usage: **> advsize [options] <instance_id>**
 
 add-adv
 -------
 
 Add advertising instance
 
-:Usage: **# add-adv [options] <instance_id>**
+:Usage: **> add-adv [options] <instance_id>**
 
 rm-adv
 ------
 
 Remove advertising instance
 
-:Usage: **# rm-adv <instance_id>**
+:Usage: **> rm-adv <instance_id>**
 
 clr-adv
 -------
 
 Clear advertising instances
 
-:Usage: **# clr-adv**
+:Usage: **> clr-adv**
 
 add-ext-adv-params
 ------------------
 
 Add extended advertising params
 
-:Usage: **# add-ext-adv-parms [options] <instance_id>**
+:Usage: **> add-ext-adv-parms [options] <instance_id>**
 
 add-ext-adv-data
 ----------------
 
 Add extended advertising data
 
-:Usage: **# add-ext-adv-data [options] <instance_id>**
+:Usage: **> add-ext-adv-data [options] <instance_id>**
 
 appearance
 ----------
 
 Set appearance
 
-:Usage: **# appearance <appearance>**
+:Usage: **> appearance <appearance>**
 
 phy
 ---
 
 Get/Set PHY Configuration
 
-:Usage: **# phy [LE1MTX] [LE1MRX] [LE2MTX] [LE2MRX] [LECODEDTX] [LECODEDRX]
+:Usage: **> phy [LE1MTX] [LE1MRX] [LE2MTX] [LE2MRX] [LECODEDTX] [LECODEDRX]
 	[BR1M1SLOT] [BR1M3SLOT] [BR1M5SLOT][EDR2M1SLOT] [EDR2M3SLOT]
 	[EDR2M5SLOT][EDR3M1SLOT] [EDR3M3SLOT] [EDR3M5SLOT]**
 
@@ -477,63 +477,63 @@ wbs
 
 Toggle Wideband-Speech support
 
-:Usage: **# wbs <on/off>**
+:Usage: **> wbs <on/off>**
 
 secinfo
 -------
 
 Show security information
 
-:Usage: **# secinfo**
+:Usage: **> secinfo**
 
 expinfo
 -------
 
 Show experimental features
 
-:Usage: **# expinfo**
+:Usage: **> expinfo**
 
 exp-debug
 ---------
 
 Set debug feature
 
-:Usage: **# exp-debug <on/off>**
+:Usage: **> exp-debug <on/off>**
 
 exp-privacy
 -----------
 
 Set LL privacy feature
 
-:Usage: **# exp-privacy <on/off>**
+:Usage: **> exp-privacy <on/off>**
 
 exp-quality
 -----------
 
 Set bluetooth quality report feature
 
-:Usage: **# exp-quality <on/off>**
+:Usage: **> exp-quality <on/off>**
 
 exp-offload
 -----------
 
 Toggle codec support
 
-:Usage: **# exp-offload <on/off>**
+:Usage: **> exp-offload <on/off>**
 
 read-sysconfig
 --------------
 
 Read System Configuration
 
-:Usage: **# read-sysconfig**
+:Usage: **> read-sysconfig**
 
 set-sysconfig
 -------------
 
 Set System Configuration
 
-:Usage: **# set-sysconfig <-v|-h> [options...]**
+:Usage: **> set-sysconfig <-v|-h> [options...]**
 
 get-flags
 ---------
@@ -546,7 +546,7 @@ set-flags
 
 Set device flags
 
-:Usage: **# set-flags [-f flags] [-t type] <address>**
+:Usage: **> set-flags [-f flags] [-t type] <address>**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-monitor.rst b/client/bluetoothctl-monitor.rst
index 2357a56ace36..98b49dc22eb9 100644
--- a/client/bluetoothctl-monitor.rst
+++ b/client/bluetoothctl-monitor.rst
@@ -26,56 +26,56 @@ set-rssi-threshold
 
 Set RSSI threshold parameter
 
-:Usage: **# set-rssi-threshold <low_threshold> <high_threshold>**
+:Usage: **> set-rssi-threshold <low_threshold> <high_threshold>**
 
 set-rssi-timeout
 ----------------
 
 Set RSSI timeout parameter
 
-:Usage: **# set-rssi-timeout <low_timeout> <high_timeout>**
+:Usage: **> set-rssi-timeout <low_timeout> <high_timeout>**
 
 set-rssi-sampling-period
 -------------------------
 
 Set RSSI sampling period parameter
 
-:Usage: **# set-rssi-timeout <low_timeout> <high_timeout>**
+:Usage: **> set-rssi-timeout <low_timeout> <high_timeout>**
 
 add-or-pattern
 --------------
 
 Register 'or pattern' type monitor with the specified RSSI parameters
 
-:Usage: **# add-or-pattern [patterns=pattern1 pattern2 ...]**
+:Usage: **> add-or-pattern [patterns=pattern1 pattern2 ...]**
 
 get-pattern
 -----------
 
 Get advertisement monitor
 
-:Usage: **# get-pattern <monitor-id/all>**
+:Usage: **> get-pattern <monitor-id/all>**
 
 remove-pattern
 --------------
 
 Remove advertisement monitor
 
-:Usage: **# remove-pattern <monitor-id/all>**
+:Usage: **> remove-pattern <monitor-id/all>**
 
 get-supported-info
 ------------------
 
 Get advertisement manager supported features and supported monitor types
 
-:Usage: **# get-supported-info**
+:Usage: **> get-supported-info**
 
 print-usage
 -----------
 
 Print the command usage
 
-:Usage: **# print-usage <add-or-pattern>**
+:Usage: **> print-usage <add-or-pattern>**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-player.rst b/client/bluetoothctl-player.rst
index e45e61a1c5e3..0c446de6ab82 100644
--- a/client/bluetoothctl-player.rst
+++ b/client/bluetoothctl-player.rst
@@ -26,133 +26,133 @@ list
 
 List available players.
 
-:Usage: **# list**
+:Usage: **> list**
 
 show
 ----
 
 Show player information.
 
-:Usage: **# show [player]**
+:Usage: **> show [player]**
 
 select
 ------
 
 Select default player.
 
-:Usage: **# select <player>**
+:Usage: **> select <player>**
 
 play
 ----
 
 Start playback.
 
-:Usage: **# play [item]**
+:Usage: **> play [item]**
 
 pause
 -----
 
 Pause playback.
 
-:Usage: **# pause**
+:Usage: **> pause**
 
 stop
 ----
 
 Stop playback.
 
-:Usage: **# stop**
+:Usage: **> stop**
 
 next
 ----
 
 Jump to next item.
 
-:Usage: **# next**
+:Usage: **> next**
 
 previous
 --------
 
 Jump to previous item.
 
-:Usage: **# previous**
+:Usage: **> previous**
 
 fast-forward
 ------------
 
 Fast forward playback.
 
-:Usage: **# fast-forward**
+:Usage: **> fast-forward**
 
 rewind
 ------
 
 Rewind playback.
 
-:Usage: **# rewind**
+:Usage: **> rewind**
 
 equalizer
 ---------
 
 Enable/Disable equalizer.
 
-:Usage: **# equalizer <on/off>**
+:Usage: **> equalizer <on/off>**
 
 repeat
 ------
 
 Set repeat mode.
 
-:Usage: **# repeat <singletrack/alltrack/group/off>**
+:Usage: **> repeat <singletrack/alltrack/group/off>**
 
 shuffle
 -------
 
 Set shuffle mode.
 
-:Usage: **# shuffle <alltracks/group/off>**
+:Usage: **> shuffle <alltracks/group/off>**
 
 scan
 ----
 
 Set scan mode.
 
-:Usage: **# scan <alltracks/group/off>**
+:Usage: **> scan <alltracks/group/off>**
 
 change-folder
 -------------
 
 Change current folder.
 
-:Usage: **# change-folder <item>**
+:Usage: **> change-folder <item>**
 
 list-items
 ----------
 
 List items of current folder.
 
-:Usage: **# list-items [start] [end]**
+:Usage: **> list-items [start] [end]**
 
 search
 ------
 
 Search items containing string.
 
-:Usage: **# search <string>**
+:Usage: **> search <string>**
 
 queue
 -----
 
 Add item to playlist queue.
 
-:Usage: **# queue <item>**
+:Usage: **> queue <item>**
 
 show-item
 ---------
 
 Show item information.
 
-:Usage: **# show-item <item>**
+:Usage: **> show-item <item>**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-scan.rst b/client/bluetoothctl-scan.rst
index 54ea2e8fe8e5..23e0637fce55 100644
--- a/client/bluetoothctl-scan.rst
+++ b/client/bluetoothctl-scan.rst
@@ -26,7 +26,7 @@ uuids
 
 Set/Get UUIDs filter.
 
-:Usage: **# uuids [all/uuid1 uuid2 ...]**
+:Usage: **> uuids [all/uuid1 uuid2 ...]**
 
 rssi
 ----
@@ -40,8 +40,8 @@ The value is in dBm.
 If one or more discovery filters have been set, the RSSI delta-threshold imposed
 by starting discovery by default will not be applied.
 
-:Usage: **# rssi [rssi]**
-:Example: **# rssi -60**
+:Usage: **> rssi [rssi]**
+:Example: **> rssi -60**
 
 pathloss
 --------
@@ -54,8 +54,8 @@ The value is in dB.
 If one or more discovery filters have been set, the RSSI delta-threshold
 imposed by starting discovery by default will not be applied.
 
-:Usage: **# pathloss [pathloss]**
-:Example: **# pathloss 4**
+:Usage: **> pathloss [pathloss]**
+:Example: **> pathloss 4**
 
 transport
 ---------
@@ -78,7 +78,7 @@ an org.bluez.Error.Failed error will be returned.
 If "auto" transport is requested, the scan will use LE, BREDR, or both,
 depending on what's currently enabled on the controller.
 
-:Usage: **# transport [auto/bredr/le]**
+:Usage: **> transport [auto/bredr/le]**
 
 duplicate-data
 --------------
@@ -90,7 +90,7 @@ Disables duplicate detection of advertisement data.
 When enabled, PropertiesChanged signals will be generated for ManufacturerData
 and ServiceData every time they are discovered.
 
-:Usage: **# duplicate-data [on/off]**
+:Usage: **> duplicate-data [on/off]**
 
 discoverable
 ------------
@@ -102,7 +102,7 @@ Makes the adapter discoverable while discovering.
 If the adapter is already discoverable, setting this filter won't have any
 effect.
 
-:Usage: **# discoverable [on/off]**
+:Usage: **> discoverable [on/off]**
 
 pattern
 -------
@@ -119,7 +119,7 @@ When set, it disregards device discoverable flags.
        set any pattern, as it works as a logical OR. Also, setting an empty
        string "" pattern will match any device found.
 
-:Usage: **# pattern [value]**
+:Usage: **> pattern [value]**
 
 
 clear
@@ -127,7 +127,7 @@ clear
 
 Clears discovery filter.
 
-:Usage: **# clear [uuids/rssi/pathloss/transport/duplicate-data/discoverable/pattern]**
+:Usage: **> clear [uuids/rssi/pathloss/transport/duplicate-data/discoverable/pattern]**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl-transport.rst b/client/bluetoothctl-transport.rst
index 96156a8cf87b..c7a57716f7be 100644
--- a/client/bluetoothctl-transport.rst
+++ b/client/bluetoothctl-transport.rst
@@ -26,21 +26,21 @@ list
 
 List available transports.
 
-:Usage: **# list**
+:Usage: **> list**
 
 show
 ----
 
 Show transport information.
 
-:Usage: **# show [transport]**
+:Usage: **> show [transport]**
 
 acquire
 -------
 
 Acquire transport.
 
-:Usage: **# acquire <transport> [transport1...]**
+:Usage: **> acquire <transport> [transport1...]**
 
 Note:
 
@@ -53,7 +53,7 @@ select
 Select transport. For transports created on a Broadcast Sink device only. This moves
 the transport to the "broadcasting" state, pending acquire.
 
-:Usage: **# select <transport> [transport1...]**
+:Usage: **> select <transport> [transport1...]**
 
 Note:
 If running the setup with an audio server that has LE Audio support (such as PipeWire), it will
@@ -67,7 +67,7 @@ the transport to the "idle" state, pending release by the audio server. If the t
 was acquired by bluetoothctl it can be released straight away, without having to be
 unselected.
 
-:Usage: **# unselect <transport> [transport1...]**
+:Usage: **> unselect <transport> [transport1...]**
 
 Note:
 If running the setup with an audio server that has LE Audio support (such as PipeWire), it will
@@ -78,7 +78,7 @@ release
 
 Release transport.
 
-:Usage: **# release <transport> [transport1...]**
+:Usage: **> release <transport> [transport1...]**
 
 Note:
 
@@ -89,21 +89,21 @@ send
 
 Send contents of a file.
 
-:Usage: **# send <transport> <filename>**
+:Usage: **> send <transport> <filename>**
 
 receive
 -------
 
 Get/Set file to receive.
 
-:Usage: **# receive <transport> [filename]**
+:Usage: **> receive <transport> [filename]**
 
 volume
 ------
 
 Get/Set transport volume.
 
-:Usage: **# volume <transport> [value]**
+:Usage: **> volume <transport> [value]**
 
 RESOURCES
 =========
diff --git a/client/bluetoothctl.rst b/client/bluetoothctl.rst
index 7454c1d085f8..b6c2efa351d8 100644
--- a/client/bluetoothctl.rst
+++ b/client/bluetoothctl.rst
@@ -47,42 +47,42 @@ list
 
 List available controllers.
 
-:Usage: **# list**
+:Usage: **> list**
 
 show
 ----
 
 Controller information.
 
-:Usage: **# show [ctrl]**
+:Usage: **> show [ctrl]**
 
 select
 ------
 
 Select default controller.
 
-:Usage: **# select <ctrl>**
+:Usage: **> select <ctrl>**
 
 devices
 -------
 
 List available devices, with an optional property as the filter.
 
-:Usage: **# devices [Paired/Bonded/Trusted/Connected]**
+:Usage: **> devices [Paired/Bonded/Trusted/Connected]**
 
 system-alias
 ------------
 
 Set controller alias.
 
-:Usage: **# system-alias <name>**
+:Usage: **> system-alias <name>**
 
 reset-alias
 -----------
 
 Reset controller alias.
 
-:Usage: **# reset-alias**
+:Usage: **> reset-alias**
 
 power
 -----
@@ -92,7 +92,7 @@ Set controller power.
 When the controller is powered off, the USB port the controller is attached to
 is put into a suspend state.
 
-:Usage: **# power <on/off>**
+:Usage: **> power <on/off>**
 
 advertise
 ---------
@@ -108,14 +108,14 @@ device).
 A device can advertise if it initiated the connection to another advertising
 device.
 
-:Usage: **# advertise <on/off/type>**
+:Usage: **> advertise <on/off/type>**
 
 set-alias
 ---------
 
 Set device alias.
 
-:Usage: **# set-alias <alias>**
+:Usage: **> set-alias <alias>**
 
 scan
 ----
@@ -140,7 +140,7 @@ Note the following when scanning:
   - Device objects found during a scan session will only be persisted if they
     are connected/paired otherwise they are removed after some time.
 
-:Usage: **# scan <on/off/bredr/le>**
+:Usage: **> scan <on/off/bredr/le>**
 
 pair
 ----
@@ -161,7 +161,7 @@ connection before pairing.
 Before pairing the agent must be selected to choose the authentication
 mechanism.
 
-:Usage: **# pair <dev>**
+:Usage: **> pair <dev>**
 
 pairable
 --------
@@ -171,7 +171,7 @@ Set controller pairable mode.
 This enables/disables pairing. If pairing is disabled then the controller will
 not accept any pairing requests.
 
-:Usage: **# pairable <on/off>**
+:Usage: **> pairable <on/off>**
 
 discoverable
 ------------
@@ -188,7 +188,7 @@ requests.
 It will use a random address if supported by the controller. The length of time
 "discoverable on" is valid is determined by discoverable-timeout command.
 
-:Usage: **# discoverable <on/off>**
+:Usage: **> discoverable <on/off>**
 
 discoverable-timeout
 --------------------
@@ -197,7 +197,7 @@ Set discoverable timeout.
 
 The time in seconds that "discoverable on" is valid.
 
-:Usage: **# discoverable-timeout [value]**
+:Usage: **> discoverable-timeout [value]**
 
 agent
 -----
@@ -210,7 +210,7 @@ for pairing and allows you to choose the IO capabilities of the controller.
 The valid agent capabilities are: DisplayOnly, DisplayYesNo, KeyboardDisplay,
 KeyboardOnly, NoInputNoOutput.
 
-:Usage: **# agent <on/off/capability>**
+:Usage: **> agent <on/off/capability>**
 
 default-agent
 -------------
@@ -219,41 +219,41 @@ Set current agent as the default one.
 
 After selecting the agent this will make it the default agent.
 
-:Usage: **# default-agent**
+:Usage: **> default-agent**
 
 trust
 -----
 
 Trust device.
 
-:Usage: **# trust <dev>**
+:Usage: **> trust <dev>**
 
 untrust
 -------
 
 Untrust device.
 
-:Usage: **# untrust <dev>**
+:Usage: **> untrust <dev>**
 
 block
 -----
 
 Block device.
 
-:Usage: **# block <dev>**
+:Usage: **> block <dev>**
 
 unblock
 -------
 Unblock device
 
-:Usage: **# unblock <dev>**
+:Usage: **> unblock <dev>**
 
 remove
 ------
 
 Remove device.
 
-:Usage: **# remove <dev>**
+:Usage: **> remove <dev>**
 
 connect
 -------
@@ -269,7 +269,7 @@ If no advertising report is received before the timeout a
 le-connection-abort-by-local error will be issued. In that case either try
 again to connect assuming the device is advertising.
 
-:Usage: **# connect <dev>**
+:Usage: **> connect <dev>**
 
 disconnect
 ----------
@@ -279,14 +279,14 @@ Disconnect device.
 For LE when disconnecting from an active connection the device address is not
 needed.
 
-:Usage: **# disconnect <dev>**
+:Usage: **> disconnect <dev>**
 
 info
 ----
 
 Device information.
 
-:Usage: **# info <dev>**
+:Usage: **> info <dev>**
 
 
 Advertise Submenu
-- 
2.47.1

[PATCH BlueZ v2 3/5] share/hci: Introduce bt_hci_send_data

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This introduces bt_hci_send_data which can be used to send ACL, SCO or
ISO data packets to the underline HCI socket.
---
 src/shared/hci.c | 112 +++++++++++++++++++++++++++++++++++++++++++----
 src/shared/hci.h |   3 ++
 2 files changed, 106 insertions(+), 9 deletions(-)

diff --git a/src/shared/hci.c b/src/shared/hci.c
index f741a2bf5ca9..07fdffc82e0c 100644
--- a/src/shared/hci.c
+++ b/src/shared/hci.c
@@ -17,6 +17,11 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
+#include <sys/un.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
 
 #include "monitor/bt.h"
 #include "src/shared/mainloop.h"
@@ -53,6 +58,7 @@ struct bt_hci {
 	struct queue *cmd_queue;
 	struct queue *rsp_queue;
 	struct queue *evt_list;
+	struct queue *data_queue;
 };
 
 struct cmd {
@@ -73,6 +79,13 @@ struct evt {
 	void *user_data;
 };
 
+struct data {
+	uint8_t type;
+	uint16_t handle;
+	void *data;
+	uint8_t size;
+};
+
 static void cmd_free(void *data)
 {
 	struct cmd *cmd = data;
@@ -94,6 +107,14 @@ static void evt_free(void *data)
 	free(evt);
 }
 
+static void data_free(void *data)
+{
+	struct data *d = data;
+
+	free(d->data);
+	free(d);
+}
+
 static void send_command(struct bt_hci *hci, uint16_t opcode,
 						void *data, uint8_t size)
 {
@@ -126,17 +147,44 @@ static void send_command(struct bt_hci *hci, uint16_t opcode,
 	hci->num_cmds--;
 }
 
+static void send_data(struct bt_hci *hci, uint8_t type, uint16_t handle,
+						void *data, uint16_t size)
+{
+	struct iovec iov[3];
+	struct bt_hci_acl_hdr hdr;
+
+	hdr.handle = cpu_to_le16(handle);
+	hdr.dlen = cpu_to_le16(size);
+
+	iov[0].iov_base = &type;
+	iov[0].iov_len  = 1;
+	iov[1].iov_base = &hdr;
+	iov[1].iov_len  = sizeof(hdr);
+	iov[2].iov_base = data;
+	iov[2].iov_len  = size;
+
+	io_send(hci->io, iov, 3);
+}
+
 static bool io_write_callback(struct io *io, void *user_data)
 {
 	struct bt_hci *hci = user_data;
 	struct cmd *cmd;
+	struct data *data;
 
-	cmd = queue_pop_head(hci->cmd_queue);
-	if (cmd) {
-		send_command(hci, cmd->opcode, cmd->data, cmd->size);
-		queue_push_tail(hci->rsp_queue, cmd);
+	if (hci->num_cmds) {
+		cmd = queue_pop_head(hci->cmd_queue);
+		if (cmd) {
+			send_command(hci, cmd->opcode, cmd->data, cmd->size);
+			queue_push_tail(hci->rsp_queue, cmd);
+		}
 	}
 
+	data = queue_pop_head(hci->data_queue);
+	if (data)
+		send_data(hci, data->type, data->handle,
+					data->data, data->size);
+
 	hci->writer_active = false;
 
 	return false;
@@ -147,10 +195,7 @@ static void wakeup_writer(struct bt_hci *hci)
 	if (hci->writer_active)
 		return;
 
-	if (hci->num_cmds < 1)
-		return;
-
-	if (queue_isempty(hci->cmd_queue))
+	if (queue_isempty(hci->cmd_queue) && queue_isempty(hci->data_queue))
 		return;
 
 	if (!io_set_write_handler(hci->io, io_write_callback, hci, NULL))
@@ -300,11 +345,13 @@ static struct bt_hci *create_hci(int fd)
 	hci->cmd_queue = queue_new();
 	hci->rsp_queue = queue_new();
 	hci->evt_list = queue_new();
+	hci->data_queue = queue_new();
 
 	if (!io_set_read_handler(hci->io, io_read_callback, hci, NULL)) {
 		queue_destroy(hci->evt_list, NULL);
 		queue_destroy(hci->rsp_queue, NULL);
 		queue_destroy(hci->cmd_queue, NULL);
+		queue_destroy(hci->data_queue, NULL);
 		io_destroy(hci->io);
 		free(hci);
 		return NULL;
@@ -353,8 +400,11 @@ struct bt_hci *bt_hci_new_user_channel(uint16_t index)
 	int fd;
 
 	fd = create_socket(index, HCI_CHANNEL_USER);
-	if (fd < 0)
+	if (fd < 0) {
+		printf("Unable to create user channel socket: %s(%d)\n",
+			strerror(errno), -errno);
 		return NULL;
+	}
 
 	hci = create_hci(fd);
 	if (!hci) {
@@ -423,6 +473,7 @@ void bt_hci_unref(struct bt_hci *hci)
 	queue_destroy(hci->evt_list, evt_free);
 	queue_destroy(hci->cmd_queue, cmd_free);
 	queue_destroy(hci->rsp_queue, cmd_free);
+	queue_destroy(hci->data_queue, data_free);
 
 	io_destroy(hci->io);
 
@@ -523,6 +574,7 @@ bool bt_hci_flush(struct bt_hci *hci)
 
 	queue_remove_all(hci->cmd_queue, NULL, NULL, cmd_free);
 	queue_remove_all(hci->rsp_queue, NULL, NULL, cmd_free);
+	queue_remove_all(hci->data_queue, NULL, NULL, data_free);
 
 	return true;
 }
@@ -556,6 +608,48 @@ unsigned int bt_hci_register(struct bt_hci *hci, uint8_t event,
 	return evt->id;
 }
 
+bool bt_hci_send_data(struct bt_hci *hci, uint8_t type, uint16_t handle,
+				const void *data, uint8_t size)
+{
+	struct data *d;
+
+	if (!hci)
+		return false;
+
+	/* Check if type really reflects to a data packet */
+	switch (type) {
+	case BT_H4_ACL_PKT:
+	case BT_H4_SCO_PKT:
+	case BT_H4_EVT_PKT:
+		break;
+	default:
+		return false;
+	}
+
+	d = new0(struct data, 1);
+	d->type = type;
+	d->handle = handle;
+	d->size = size;
+
+	if (d->size > 0) {
+		d->data = util_memdup(data, d->size);
+		if (!d->data) {
+			free(d);
+			return false;
+		}
+	}
+
+	if (!queue_push_tail(hci->data_queue, d)) {
+		free(d->data);
+		free(d);
+		return false;
+	}
+
+	wakeup_writer(hci);
+
+	return true;
+}
+
 static bool match_evt_id(const void *a, const void *b)
 {
 	const struct evt *evt = a;
diff --git a/src/shared/hci.h b/src/shared/hci.h
index 9298442e512a..76ee72f54ace 100644
--- a/src/shared/hci.h
+++ b/src/shared/hci.h
@@ -34,6 +34,9 @@ unsigned int bt_hci_send(struct bt_hci *hci, uint16_t opcode,
 bool bt_hci_cancel(struct bt_hci *hci, unsigned int id);
 bool bt_hci_flush(struct bt_hci *hci);
 
+bool bt_hci_send_data(struct bt_hci *hci, uint8_t type, uint16_t handle,
+				const void *data, uint8_t size);
+
 unsigned int bt_hci_register(struct bt_hci *hci, uint8_t event,
 				bt_hci_callback_func_t callback,
 				void *user_data, bt_hci_destroy_func_t destroy);
-- 
2.47.1

[PATCH BlueZ v2 4/5] client: Add HCI submenu

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds HCI submenu:

Menu hci:
Available commands:
-------------------
open <index> <chan=raw,user>                      Open HCI channel
cmd <opcode> [parameters...]                      Send HCI data
send <type=acl,sco,iso> <handle> [data...]        Send HCI data
register <event>                                  Register HCI event handler
unregister <event>                                Unregister HCI event handler
close                                             Close HCI channel

Examples:

In order to open a user channel the controller needs to be power off
first:
bluetooth# power off
bluetooth# hci.open 0 user
HCI index 0 user channel opened

Then commands can be sent hci.cmd, so the following is sending HCI reset:
bluetooth# hci.cmd 0x0c03
HCI Command complete:
  00

For sending data packets to specific handle hci.send can be used:
bluetooth# hci.send acl 0x0000
---
 Makefile.tools |   3 +-
 client/hci.c   | 333 +++++++++++++++++++++++++++++++++++++++++++++++++
 client/hci.h   |  12 ++
 client/main.c  |   3 +
 4 files changed, 350 insertions(+), 1 deletion(-)
 create mode 100644 client/hci.c
 create mode 100644 client/hci.h

diff --git a/Makefile.tools b/Makefile.tools
index 71033d6388cf..51a5af6af77e 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -14,7 +14,8 @@ client_bluetoothctl_SOURCES = client/main.c \
 					client/admin.h client/admin.c \
 					client/player.h client/player.c \
 					client/mgmt.h client/mgmt.c \
-					client/assistant.h client/assistant.c
+					client/assistant.h client/assistant.c \
+					client/hci.h client/hci.c
 client_bluetoothctl_LDADD = lib/libbluetooth-internal.la \
 			gdbus/libgdbus-internal.la src/libshared-glib.la \
 			$(GLIB_LIBS) $(DBUS_LIBS) -lreadline
diff --git a/client/hci.c b/client/hci.c
new file mode 100644
index 000000000000..69fc4ba91707
--- /dev/null
+++ b/client/hci.c
@@ -0,0 +1,333 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2024 Intel Corporation
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "src/shared/util.h"
+#include "src/shared/queue.h"
+#include "src/shared/shell.h"
+#include "src/shared/hci.h"
+#include "monitor/bt.h"
+#include "hci.h"
+
+static struct bt_hci *hci;
+static struct queue *events;
+
+struct hci_event {
+	uint8_t event;
+	unsigned int id;
+};
+
+static void hci_open(int argc, char *argv[])
+{
+	long index;
+	char *endptr = NULL;
+
+	if (hci) {
+		bt_shell_printf("HCI channel already open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	index = strtol(argv[1], &endptr, 0);
+	if (!endptr || *endptr != '\0' || index < 0 || index > UINT16_MAX) {
+		bt_shell_printf("Invalid index: %s\n", argv[1]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	if (!strcasecmp(argv[2], "raw")) {
+		hci = bt_hci_new_raw_device(index);
+		if (!hci) {
+			bt_shell_printf("Unable to open raw channel\n");
+			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
+	} else if (!strcasecmp(argv[2], "user")) {
+		hci = bt_hci_new_user_channel(index);
+		if (!hci) {
+			bt_shell_printf("Unable to open user channel\n");
+			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
+	} else {
+		bt_shell_printf("Invalid channel: %s\n", argv[2]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bt_shell_printf("HCI index %ld %s channel opened\n", index, argv[2]);
+
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static uint8_t *str2bytearray(char *arg, size_t *val_len)
+{
+	uint8_t value[UINT8_MAX];
+	char *entry;
+	unsigned int i;
+
+	for (i = 0; (entry = strsep(&arg, " \t")) != NULL; i++) {
+		long val;
+		char *endptr = NULL;
+
+		if (*entry == '\0')
+			continue;
+
+		if (i >= G_N_ELEMENTS(value)) {
+			bt_shell_printf("Too much data\n");
+			return NULL;
+		}
+
+		val = strtol(entry, &endptr, 0);
+		if (!endptr || *endptr != '\0' || val > UINT8_MAX) {
+			bt_shell_printf("Invalid value at index %d\n", i);
+			return NULL;
+		}
+
+		value[i] = val;
+	}
+
+	*val_len = i;
+
+	return util_memdup(value, i);
+}
+
+static void hci_cmd_complete(const void *data, uint8_t size, void *user_data)
+{
+	bt_shell_printf("HCI Command complete:\n");
+	bt_shell_hexdump(data, size);
+
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static void hci_cmd(int argc, char *argv[])
+{
+	long opcode;
+	struct iovec iov = {};
+	char *endptr = NULL;
+	unsigned int ret;
+
+	if (!hci) {
+		bt_shell_printf("HCI channel not open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	opcode = strtol(argv[1], &endptr, 0);
+	if (!endptr || *endptr != '\0' || opcode < 0 || opcode > UINT16_MAX) {
+		bt_shell_printf("Invalid opcode: %s\n", argv[1]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	if (argc > 2) {
+		iov.iov_base = str2bytearray(argv[2], &iov.iov_len);
+		if (!iov.iov_base) {
+			bt_shell_printf("Invalid parameters: %s\n", argv[2]);
+			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
+	}
+
+	ret = bt_hci_send(hci, opcode, iov.iov_base, iov.iov_len,
+				hci_cmd_complete, NULL, NULL);
+
+	free(iov.iov_base);
+
+	if (!ret)
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+}
+
+static void hci_send(int argc, char *argv[])
+{
+	uint8_t type;
+	long handle;
+	struct iovec iov = {};
+	char *endptr = NULL;
+	bool ret;
+
+	if (!hci) {
+		bt_shell_printf("HCI channel not open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	if (!strcasecmp(argv[1], "acl")) {
+		type = BT_H4_ACL_PKT;
+	} else if (!strcasecmp(argv[1], "sco")) {
+		type = BT_H4_SCO_PKT;
+	} else if (!strcasecmp(argv[1], "iso")) {
+		type = BT_H4_ISO_PKT;
+	} else {
+		bt_shell_printf("Invalid type: %s\n", argv[1]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	handle = strtol(argv[2], &endptr, 0);
+	if (!endptr || *endptr != '\0' || handle < 0 || handle > UINT16_MAX) {
+		bt_shell_printf("Invalid handle: %s\n", argv[2]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	if (argc > 3) {
+		iov.iov_base = str2bytearray(argv[3], &iov.iov_len);
+		if (!iov.iov_base) {
+			bt_shell_printf("Invalid data: %s\n", argv[3]);
+			return bt_shell_noninteractive_quit(EXIT_FAILURE);
+		}
+	}
+
+	ret = bt_hci_send_data(hci, type, handle, iov.iov_base, iov.iov_len);
+
+	free(iov.iov_base);
+
+	return bt_shell_noninteractive_quit(ret ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+
+static bool match_event(const void *data, const void *match_data)
+{
+	const struct hci_event *evt = data;
+	uint8_t event = PTR_TO_UINT(match_data);
+
+	return evt->event == event;
+}
+
+static void hci_evt_received(const void *data, uint8_t size, void *user_data)
+{
+	struct hci_event *evt = user_data;
+
+	bt_shell_printf("HCI Event 0x%02x received:\n", evt->event);
+	bt_shell_hexdump(data, size);
+}
+
+static void hci_register(int argc, char *argv[])
+{
+	struct hci_event *evt;
+	long event;
+	char *endptr = NULL;
+
+	if (!hci) {
+		bt_shell_printf("HCI channel not open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	event = strtol(argv[1], &endptr, 0);
+	if (!endptr || *endptr != '\0' || event < 0 || event > UINT8_MAX) {
+		bt_shell_printf("Invalid event: %s\n", argv[1]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	if (!events)
+		events = queue_new();
+
+	evt = queue_find(events, match_event, UINT_TO_PTR(event));
+	if (evt) {
+		bt_shell_printf("Event already registered\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	evt = new0(struct hci_event, 1);
+	evt->event = event;
+	evt->id = bt_hci_register(hci, event, hci_evt_received, evt, NULL);
+
+	if (!evt->id) {
+		free(evt);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bt_shell_printf("HCI Event 0x%02x registered\n", (uint8_t)event);
+
+	queue_push_tail(events, evt);
+
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static void hci_unregister(int argc, char *argv[])
+{
+	struct hci_event *evt;
+	long event;
+	char *endptr = NULL;
+
+	if (!hci) {
+		bt_shell_printf("HCI channel not open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	event = strtol(argv[1], &endptr, 0);
+	if (!endptr || *endptr != '\0' || event < 0 || event > UINT8_MAX) {
+		bt_shell_printf("Invalid event: %s\n", argv[1]);
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	evt = queue_find(events, match_event, UINT_TO_PTR(event));
+	if (!evt) {
+		bt_shell_printf("Event not registered\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bt_hci_unregister(hci, evt->id);
+	queue_remove(events, evt);
+	free(evt);
+
+	bt_shell_printf("HCI Event 0x%02x unregistered\n", (uint8_t)event);
+
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static void hci_close(int argc, char *argv[])
+{
+	if (!hci) {
+		bt_shell_printf("HCI channel not open\n");
+		return bt_shell_noninteractive_quit(EXIT_FAILURE);
+	}
+
+	bt_hci_unref(hci);
+	hci = NULL;
+
+	bt_shell_printf("HCI channel closed\n");
+
+	return bt_shell_noninteractive_quit(EXIT_SUCCESS);
+}
+
+static const struct bt_shell_menu hci_menu = {
+	.name = "hci",
+	.desc = "HCI Submenu",
+	.entries = {
+	{ "open",        "<index> <chan=raw,user>", hci_open,
+					"Open HCI channel" },
+	{ "cmd",         "<opcode> [parameters...]", hci_cmd,
+					"Send HCI command" },
+	{ "send",        "<type=acl,sco,iso> <handle> [data...]", hci_send,
+					"Send HCI data" },
+	{ "register",    "<event>", hci_register,
+					"Register HCI event handler" },
+	{ "unregister",  "<event>", hci_unregister,
+					"Unregister HCI event handler" },
+	{ "close",         NULL, hci_close, "Close HCI channel" },
+	{} },
+};
+
+void hci_add_submenu(void)
+{
+	bt_shell_add_submenu(&hci_menu);
+}
+
+void hci_remove_submenu(void)
+{
+	if (!hci)
+		return;
+
+	if (events) {
+		queue_destroy(events, free);
+		events = NULL;
+	}
+
+	bt_hci_unref(hci);
+	hci = NULL;
+}
diff --git a/client/hci.h b/client/hci.h
new file mode 100644
index 000000000000..5efd89802452
--- /dev/null
+++ b/client/hci.h
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2024 Intel Corporation
+ *
+ *
+ */
+
+void hci_add_submenu(void);
+void hci_remove_submenu(void);
diff --git a/client/main.c b/client/main.c
index 9258b44655dd..c4fc49427021 100644
--- a/client/main.c
+++ b/client/main.c
@@ -37,6 +37,7 @@
 #include "player.h"
 #include "mgmt.h"
 #include "assistant.h"
+#include "hci.h"
 
 /* String display constants */
 #define COLORED_NEW	COLOR_GREEN "NEW" COLOR_OFF
@@ -3207,6 +3208,7 @@ int main(int argc, char *argv[])
 	player_add_submenu();
 	mgmt_add_submenu();
 	assistant_add_submenu();
+	hci_add_submenu();
 
 	client = g_dbus_client_new(dbus_conn, "org.bluez", "/org/bluez");
 
@@ -3229,6 +3231,7 @@ int main(int argc, char *argv[])
 	player_remove_submenu();
 	mgmt_remove_submenu();
 	assistant_remove_submenu();
+	hci_remove_submenu();
 
 	g_dbus_client_unref(client);
 
-- 
2.47.1

[PATCH BlueZ v2 5/5] client: Add bluetoothctl-hci.1 man page

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

This adds bluetoothctl-hci.rst which is then converted to
bluetoothctl-hci.1 using rst2man.
---
 Makefile.tools              |  5 ++-
 client/bluetoothctl-hci.rst | 86 +++++++++++++++++++++++++++++++++++++
 2 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 client/bluetoothctl-hci.rst

diff --git a/Makefile.tools b/Makefile.tools
index 51a5af6af77e..0dca43327fdd 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -354,7 +354,7 @@ man_MANS += tools/rctest.1 tools/l2ping.1 tools/btattach.1 tools/isotest.1 \
 		client/bluetoothctl-advertise.1 client/bluetoothctl-endpoint.1 \
 		client/bluetoothctl-gatt.1 client/bluetoothctl-player.1 \
 		client/bluetoothctl-scan.1 client/bluetoothctl-transport.1 \
-		client/bluetoothctl-assistant.1
+		client/bluetoothctl-assistant.1 client/bluetoothctl-hci.1
 
 endif
 
@@ -487,7 +487,8 @@ manual_pages += tools/hciattach.1 tools/hciconfig.1 \
 			client/bluetoothctl-player.1 \
 			client/bluetoothctl-scan.1 \
 			client/bluetoothctl-transport.1 \
-			client/bluetoothctl-assistant.1
+			client/bluetoothctl-assistant.1 \
+			client/bluetoothctl-hci.1
 
 if HID2HCI
 udevdir = $(UDEV_DIR)
diff --git a/client/bluetoothctl-hci.rst b/client/bluetoothctl-hci.rst
new file mode 100644
index 000000000000..2002763176b0
--- /dev/null
+++ b/client/bluetoothctl-hci.rst
@@ -0,0 +1,86 @@
+================
+bluetoothctl-hci
+================
+
+-----------
+HCI Submenu
+-----------
+
+:Version: BlueZ
+:Copyright: Free use of this software is granted under ther terms of the GNU
+            Lesser General Public Licenses (LGPL).
+:Date: December 2024
+:Manual section: 1
+:Manual group: Linux System Administration
+
+SYNOPSIS
+========
+
+**bluetoothctl** [--options] [hci.commands]
+
+Commands
+========
+
+open
+----
+
+Open HCI channel.
+
+:Usage: **> open <index> <chan=raw,user>**
+:Example open user channel:
+	| In order to open a user channel the controller needs to be power off
+	| first:
+	| > power off
+	| > hci.open 0 user
+	| HCI index 0 user channel opened
+
+cmd
+---
+
+Send HCI command.
+
+:Usage: **> cmd <opcode> [parameters...]**
+:Example send HCI Reset command:
+	| > hci.cmd 0x0c03
+	| HCI Command complete:
+	|  00
+
+send
+----
+
+Send HCI data packet.
+
+:Usage: **> send <type=acl,sco,iso> <handle> [data...]**
+:Example send ACL data packet to connection handle 0x0000:
+	| > hci.send acl 0x0000
+
+register
+--------
+
+Register HCI event handler.
+
+:Usage: **> register <event>**
+
+unregister
+----------
+
+Unregister HCI event handler.
+
+:Usage: **> unregister <event>**
+
+close
+-----
+
+Close HCI channel.
+
+:Usage: **> close <index>**
+
+RESOURCES
+=========
+
+http://www.bluez.org
+
+REPORTING BUGS
+==============
+
+linux-bluetooth@vger.kernel.org
-- 
2.47.1

RE: [BlueZ,v2,1/5] tools: Use '>' as prompt end marker

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1458 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=916922

---Test result---

Test Summary:
CheckPatch                    PENDING   0.36 seconds
GitLint                       PENDING   0.37 seconds
BuildEll                      PASS      24.51 seconds
BluezMake                     PASS      1618.75 seconds
MakeCheck                     PASS      14.19 seconds
MakeDistcheck                 PASS      159.14 seconds
CheckValgrind                 PASS      212.20 seconds
CheckSmatch                   WARNING   272.75 seconds
bluezmakeextell               PASS      98.82 seconds
IncrementalBuild              PENDING   0.48 seconds
ScanBuild                     PASS      846.42 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
tools/meshctl.c:324:33: warning: non-ANSI function declaration of function 'forget_mesh_devices'
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:



---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ v2 1/5] tools: Use '>' as prompt end marker

[patchwork-bot+bluetooth]

Hello:

This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Wed, 11 Dec 2024 14:22:06 -0500 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> This replaces the use of '#' with '>' as prompt end marker since the
> former is used to describe comments on the script which might be
> confused with prompt.
> ---
>  client/main.c            | 6 +++---
>  client/mgmt.c            | 6 +++---
>  tools/bluetooth-player.c | 2 +-
>  tools/btpclientctl.c     | 2 +-
>  tools/mesh-cfgclient.c   | 2 +-
>  tools/mesh-gatt/util.c   | 2 +-
>  tools/mesh/util.c        | 2 +-
>  tools/meshctl.c          | 4 ++--
>  8 files changed, 13 insertions(+), 13 deletions(-)

Here is the summary with links:
  - [BlueZ,v2,1/5] tools: Use '>' as prompt end marker
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5f0ec38851e1
  - [BlueZ,v2,2/5] bluetoothctl: Update documentation to use '>' as prompt end marker
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d1eb37042d9d
  - [BlueZ,v2,3/5] share/hci: Introduce bt_hci_send_data
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=560dcd2ea3d2
  - [BlueZ,v2,4/5] client: Add HCI submenu
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5527c88bc717
  - [BlueZ,v2,5/5] client: Add bluetoothctl-hci.1 man page
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6905331e2cd8

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html