提交: 82728056c74840845a156b440fd4873ad534bb01 - system-bt (git)

system/bt

Commit MetaInfo

• 修订版: 82728056c74840845a156b440fd4873ad534bb01 (tree)
• 时间: 2016-11-15 10:08:00
• 作者: Jaap Jan Meijer <jjmeijer88@gmai...>
• Commiter: Jaap Jan Meijer

Log Message

Do not read BLE vendor capability to restore AOSP behaviour

This makes it possible to support multiple device types. Otherwise devices
that do not support this command will cause enabling BT to time out.

This is a combination of 2 commits.

Revert "BT: Fix up device not turning on due to BLE command"

This reverts commit 1a2f814383ffde3cc77e8dbd5d4fa675d1211d04.

Revert "Bluetooth: Read BLE vendor capability to proceed on Secure conn"

This reverts commit e787d761ab50bae45c15a0c74bf9a43f44e7076c.

Conflicts:
hci/src/hci_layer.c

Change-Id: I71584f538ffe0aee506212ba0a4507586d6964c6

更改概述

• modified: device/include/controller.h
• modified: device/src/controller.c
• modified: hci/include/hci_packet_factory.h
• modified: hci/include/hci_packet_parser.h
• modified: hci/src/hci_layer.c
• modified: hci/src/hci_packet_factory.c
• modified: hci/src/hci_packet_parser.c

差异

--- a/device/include/controller.h
+++ b/device/include/controller.h
@@ -80,7 +80,6 @@ typedef struct controller_t {
   uint8_t (*get_ble_resolving_list_max_size)(void);
   void (*set_ble_resolving_list_max_size)(int resolving_list_max_size);
   uint8_t *(*get_local_supported_codecs)(uint8_t *number_of_codecs);
-  bool (*supports_ble_offload_features)(void);
 } controller_t;
 
 const controller_static_t *controller_get_static_interface();

--- a/device/src/controller.c
+++ b/device/src/controller.c
@@ -78,7 +78,6 @@ static uint8_t number_of_local_supported_codecs = 0;
 
 static bool readable;
 static bool ble_supported;
-static bool ble_offload_features_supported;
 static bool simple_pairing_supported;
 static bool secure_connections_supported;
 
@@ -205,18 +204,12 @@ static future_t *start_up(void) {
 
     page_number++;
   }
-#if (BLE_INCLUDED == TRUE)
-  // read BLE offload features support from controller
-  response = AWAIT_COMMAND(packet_factory->make_ble_read_offload_features_support());
-  packet_parser->parse_ble_read_offload_features_response(response, &ble_offload_features_supported);
-#endif
+
 #if (SC_MODE_INCLUDED == TRUE)
-  if(ble_offload_features_supported) {
-    secure_connections_supported = HCI_SC_CTRLR_SUPPORTED(features_classic[2].as_array);
-    if (secure_connections_supported) {
-      response = AWAIT_COMMAND(packet_factory->make_write_secure_connections_host_support(HCI_SC_MODE_ENABLED));
-      packet_parser->parse_generic_command_complete(response);
-    }
+  secure_connections_supported = HCI_SC_CTRLR_SUPPORTED(features_classic[2].as_array);
+  if (secure_connections_supported) {
+    response = AWAIT_COMMAND(packet_factory->make_write_secure_connections_host_support(HCI_SC_MODE_ENABLED));
+    packet_parser->parse_generic_command_complete(response);
   }
 #endif
 
@@ -430,12 +423,6 @@ static bool supports_ble_connection_parameters_request(void) {
   return HCI_LE_CONN_PARAM_REQ_SUPPORTED(features_ble.as_array);
 }
 
-static bool supports_ble_offload_features(void) {
-  assert(readable);
-  assert(ble_supported);
-  return ble_offload_features_supported;
-}
-
 static uint16_t get_acl_data_size_classic(void) {
   assert(readable);
   return acl_data_size_classic;
@@ -540,8 +527,7 @@ static const controller_t interface = {
 
   get_ble_resolving_list_max_size,
   set_ble_resolving_list_max_size,
-  get_local_supported_codecs,
-  supports_ble_offload_features
+  get_local_supported_codecs
 };
 
 const controller_static_t *controller_get_static_interface() {

--- a/hci/include/hci_packet_factory.h
+++ b/hci/include/hci_packet_factory.h
@@ -41,7 +41,6 @@ typedef struct {
   BT_HDR *(*make_ble_read_suggested_default_data_length)(void);
   BT_HDR *(*make_ble_set_event_mask)(const bt_event_mask_t *event_mask);
   BT_HDR *(*make_read_local_supported_codecs)(void);
-  BT_HDR *(*make_ble_read_offload_features_support)(void);
 } hci_packet_factory_t;
 
 const hci_packet_factory_t *hci_packet_factory_get_interface();

--- a/hci/include/hci_packet_parser.h
+++ b/hci/include/hci_packet_parser.h
@@ -96,10 +96,6 @@ typedef struct {
     BT_HDR *response,
     uint8_t *number_of_local_supported_codecs, uint8_t *local_supported_codecs);
 
-  void (*parse_ble_read_offload_features_response)(
-    BT_HDR *response,
-    bool *ble_offload_features_supported);
-
 } hci_packet_parser_t;
 
 const hci_packet_parser_t *hci_packet_parser_get_interface();

--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -903,26 +903,6 @@ static waiting_command_t *get_waiting_command(command_opcode_t opcode) {
     pthread_mutex_unlock(&commands_pending_response_lock);
     return wait_entry;
   }
-  // look for any command complete with improper VS Opcode
-  for (const list_node_t *node = list_begin(commands_pending_response);
-      node != list_end(commands_pending_response);
-      node = list_next(node)) {
-    waiting_command_t *wait_entry = list_node(node);
-
-    if (wait_entry && (wait_entry->opcode != opcode) &&
-        (((wait_entry->opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC) &&
-        ((opcode & HCI_GRP_VENDOR_SPECIFIC) == HCI_GRP_VENDOR_SPECIFIC))) {
-        LOG_DEBUG("%s VS event found treat it as valid 0x%x", __func__, opcode);
-    }
-    else {
-        continue;
-    }
-
-    list_remove(commands_pending_response, wait_entry);
-
-    pthread_mutex_unlock(&commands_pending_response_lock);
-    return wait_entry;
-  }
 
   pthread_mutex_unlock(&commands_pending_response_lock);
   return NULL;

--- a/hci/src/hci_packet_factory.c
+++ b/hci/src/hci_packet_factory.c
@@ -141,10 +141,6 @@ static BT_HDR *make_read_local_supported_codecs(void) {
     return make_command_no_params(HCI_READ_LOCAL_SUPPORTED_CODECS);
 }
 
-static BT_HDR *make_ble_read_offload_features_support(void) {
-    return make_command_no_params(HCI_BLE_VENDOR_CAP_OCF);
-}
-
 static BT_HDR *make_ble_set_event_mask(const bt_event_mask_t *event_mask) {
   uint8_t *stream;
   uint8_t parameter_size = sizeof(bt_event_mask_t);
@@ -202,8 +198,7 @@ static const hci_packet_factory_t interface = {
   make_ble_read_resolving_list_size,
   make_ble_read_suggested_default_data_length,
   make_ble_set_event_mask,
-  make_read_local_supported_codecs,
-  make_ble_read_offload_features_support
+  make_read_local_supported_codecs
 };
 
 const hci_packet_factory_t *hci_packet_factory_get_interface() {

--- a/hci/src/hci_packet_parser.c
+++ b/hci/src/hci_packet_parser.c
@@ -88,21 +88,6 @@ static void parse_read_local_supported_codecs_response(
   buffer_allocator->free(response);
 }
 
-
-static void parse_ble_read_offload_features_response(
-    BT_HDR *response,
-    bool *ble_offload_features_supported) {
-
-  uint8_t *stream = read_command_complete_header(response, NO_OPCODE_CHECKING, 0 /* bytes after */);
-  if(stream) {
-    *ble_offload_features_supported  = true;
-  } else {
-    *ble_offload_features_supported  = false;
-  }
-
-  buffer_allocator->free(response);
-}
-
 static void parse_read_bd_addr_response(
     BT_HDR *response,
     bt_bdaddr_t *address_ptr) {
@@ -273,8 +258,7 @@ static const hci_packet_parser_t interface = {
   parse_ble_read_local_supported_features_response,
   parse_ble_read_resolving_list_size_response,
   parse_ble_read_suggested_default_data_length_response,
-  parse_read_local_supported_codecs_response,
-  parse_ble_read_offload_features_response
+  parse_read_local_supported_codecs_response
 };
 
 const hci_packet_parser_t *hci_packet_parser_get_interface() {