michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: EDTT: Remove ncmd and opcode from EDTT command response

Browse source 
Encode all types of EDTT command response with similar structure to how
it is generated from command complete when it is generated from the
command status.
This structure will be:
2 byte EDTT command response code
2 byte EDTT length field
1 byte HCI status
N bytes of command output parameters

Signed-off-by: Joakim Andersson <joakim.andersson@nordicsemi.no>
This commit is contained in:
Joakim Andersson 2020-02-16 09:30:34 +01:00 • committed by Johan Hedberg
commit b5c02d0649
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/bluetooth/bsim_bt/edtt_ble_test_app/hci_test_app/src/main.c
View file

@ -184,9 +184,13 @@ static void command_complete(struct net_buf *buf)
struct bt_hci_evt_cmd_complete *evt = (void *)buf->data;
u16_t opcode = sys_le16_to_cpu(evt->opcode);
u16_t response = sys_cpu_to_le16(waiting_response);
struct net_buf_simple_state state;
u16_t size;
net_buf_simple_save(&buf->b, &state);
net_buf_pull(buf, sizeof(*evt));
u16_t size = sys_cpu_to_le16(buf->len);
size = sys_cpu_to_le16(buf->len);
if (opcode == waiting_opcode) {
LOG_DBG("Command complete for 0x%04x", waiting_opcode);
@ -199,6 +203,8 @@ static void command_complete(struct net_buf *buf)
LOG_WRN("Not waiting for 0x(%04x) command status,"
" expected 0x(%04x)", opcode, waiting_opcode);
}
net_buf_simple_restore(&buf->b, &state);
}
/**
@ -209,19 +215,29 @@ static void command_status(struct net_buf *buf)
struct bt_hci_evt_cmd_status *evt = (void *)buf->data;
u16_t opcode = sys_le16_to_cpu(evt->opcode);
u16_t response = sys_cpu_to_le16(waiting_response);
u16_t size = sys_cpu_to_le16(buf->len);
struct net_buf_simple_state state;
u8_t status = evt->status;
u16_t size;
net_buf_simple_save(&buf->b, &state);
net_buf_pull(buf, sizeof(*evt));
size = sys_cpu_to_le16(buf->len) + 1;
if (opcode == waiting_opcode) {
LOG_DBG("Command status for 0x%04x", waiting_opcode);
edtt_write((u8_t *)&response, sizeof(response), EDTTT_BLOCK);
edtt_write((u8_t *)&size, sizeof(size), EDTTT_BLOCK);
edtt_write((u8_t *)&status, sizeof(status), EDTTT_BLOCK);
edtt_write((u8_t *)buf->data, buf->len, EDTTT_BLOCK);
waiting_opcode = 0;
} else {
LOG_WRN("Not waiting for 0x(%04x) command status,"
" expected 0x(%04x)", opcode, waiting_opcode);
}
net_buf_simple_restore(&buf->b, &state);
}
/**