Merge pull request #8556 from paul-szczepanek-arm/fix-phy-support

Cruz Monrreal · web-flow · commit 1489900162f7 · 2018-10-29T08:46:26.000-05:00
BLE: fix using an optional feature before checking for support
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp
@@ -334,8 +334,12 @@ ble_error_t Gap::set_address_resolution(
 }
 
 ble_error_t Gap::read_phy(connection_handle_t connection) {
-    DmReadPhy(connection);
-    return BLE_ERROR_NONE;
+    if (is_feature_supported(ControllerSupportedFeatures_t::LE_2M_PHY)
+        || is_feature_supported(ControllerSupportedFeatures_t::LE_CODED_PHY)) {
+        DmReadPhy(connection);
+        return BLE_ERROR_NONE;
+    }
+    return BLE_ERROR_NOT_IMPLEMENTED;
 }
 
 ble_error_t Gap::set_preferred_phys(

Original file line number	Diff line number	Diff line change
`@@ -334,8 +334,12 @@ ble_error_t Gap::set_address_resolution(`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`ble_error_t Gap::read_phy(connection_handle_t connection) {`
`337`		`- DmReadPhy(connection);`
`338`		`- return BLE_ERROR_NONE;`
	`337`	`+ if (is_feature_supported(ControllerSupportedFeatures_t::LE_2M_PHY)`
	`338`	`+ \|\| is_feature_supported(ControllerSupportedFeatures_t::LE_CODED_PHY)) {`
	`339`	`+ DmReadPhy(connection);`
	`340`	`+ return BLE_ERROR_NONE;`
	`341`	`+ }`
	`342`	`+ return BLE_ERROR_NOT_IMPLEMENTED;`
`339`	`343`	`}`
`340`	`344`
`341`	`345`	`ble_error_t Gap::set_preferred_phys(`