Bluetooth: shell: Split L2CAP commands

This splits L2CAP commands under 'bt' to 'l2cap' removing 'l2cap-'
prefix from the commands:

l2cap - Bluetooth L2CAP shell commands
Options:
  -h, --help  :Show command help.
Subcommands:
  connect     :<psm>
  disconnect  :[none]
  metrics     :<value on, off>
  recv        :[delay (in miliseconds)
  register    :<psm> [sec_level]
  send        :<number of packets>

Signed-off-by: Luiz Augusto von Dentz <[email protected]>

Author: Vudentz

subsys/bluetooth/shell/CMakeLists.txt

@@ -10,6 +10,10 @@ zephyr_library_sources_ifdef(
   CONFIG_BT_BREDR
   bredr.c
   )
+zephyr_library_sources_ifdef(
+  CONFIG_BT_L2CAP_DYNAMIC_CHANNEL
+  l2cap.c
+  )
 zephyr_library_sources_ifdef(
   CONFIG_BT_RFCOMM
   rfcomm.c

subsys/bluetooth/shell/bt.c

@@ -24,7 +24,6 @@
 #include <bluetooth/hci.h>
 #include <bluetooth/bluetooth.h>
 #include <bluetooth/conn.h>
-#include <bluetooth/l2cap.h>
 #include <bluetooth/rfcomm.h>
 #include <bluetooth/sdp.h>
 
@@ -35,8 +34,6 @@
 
 #define DEVICE_NAME		CONFIG_BT_DEVICE_NAME
 #define DEVICE_NAME_LEN		(sizeof(DEVICE_NAME) - 1)
-#define CREDITS			10
-#define DATA_MTU		(23 * CREDITS)
 
 static u8_t selected_id = BT_ID_DEFAULT;
 const struct shell *ctx_shell;
@@ -48,11 +45,6 @@ struct bt_conn *default_conn;
 static struct bt_conn *pairing_conn;
 #endif /* CONFIG_BT_CONN */
 
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-NET_BUF_POOL_DEFINE(data_tx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL);
-NET_BUF_POOL_DEFINE(data_rx_pool, 1, DATA_MTU, BT_BUF_USER_DATA_MIN, NULL);
-#endif
-
 #define NAME_LEN 30
 
 static bool data_cb(struct bt_data *data, void *user_data)
@@ -335,7 +327,7 @@ static void cmd_init(const struct shell *shell, size_t argc, char *argv[])
 }
 
 #if defined(CONFIG_BT_HCI) || defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-static void hexdump(const struct shell *shell, const u8_t *data, size_t len)
+void hexdump(const struct shell *shell, const u8_t *data, size_t len)
 {
 	int n = 0;
 
@@ -1293,266 +1285,6 @@ static void cmd_auth_passkey(const struct shell *shell,
 }
 #endif /* CONFIG_BT_SMP) || CONFIG_BT_BREDR */
 
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-static u32_t l2cap_rate;
-static u32_t l2cap_recv_delay;
-static K_FIFO_DEFINE(l2cap_recv_fifo);
-struct l2ch {
-	struct k_delayed_work recv_work;
-	struct bt_l2cap_le_chan ch;
-};
-#define L2CH_CHAN(_chan) CONTAINER_OF(_chan, struct l2ch, ch.chan)
-#define L2CH_WORK(_work) CONTAINER_OF(_work, struct l2ch, recv_work)
-#define L2CAP_CHAN(_chan) _chan->ch.chan
-
-static int l2cap_recv_metrics(struct bt_l2cap_chan *chan, struct net_buf *buf)
-{
-	static u32_t len;
-	static u32_t cycle_stamp;
-	u32_t delta;
-
-	delta = k_cycle_get_32() - cycle_stamp;
-	delta = SYS_CLOCK_HW_CYCLES_TO_NS(delta);
-
-	/* if last data rx-ed was greater than 1 second in the past,
-	 * reset the metrics.
-	 */
-	if (delta > 1000000000) {
-		len = 0;
-		l2cap_rate = 0;
-		cycle_stamp = k_cycle_get_32();
-	} else {
-		len += buf->len;
-		l2cap_rate = ((u64_t)len << 3) * 1000000000 / delta;
-	}
-
-	return 0;
-}
-
-static void l2cap_recv_cb(struct k_work *work)
-{
-	struct l2ch *c = L2CH_WORK(work);
-	struct net_buf *buf;
-
-	while ((buf = net_buf_get(&l2cap_recv_fifo, K_NO_WAIT))) {
-		print(NULL, "Confirming reception\n");
-		bt_l2cap_chan_recv_complete(&c->ch.chan, buf);
-	}
-}
-
-static int l2cap_recv(struct bt_l2cap_chan *chan, struct net_buf *buf)
-{
-	struct l2ch *l2ch = L2CH_CHAN(chan);
-
-	print(NULL, "Incoming data channel %p len %u\n", chan, buf->len);
-
-	if (buf->len) {
-		hexdump(ctx_shell, buf->data, buf->len);
-	}
-
-	if (l2cap_recv_delay) {
-		/* Submit work only if queue is empty */
-		if (k_fifo_is_empty(&l2cap_recv_fifo)) {
-			print(NULL, "Delaying response in %u ms...\n",
-			      l2cap_recv_delay);
-			k_delayed_work_submit(&l2ch->recv_work,
-					      l2cap_recv_delay);
-		}
-		net_buf_put(&l2cap_recv_fifo, buf);
-		return -EINPROGRESS;
-	}
-
-	return 0;
-}
-
-static void l2cap_connected(struct bt_l2cap_chan *chan)
-{
-	struct l2ch *c = L2CH_CHAN(chan);
-
-	k_delayed_work_init(&c->recv_work, l2cap_recv_cb);
-
-	print(NULL, "Channel %p connected\n", chan);
-}
-
-static void l2cap_disconnected(struct bt_l2cap_chan *chan)
-{
-	print(NULL, "Channel %p disconnected\n", chan);
-}
-
-static struct net_buf *l2cap_alloc_buf(struct bt_l2cap_chan *chan)
-{
-	/* print if metrics is disabled */
-	if (chan->ops->recv != l2cap_recv_metrics) {
-		print(NULL, "Channel %p requires buffer\n", chan);
-	}
-
-	return net_buf_alloc(&data_rx_pool, K_FOREVER);
-}
-
-static struct bt_l2cap_chan_ops l2cap_ops = {
-	.alloc_buf	= l2cap_alloc_buf,
-	.recv		= l2cap_recv,
-	.connected	= l2cap_connected,
-	.disconnected	= l2cap_disconnected,
-};
-
-
-static struct l2ch l2ch_chan = {
-	.ch.chan.ops	= &l2cap_ops,
-	.ch.rx.mtu	= DATA_MTU,
-};
-
-static int l2cap_accept(struct bt_conn *conn, struct bt_l2cap_chan **chan)
-{
-	print(NULL, "Incoming conn %p\n", conn);
-
-	if (l2ch_chan.ch.chan.conn) {
-		print(NULL, "No channels available\n");
-		return -ENOMEM;
-	}
-
-	*chan = &l2ch_chan.ch.chan;
-
-	return 0;
-}
-
-static struct bt_l2cap_server server = {
-	.accept		= l2cap_accept,
-};
-
-static void cmd_l2cap_register(const struct shell *shell,
-			      size_t argc, char *argv[])
-{
-
-	if (!shell_cmd_precheck(shell, argc >= 2, NULL, 0)) {
-		return;
-	}
-
-	if (server.psm) {
-		error(shell, "Already registered\n");
-		return;
-	}
-
-	server.psm = strtoul(argv[1], NULL, 16);
-
-	if (argc > 2) {
-		server.sec_level = strtoul(argv[2], NULL, 10);
-	}
-
-	if (bt_l2cap_server_register(&server) < 0) {
-		error(shell, "Unable to register psm\n");
-		server.psm = 0;
-	} else {
-		print(shell, "L2CAP psm %u sec_level %u registered\n",
-		      server.psm, server.sec_level);
-	}
-}
-
-static void cmd_l2cap_connect(const struct shell *shell,
-			     size_t argc, char *argv[])
-{
-	u16_t psm;
-	int err;
-
-	if (!default_conn) {
-		error(shell, "Not connected\n");
-		return;
-	}
-
-	if (!shell_cmd_precheck(shell, argc == 2, NULL, 0)) {
-		return;
-	}
-
-	if (l2ch_chan.ch.chan.conn) {
-		error(shell, "Channel already in use\n");
-		return;
-	}
-
-	psm = strtoul(argv[1], NULL, 16);
-
-	err = bt_l2cap_chan_connect(default_conn, &l2ch_chan.ch.chan, psm);
-	if (err < 0) {
-		error(shell, "Unable to connect to psm %u (err %u)\n", psm,
-		      err);
-	} else {
-		print(shell, "L2CAP connection pending\n");
-	}
-}
-
-static void cmd_l2cap_disconnect(const struct shell *shell,
-				 size_t argc, char *argv[])
-{
-	int err;
-
-	err = bt_l2cap_chan_disconnect(&l2ch_chan.ch.chan);
-	if (err) {
-		print(shell, "Unable to disconnect: %u\n", -err);
-	}
-}
-
-static void cmd_l2cap_send(const struct shell *shell, size_t argc, char *argv[])
-{
-	static u8_t buf_data[DATA_MTU] = { [0 ... (DATA_MTU - 1)] = 0xff };
-	int ret, len, count = 1;
-	struct net_buf *buf;
-
-	if (argc > 1) {
-		count = strtoul(argv[1], NULL, 10);
-	}
-
-	len = min(l2ch_chan.ch.tx.mtu, DATA_MTU - BT_L2CAP_CHAN_SEND_RESERVE);
-
-	while (count--) {
-		buf = net_buf_alloc(&data_tx_pool, K_FOREVER);
-		net_buf_reserve(buf, BT_L2CAP_CHAN_SEND_RESERVE);
-
-		net_buf_add_mem(buf, buf_data, len);
-		ret = bt_l2cap_chan_send(&l2ch_chan.ch.chan, buf);
-		if (ret < 0) {
-			print(shell, "Unable to send: %d\n", -ret);
-			net_buf_unref(buf);
-			break;
-		}
-	}
-}
-
-static void cmd_l2cap_recv(const struct shell *shell, size_t argc, char *argv[])
-{
-	if (argc > 1) {
-		l2cap_recv_delay = strtoul(argv[1], NULL, 10);
-	} else {
-		print(shell, "l2cap receive delay: %u ms\n",
-			     l2cap_recv_delay);
-	}
-}
-
-static void cmd_l2cap_metrics(const struct shell *shell,
-			      size_t argc, char *argv[])
-{
-	const char *action;
-
-	if (argc < 2) {
-		print(shell, "l2cap rate: %u bps.\n", l2cap_rate);
-
-		return;
-	}
-
-	action = argv[1];
-
-	if (!strcmp(action, "on")) {
-		l2cap_ops.recv = l2cap_recv_metrics;
-	} else if (!strcmp(action, "off")) {
-		l2cap_ops.recv = l2cap_recv;
-	} else {
-		shell_help_print(shell, NULL, 0);
-		return;
-	}
-
-	print(shell, "l2cap metrics %s.\n", action);
-}
-
-#endif
-
 #define HELP_NONE "[none]"
 #define HELP_ADDR_LE "<address: XX:XX:XX:XX:XX:XX> <type: (public|random)>"
 
@@ -1602,15 +1334,6 @@ SHELL_CREATE_STATIC_SUBCMD_SET(bt_cmds) {
 	SHELL_CMD(fixed-passkey, NULL, "[passkey]", cmd_fixed_passkey),
 #endif
 #endif /* CONFIG_BT_SMP || CONFIG_BT_BREDR) */
-#if defined(CONFIG_BT_L2CAP_DYNAMIC_CHANNEL)
-	SHELL_CMD(l2cap-register, NULL, "<psm> [sec_level]",
-		  cmd_l2cap_register),
-	SHELL_CMD(l2cap-connect, NULL, "<psm>", cmd_l2cap_connect),
-	SHELL_CMD(l2cap-disconnect, NULL, HELP_NONE, cmd_l2cap_disconnect),
-	SHELL_CMD(l2cap-send, NULL, "<number of packets>", cmd_l2cap_send),
-	SHELL_CMD(l2cap-recv, NULL, "[delay (in miliseconds)", cmd_l2cap_recv),
-	SHELL_CMD(l2cap-metrics, NULL, "<value on, off>", cmd_l2cap_metrics),
-#endif
 #endif /* CONFIG_BT_CONN */
 #if defined(CONFIG_BT_CTLR_ADV_EXT)
 	SHELL_CMD(advx, NULL, "<on off> [coded] [anon] [txp]", cmd_advx),

subsys/bluetooth/shell/bt.h

@@ -24,5 +24,6 @@ extern struct bt_conn *default_conn;
 
 int str2bt_addr(const char *str, bt_addr_t *addr);
 void conn_addr_str(struct bt_conn *conn, char *addr, size_t len);
+void hexdump(const struct shell *shell, const u8_t *data, size_t len);
 
 #endif /* __BT_H */