Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

system-bt: Commit

system/bt


Commit MetaInfo

Revision4276bf0242c5ec1022ae6c9e87f19554ab915b3f (tree)
Time2018-06-12 15:32:03
AuthorChih-Wei Huang <cwhuang@linu...>
CommiterChih-Wei Huang

Log Message

Avoid annoying crashing on VMware

Change Summary

Incremental Difference

--- a/device/src/controller.cc
+++ b/device/src/controller.cc
@@ -307,13 +307,11 @@ static uint8_t* get_local_supported_codecs(uint8_t* number_of_codecs) {
307307
308308 static const bt_device_features_t* get_features_ble(void) {
309309 CHECK(readable);
310- CHECK(ble_supported);
311310 return &features_ble;
312311 }
313312
314313 static const uint8_t* get_ble_supported_states(void) {
315314 CHECK(readable);
316- CHECK(ble_supported);
317315 return ble_supported_states;
318316 }
319317
@@ -374,50 +372,42 @@ static bool supports_ble(void) {
374372
375373 static bool supports_ble_privacy(void) {
376374 CHECK(readable);
377- CHECK(ble_supported);
378375 return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array);
379376 }
380377
381378 static bool supports_ble_set_privacy_mode() {
382379 CHECK(readable);
383- CHECK(ble_supported);
384380 return HCI_LE_ENHANCED_PRIVACY_SUPPORTED(features_ble.as_array) &&
385381 HCI_LE_SET_PRIVACY_MODE_SUPPORTED(supported_commands);
386382 }
387383
388384 static bool supports_ble_packet_extension(void) {
389385 CHECK(readable);
390- CHECK(ble_supported);
391386 return HCI_LE_DATA_LEN_EXT_SUPPORTED(features_ble.as_array);
392387 }
393388
394389 static bool supports_ble_connection_parameters_request(void) {
395390 CHECK(readable);
396- CHECK(ble_supported);
397391 return HCI_LE_CONN_PARAM_REQ_SUPPORTED(features_ble.as_array);
398392 }
399393
400394 static bool supports_ble_2m_phy(void) {
401395 CHECK(readable);
402- CHECK(ble_supported);
403396 return HCI_LE_2M_PHY_SUPPORTED(features_ble.as_array);
404397 }
405398
406399 static bool supports_ble_coded_phy(void) {
407400 CHECK(readable);
408- CHECK(ble_supported);
409401 return HCI_LE_CODED_PHY_SUPPORTED(features_ble.as_array);
410402 }
411403
412404 static bool supports_ble_extended_advertising(void) {
413405 CHECK(readable);
414- CHECK(ble_supported);
415406 return HCI_LE_EXTENDED_ADVERTISING_SUPPORTED(features_ble.as_array);
416407 }
417408
418409 static bool supports_ble_periodic_advertising(void) {
419410 CHECK(readable);
420- CHECK(ble_supported);
421411 return HCI_LE_PERIODIC_ADVERTISING_SUPPORTED(features_ble.as_array);
422412 }
423413
@@ -428,7 +418,6 @@ static uint16_t get_acl_data_size_classic(void) {
428418
429419 static uint16_t get_acl_data_size_ble(void) {
430420 CHECK(readable);
431- CHECK(ble_supported);
432421 return acl_data_size_ble;
433422 }
434423
@@ -444,19 +433,16 @@ static uint16_t get_acl_packet_size_ble(void) {
444433
445434 static uint16_t get_ble_suggested_default_data_length(void) {
446435 CHECK(readable);
447- CHECK(ble_supported);
448436 return ble_suggested_default_data_length;
449437 }
450438
451439 static uint16_t get_ble_maxium_advertising_data_length(void) {
452440 CHECK(readable);
453- CHECK(ble_supported);
454441 return ble_maxium_advertising_data_length;
455442 }
456443
457444 static uint8_t get_ble_number_of_supported_advertising_sets(void) {
458445 CHECK(readable);
459- CHECK(ble_supported);
460446 return ble_number_of_supported_advertising_sets;
461447 }
462448
@@ -467,19 +453,16 @@ static uint16_t get_acl_buffer_count_classic(void) {
467453
468454 static uint8_t get_acl_buffer_count_ble(void) {
469455 CHECK(readable);
470- CHECK(ble_supported);
471456 return acl_buffer_count_ble;
472457 }
473458
474459 static uint8_t get_ble_white_list_size(void) {
475460 CHECK(readable);
476- CHECK(ble_supported);
477461 return ble_white_list_size;
478462 }
479463
480464 static uint8_t get_ble_resolving_list_max_size(void) {
481465 CHECK(readable);
482- CHECK(ble_supported);
483466 return ble_resolving_list_max_size;
484467 }
485468
@@ -489,7 +472,6 @@ static void set_ble_resolving_list_max_size(int resolving_list_max_size) {
489472 if (resolving_list_max_size != 0) {
490473 CHECK(readable);
491474 }
492- CHECK(ble_supported);
493475 ble_resolving_list_max_size = resolving_list_max_size;
494476 }
495477
Show on old repository browser