Skip to content

Commit 96b4871

Browse files
Thalleykartben
authored andcommitted
Bluetooth: ISO: Removed unused pool and funcs/macros
The iso_tx_pool was unused because all the functions and macros that used it were unused. Signed-off-by: Emil Gydesen <[email protected]>
1 parent 2ff984a commit 96b4871

File tree

2 files changed

+0
-69
lines changed

2 files changed

+0
-69
lines changed

subsys/bluetooth/host/iso.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,6 @@ static struct bt_iso_recv_info iso_info_data[CONFIG_BT_ISO_RX_BUF_COUNT];
5858
#define iso_info(buf) (&iso_info_data[net_buf_id(buf)])
5959
#endif /* CONFIG_BT_ISO_RX */
6060

61-
#if defined(CONFIG_BT_ISO_UNICAST) || defined(CONFIG_BT_ISO_BROADCAST)
62-
NET_BUF_POOL_FIXED_DEFINE(iso_tx_pool, CONFIG_BT_ISO_TX_BUF_COUNT,
63-
BT_ISO_SDU_BUF_SIZE(CONFIG_BT_ISO_TX_MTU),
64-
CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL);
65-
66-
#endif /* CONFIG_BT_ISO_UNICAST || CONFIG_BT_ISO_BROADCAST */
67-
6861
struct bt_conn iso_conns[CONFIG_BT_ISO_MAX_CHAN];
6962

7063
/* TODO: Allow more than one server? */
@@ -183,27 +176,6 @@ static struct bt_conn *iso_new(void)
183176
return iso;
184177
}
185178

186-
#if defined(CONFIG_NET_BUF_LOG)
187-
struct net_buf *bt_iso_create_pdu_timeout_debug(struct net_buf_pool *pool, size_t reserve,
188-
k_timeout_t timeout, const char *func, int line)
189-
#else
190-
struct net_buf *bt_iso_create_pdu_timeout(struct net_buf_pool *pool, size_t reserve,
191-
k_timeout_t timeout)
192-
#endif
193-
{
194-
if (!pool) {
195-
pool = &iso_tx_pool;
196-
}
197-
198-
reserve += sizeof(struct bt_hci_iso_sdu_hdr);
199-
200-
#if defined(CONFIG_NET_BUF_LOG)
201-
return bt_conn_create_pdu_timeout_debug(pool, reserve, timeout, func, line);
202-
#else
203-
return bt_conn_create_pdu_timeout(pool, reserve, timeout);
204-
#endif
205-
}
206-
207179
static int hci_le_setup_iso_data_path(const struct bt_conn *iso, uint8_t dir,
208180
const struct bt_iso_chan_path *path)
209181
{

subsys/bluetooth/host/iso_internal.h

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -114,47 +114,6 @@ void bt_iso_disconnected(struct bt_conn *iso);
114114
/* Notify ISO connected channels of security changed */
115115
void bt_iso_security_changed(struct bt_conn *acl, uint8_t hci_status);
116116

117-
/* Allocate ISO PDU */
118-
#if defined(CONFIG_NET_BUF_LOG)
119-
struct net_buf *bt_iso_create_pdu_timeout_debug(struct net_buf_pool *pool,
120-
size_t reserve,
121-
k_timeout_t timeout,
122-
const char *func, int line);
123-
#define bt_iso_create_pdu_timeout(_pool, _reserve, _timeout) \
124-
bt_iso_create_pdu_timeout_debug(_pool, _reserve, _timeout, \
125-
__func__, __LINE__)
126-
127-
#define bt_iso_create_pdu(_pool, _reserve) \
128-
bt_iso_create_pdu_timeout_debug(_pool, _reserve, K_FOREVER, \
129-
__func__, __LINE__)
130-
#else
131-
struct net_buf *bt_iso_create_pdu_timeout(struct net_buf_pool *pool,
132-
size_t reserve, k_timeout_t timeout);
133-
134-
#define bt_iso_create_pdu(_pool, _reserve) \
135-
bt_iso_create_pdu_timeout(_pool, _reserve, K_FOREVER)
136-
#endif
137-
138-
/* Allocate ISO Fragment */
139-
#if defined(CONFIG_NET_BUF_LOG)
140-
struct net_buf *bt_iso_create_frag_timeout_debug(size_t reserve,
141-
k_timeout_t timeout,
142-
const char *func, int line);
143-
144-
#define bt_iso_create_frag_timeout(_reserve, _timeout) \
145-
bt_iso_create_frag_timeout_debug(_reserve, _timeout, \
146-
__func__, __LINE__)
147-
148-
#define bt_iso_create_frag(_reserve) \
149-
bt_iso_create_frag_timeout_debug(_reserve, K_FOREVER, \
150-
__func__, __LINE__)
151-
#else
152-
struct net_buf *bt_iso_create_frag_timeout(size_t reserve, k_timeout_t timeout);
153-
154-
#define bt_iso_create_frag(_reserve) \
155-
bt_iso_create_frag_timeout(_reserve, K_FOREVER)
156-
#endif
157-
158117
#if defined(CONFIG_BT_ISO_LOG_LEVEL_DBG)
159118
void bt_iso_chan_set_state_debug(struct bt_iso_chan *chan,
160119
enum bt_iso_state state,

0 commit comments

Comments
 (0)