Skip to content

Commit

Permalink
Bluetooth: Remove unnecessary HCI command data array
Browse files Browse the repository at this point in the history
This array was created because more than 4 bytes were needed, however
now the minimum is 8 bytes, so we can use the net_buf user data
directly.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
  • Loading branch information
jhedberg committed Jun 19, 2019
1 parent 17cd196 commit a16d513
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions subsys/bluetooth/host/hci_core.c
Expand Up @@ -101,6 +101,9 @@ static size_t discovery_results_count;
#endif /* CONFIG_BT_BREDR */

struct cmd_data {
/** BT_BUF_CMD */
u8_t type;

/** HCI status of the command completion */
u8_t status;

Expand All @@ -122,9 +125,7 @@ struct acl_data {
u16_t handle;
};

static struct cmd_data cmd_data[CONFIG_BT_HCI_CMD_COUNT];

#define cmd(buf) (&cmd_data[net_buf_id(buf)])
#define cmd(buf) ((struct cmd_data *)net_buf_user_data(buf))
#define acl(buf) ((struct acl_data *)net_buf_user_data(buf))

/* HCI command buffers. Derive the needed size from BT_BUF_RX_SIZE since
Expand Down Expand Up @@ -246,8 +247,7 @@ struct net_buf *bt_hci_cmd_create(u16_t opcode, u8_t param_len)

net_buf_reserve(buf, CONFIG_BT_HCI_RESERVE);

bt_buf_set_type(buf, BT_BUF_CMD);

cmd(buf)->type = BT_BUF_CMD;
cmd(buf)->opcode = opcode;
cmd(buf)->sync = NULL;

Expand Down

0 comments on commit a16d513

Please sign in to comment.