2021-08-16 14:31:41

by Mariusz Skamra

Subject: [PATCH 1/2] monitor: Fix Maximum PDU type in CIS Test Param

From: Mariusz Skamra <[email protected]>

The Maximum PDU in CIS Test parameters is 2 byte value.
---
monitor/bt.h | 4 ++--
monitor/packet.c | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/monitor/bt.h b/monitor/bt.h
index 738bc294b..0bc5718a0 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
@@ -2681,8 +2681,8 @@ struct bt_hci_cis_params_test {
uint8_t nse;
uint16_t m_sdu;
uint16_t s_sdu;
- uint8_t m_pdu;
- uint8_t s_pdu;
+ uint16_t m_pdu;
+ uint16_t s_pdu;
uint8_t m_phy;
uint8_t s_phy;
uint8_t m_bn;
diff --git a/monitor/packet.c b/monitor/packet.c
index 025b7e9b0..210c03259 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -8063,12 +8063,14 @@ static void print_cis_params_test(const void *data, int i)

print_field("CIS ID: 0x%2.2x", cis->cis_id);
print_field("NSE: 0x%2.2x", cis->nse);
- print_field("Master to Slave Maximum SDU: 0x%4.4x", cis->m_sdu);
+ print_field("Master to Slave Maximum SDU: 0x%4.4x",
+ le16_to_cpu(cis->m_sdu));
print_field("Slave to Master Maximum SDU: 0x%4.4x",
le16_to_cpu(cis->s_sdu));
- print_field("Master to Slave Maximum PDU: 0x%2.2x",
+ print_field("Master to Slave Maximum PDU: 0x%4.4x",
le16_to_cpu(cis->m_pdu));
- print_field("Slave to Master Maximum PDU: 0x%2.2x", cis->s_pdu);
+ print_field("Slave to Master Maximum PDU: 0x%4.4x",
+ le16_to_cpu(cis->s_pdu));
print_le_phy("Master to Slave PHY", cis->m_phy);
print_le_phy("Slave to Master PHY", cis->s_phy);
print_field("Master to Slave Burst Number: 0x%2.2x", cis->m_bn);
--
2.31.1

2021-08-16 14:31:41

by Mariusz Skamra

Subject: [PATCH 2/2] monitor: Fix logging of CIG Test SDU Interval param

From: Mariusz Skamra <[email protected]>

This fixes log of SDU interval in StoM direction.
---
monitor/packet.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/monitor/packet.c b/monitor/packet.c
index 210c03259..74d9a87a3 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -8083,7 +8083,7 @@ static void le_set_cig_params_test_cmd(const void *data, uint8_t size)

print_field("CIG ID: 0x%2.2x", cmd->cig_id);
print_usec_interval("Master to Slave SDU Interval", cmd->m_interval);
- print_usec_interval("Master to Slave SDU Interval", cmd->s_interval);
+ print_usec_interval("Slave to Master SDU Interval", cmd->s_interval);
print_field("Master to Slave Flush Timeout: 0x%2.2x", cmd->m_ft);
print_field("Slave to Master Flush Timeout: 0x%2.2x", cmd->s_ft);
print_field("ISO Interval: %.2f ms (0x%4.4x)",
--
2.31.1