OSDN Git Service
(root)
/
android-x86
/
system-bt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4b179b8
)
Avoid annoying crashing on VMware
author
Chih-Wei Huang
<cwhuang@linux.org.tw>
Tue, 12 Jun 2018 06:32:03 +0000
(14:32 +0800)
committer
Chih-Wei Huang
<cwhuang@linux.org.tw>
Thu, 14 Nov 2019 04:21:27 +0000
(12:21 +0800)
device/src/controller.cc
patch
|
blob
|
history
diff --git
a/device/src/controller.cc
b/device/src/controller.cc
index
02a3998
..
a7a807b
100644
(file)
--- a/
device/src/controller.cc
+++ b/
device/src/controller.cc
@@
-322,13
+322,11
@@
static uint8_t* get_local_supported_codecs(uint8_t* number_of_codecs) {
static const bt_device_features_t* get_features_ble(void) {
CHECK(readable);
static const bt_device_features_t* get_features_ble(void) {
CHECK(readable);
- CHECK(ble_supported);
return &features_ble;
}
static const uint8_t* get_ble_supported_states(void) {
CHECK(readable);
return &features_ble;
}
static const uint8_t* get_ble_supported_states(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_supported_states;
}
return ble_supported_states;
}
@@
-389,50
+387,42
@@
static bool supports_ble(void) {
static bool supports_ble_privacy(void) {
CHECK(readable);
static bool supports_ble_privacy(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_set_privacy_mode() {
CHECK(readable);
return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_set_privacy_mode() {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array) &&
HCI_LE_SET_PRIVACY_MODE_SUPPORTED(supported_commands);
}
static bool supports_ble_packet_extension(void) {
CHECK(readable);
return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array) &&
HCI_LE_SET_PRIVACY_MODE_SUPPORTED(supported_commands);
}
static bool supports_ble_packet_extension(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_DATA_LEN_EXT_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_connection_parameters_request(void) {
CHECK(readable);
return HCI_LE_DATA_LEN_EXT_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_connection_parameters_request(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_CONN_PARAM_REQ_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_2m_phy(void) {
CHECK(readable);
return HCI_LE_CONN_PARAM_REQ_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_2m_phy(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_2M_PHY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_coded_phy(void) {
CHECK(readable);
return HCI_LE_2M_PHY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_coded_phy(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_CODED_PHY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_extended_advertising(void) {
CHECK(readable);
return HCI_LE_CODED_PHY_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_extended_advertising(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_EXTENDED_ADVERTISING_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_periodic_advertising(void) {
CHECK(readable);
return HCI_LE_EXTENDED_ADVERTISING_SUPPORTED(features_ble.as_array);
}
static bool supports_ble_periodic_advertising(void) {
CHECK(readable);
- CHECK(ble_supported);
return HCI_LE_PERIODIC_ADVERTISING_SUPPORTED(features_ble.as_array);
}
return HCI_LE_PERIODIC_ADVERTISING_SUPPORTED(features_ble.as_array);
}
@@
-443,7
+433,6
@@
static uint16_t get_acl_data_size_classic(void) {
static uint16_t get_acl_data_size_ble(void) {
CHECK(readable);
static uint16_t get_acl_data_size_ble(void) {
CHECK(readable);
- CHECK(ble_supported);
return acl_data_size_ble;
}
return acl_data_size_ble;
}
@@
-459,7
+448,6
@@
static uint16_t get_acl_packet_size_ble(void) {
static uint16_t get_ble_suggested_default_data_length(void) {
CHECK(readable);
static uint16_t get_ble_suggested_default_data_length(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_suggested_default_data_length;
}
return ble_suggested_default_data_length;
}
@@
-471,13
+459,11
@@
static uint16_t get_ble_maximum_tx_data_length(void) {
static uint16_t get_ble_maxium_advertising_data_length(void) {
CHECK(readable);
static uint16_t get_ble_maxium_advertising_data_length(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_maxium_advertising_data_length;
}
static uint8_t get_ble_number_of_supported_advertising_sets(void) {
CHECK(readable);
return ble_maxium_advertising_data_length;
}
static uint8_t get_ble_number_of_supported_advertising_sets(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_number_of_supported_advertising_sets;
}
return ble_number_of_supported_advertising_sets;
}
@@
-488,19
+474,16
@@
static uint16_t get_acl_buffer_count_classic(void) {
static uint8_t get_acl_buffer_count_ble(void) {
CHECK(readable);
static uint8_t get_acl_buffer_count_ble(void) {
CHECK(readable);
- CHECK(ble_supported);
return acl_buffer_count_ble;
}
static uint8_t get_ble_white_list_size(void) {
CHECK(readable);
return acl_buffer_count_ble;
}
static uint8_t get_ble_white_list_size(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_white_list_size;
}
static uint8_t get_ble_resolving_list_max_size(void) {
CHECK(readable);
return ble_white_list_size;
}
static uint8_t get_ble_resolving_list_max_size(void) {
CHECK(readable);
- CHECK(ble_supported);
return ble_resolving_list_max_size;
}
return ble_resolving_list_max_size;
}
@@
-510,7
+493,6
@@
static void set_ble_resolving_list_max_size(int resolving_list_max_size) {
if (resolving_list_max_size != 0) {
CHECK(readable);
}
if (resolving_list_max_size != 0) {
CHECK(readable);
}
- CHECK(ble_supported);
ble_resolving_list_max_size = resolving_list_max_size;
}
ble_resolving_list_max_size = resolving_list_max_size;
}