From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
This fixes the following tests now that all supported PHYs are enabled
by default:
Start Discovery LE - (Ext Scan Param) Failed
Get PHY Success Failed
Set PHY 1m 2m coded Succcess Timed out
---
tools/mgmt-tester.c | 49 ++++++++++++++++++---------------------------
1 file changed, 19 insertions(+), 30 deletions(-)
diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index c0784dab5b64..b819bccbc7c0 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -9445,7 +9445,7 @@ static const struct generic_data add_ext_advertising_conn_off_1m = {
static const uint8_t get_phy_param[] = {
0xff, 0x7f, 0x00, 0x00, /* All PHYs */
0xfe, 0x79, 0x00, 0x00, /* All PHYs except BR 1M 1SLOT, LE 1M TX & LE 1M RX */
- 0xff, 0x07, 0x00, 0x00, /* All BREDR PHYs and LE 1M TX & LE 1M RX */
+ 0xff, 0x7f, 0x00, 0x00, /* All PHYs */
};
static const struct generic_data get_phy_success = {
@@ -9508,26 +9508,6 @@ static const uint8_t set_phy_all_param[] = {
0xff, 0x7f, 0x00, 0x00 /* All PHYs */
};
-static const uint8_t set_default_phy_all_param[] = {
- 0x00, /* preference is there for tx and rx */
- 0x07, /* 1m 2m coded tx */
- 0x07, /* 1m 2m coded rx */
-};
-
-static const struct generic_data set_phy_all_success = {
- .setup_settings = settings_powered_le,
- .send_opcode = MGMT_OP_SET_PHY_CONFIGURATION,
- .send_param = set_phy_all_param,
- .send_len = sizeof(set_phy_all_param),
- .expect_status = MGMT_STATUS_SUCCESS,
- .expect_hci_command = BT_HCI_CMD_LE_SET_DEFAULT_PHY,
- .expect_hci_param = set_default_phy_all_param,
- .expect_hci_len = sizeof(set_default_phy_all_param),
- .expect_alt_ev = MGMT_EV_PHY_CONFIGURATION_CHANGED,
- .expect_alt_ev_param = set_phy_all_param,
- .expect_alt_ev_len = sizeof(set_phy_all_param),
-};
-
static const uint8_t set_phy_2m_tx_param[] = {
0xff, 0x0f, 0x00, 0x00 /* 1mtxrx, 2m tx */
};
@@ -9635,10 +9615,13 @@ static const struct generic_data start_discovery_le_ext_scan_enable = {
.expect_alt_ev_len = sizeof(start_discovery_le_evt),
};
-static const char start_discovery_valid_ext_scan_param[] = {
+static const char start_discovery_ext_scan_param[] = {
0x01, /* Own Addr type*/
0x00, /* Scan filter policy*/
- 0x01, /*Phys - 1m */
+ 0x05, /* Phys - 1m and Coded*/
+ 0x01, /* Type */
+ 0x12, 0x00, /* Interval */
+ 0x12, 0x00, /* Window */
0x01, /* Type */
0x12, 0x00, /* Interval */
0x12, 0x00, /* Window */
@@ -9653,8 +9636,8 @@ static const struct generic_data start_discovery_le_ext_scan_param = {
.expect_param = start_discovery_le_param,
.expect_len = sizeof(start_discovery_le_param),
.expect_hci_command = BT_HCI_CMD_LE_SET_EXT_SCAN_PARAMS,
- .expect_hci_param = start_discovery_valid_ext_scan_param,
- .expect_hci_len = sizeof(start_discovery_valid_ext_scan_param),
+ .expect_hci_param = start_discovery_ext_scan_param,
+ .expect_hci_len = sizeof(start_discovery_ext_scan_param),
.expect_alt_ev = MGMT_EV_DISCOVERING,
.expect_alt_ev_param = start_discovery_le_evt,
.expect_alt_ev_len = sizeof(start_discovery_le_evt),
@@ -9686,6 +9669,15 @@ static const struct generic_data stop_discovery_le_ext_scan_disable = {
.expect_alt_ev_len = sizeof(stop_discovery_evt),
};
+static const char start_discovery_2m_ext_scan_param[] = {
+ 0x01, /* Own Addr type*/
+ 0x00, /* Scan filter policy*/
+ 0x01, /* Phys - 1m and Coded*/
+ 0x01, /* Type */
+ 0x12, 0x00, /* Interval */
+ 0x12, 0x00, /* Window */
+};
+
static const struct generic_data start_discovery_le_2m_scan_param = {
.setup_settings = settings_powered_le,
.setup_send_opcode = MGMT_OP_SET_PHY_CONFIGURATION,
@@ -9698,8 +9690,8 @@ static const struct generic_data start_discovery_le_2m_scan_param = {
.expect_param = start_discovery_bredrle_param,
.expect_len = sizeof(start_discovery_bredrle_param),
.expect_hci_command = BT_HCI_CMD_LE_SET_EXT_SCAN_PARAMS,
- .expect_hci_param = start_discovery_valid_ext_scan_param,
- .expect_hci_len = sizeof(start_discovery_valid_ext_scan_param),
+ .expect_hci_param = start_discovery_2m_ext_scan_param,
+ .expect_hci_len = sizeof(start_discovery_2m_ext_scan_param),
.expect_alt_ev = MGMT_EV_DISCOVERING,
.expect_alt_ev_param = start_discovery_evt,
.expect_alt_ev_len = sizeof(start_discovery_evt),
@@ -14167,9 +14159,6 @@ int main(int argc, char *argv[])
test_bredrle50("Set PHY coded Succcess", &set_phy_coded_success,
NULL, test_command_generic);
- test_bredrle50("Set PHY 1m 2m coded Succcess", &set_phy_all_success,
- NULL, test_command_generic);
-
test_bredrle50("Set PHY 2m tx success", &set_phy_2m_tx_success,
NULL, test_command_generic);
--
2.39.2
