tests: Bluetooth: BSIM: Store last sent opcode for BT tester

The BT Tester will not provide the opcode in the case of a
BTP error. To help log this for developers, we store the
opcode of the currently outstanding command, so that we can
log it.

Signed-off-by: Emil Gydesen <[email protected]>

Author: Thalley

tests/bsim/bluetooth/tester/src/bsim_btp.c

@@ -15,6 +15,8 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/net_buf.h>
+#include <zephyr/sys/atomic.h>
+#include <zephyr/sys/atomic_types.h>
 #include <zephyr/sys/byteorder.h>
 #include <zephyr/sys/util.h>
 #include <zephyr/sys_clock.h>
@@ -31,6 +33,7 @@ K_FIFO_DEFINE(btp_evt_fifo);
 NET_BUF_POOL_FIXED_DEFINE(btp_evt_pool, 100, BTP_MTU, 0, NULL);
 
 static const struct device *const dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console));
+static atomic_val_t last_send_opcode;
 
 static bool is_valid_core_packet_len(const struct btp_hdr *hdr, struct net_buf_simple *buf_simple)
 {
@@ -1854,8 +1857,8 @@ static bool recv_cb(uint8_t buf[], size_t buf_len)
 
 	TEST_ASSERT(is_valid_packet_len(buf, buf_len),
 		    "Header len %u does not match expected packet length for "
-		    "service 0x%02X and opcode 0x%02X",
-		    hdr->len, hdr->service, hdr->opcode);
+		    "service 0x%02X and opcode 0x%02X (last sent opcode 0x%02X)",
+		    hdr->len, hdr->service, hdr->opcode, (uint8_t)atomic_get(&last_send_opcode));
 
 	if (hdr->opcode < BTP_EVENT_OPCODE) {
 		struct net_buf *net_buf = net_buf_alloc(&btp_rsp_pool, K_NO_WAIT);
@@ -1940,10 +1943,13 @@ void bsim_btp_send_to_tester(const uint8_t *data, size_t len)
 
 	cmd_hdr = (const struct btp_hdr *)data;
 	LOG_DBG("cmd service 0x%02X and opcode 0x%02X", cmd_hdr->service, cmd_hdr->opcode);
+	atomic_set(&last_send_opcode, cmd_hdr->opcode);
 
 	for (size_t i = 0U; i < len; i++) {
 		uart_poll_out(dev, data[i]);
 	}
 
 	wait_for_response(cmd_hdr);
+
+	atomic_clear(&last_send_opcode);
 }