Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc7c32f4 authored by Myles Watson's avatar Myles Watson
Browse files

Remove types/class_of_device 

Use GD hci/class_of_device instead.

Bug: 314889276
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I3167f44e12dbba61315c52963975f39f041cc44e
parent d3527374

system/main/shim/acl.cc

+1 −4
Original line number Original line Diff line number Diff line
@@ -1619,11 +1619,8 @@ void shim::legacy::Acl::OnConnectRequest(hci::Address address, 
                                         hci::ClassOfDevice cod) {

                                         hci::ClassOfDevice cod) {

  const RawAddress bd_addr = ToRawAddress(address);

  const RawAddress bd_addr = ToRawAddress(address);





  types::ClassOfDevice legacy_cod;

  legacy_cod.FromOctets(cod.data());



  TRY_POSTING_ON_MAIN(acl_interface_.connection.classic.on_connect_request,

  TRY_POSTING_ON_MAIN(acl_interface_.connection.classic.on_connect_request,

                      bd_addr, legacy_cod);

                      bd_addr, cod);

  LOG_DEBUG("Received connect request remote:%s",

  LOG_DEBUG("Received connect request remote:%s",

            ADDRESS_TO_LOGGABLE_CSTR(address));

            ADDRESS_TO_LOGGABLE_CSTR(address));

  BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Connection request");

  BTM_LogHistory(kBtmLogTag, ToRawAddress(address), "Connection request");

system/main/shim/acl_legacy_interface.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -18,11 +18,11 @@ 




#include <cstdint>

#include <cstdint>





#include "hci/class_of_device.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hci_mode.h"

#include "stack/include/hci_mode.h"

#include "types/ble_address_with_type.h"

#include "types/ble_address_with_type.h"

#include "types/class_of_device.h"

#include "types/hci_role.h"

#include "types/hci_role.h"

#include "types/raw_address.h"

#include "types/raw_address.h"
@@ -33,8 +33,7 @@ namespace legacy { 
typedef struct {

typedef struct {

  void (*on_connected)(const RawAddress& bda, uint16_t handle, uint8_t enc_mode,

  void (*on_connected)(const RawAddress& bda, uint16_t handle, uint8_t enc_mode,

                       bool locally_initiated);

                       bool locally_initiated);

  void (*on_connect_request)(const RawAddress& bda,

  void (*on_connect_request)(const RawAddress& bda, const hci::ClassOfDevice&);

                             const types::ClassOfDevice&);

  void (*on_failed)(const RawAddress& bda, tHCI_STATUS status,

  void (*on_failed)(const RawAddress& bda, tHCI_STATUS status,

                    bool locally_initiated);

                    bool locally_initiated);

  void (*on_disconnected)(tHCI_STATUS status, uint16_t handle,

  void (*on_disconnected)(tHCI_STATUS status, uint16_t handle,

system/stack/acl/btm_acl.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -2540,7 +2540,7 @@ void acl_create_classic_connection(const RawAddress& bd_addr, 
}

}





void btm_connection_request(const RawAddress& bda,

void btm_connection_request(const RawAddress& bda,

                            const bluetooth::types::ClassOfDevice& cod) {

                            const bluetooth::hci::ClassOfDevice& cod) {

  // Copy Cod information

  // Copy Cod information

  DEV_CLASS dc;

  DEV_CLASS dc;

system/stack/include/acl_hci_link_interface.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -19,18 +19,18 @@ 




#include <cstdint>

#include <cstdint>





#include "hci/class_of_device.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hci_mode.h"

#include "stack/include/hci_mode.h"

#include "stack/include/hcidefs.h"

#include "stack/include/hcidefs.h"

#include "types/class_of_device.h"

#include "types/hci_role.h"

#include "types/hci_role.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





// This header contains functions for HCIF-Acl Management to invoke

// This header contains functions for HCIF-Acl Management to invoke

//

//

void btm_connection_request(const RawAddress& bda,

void btm_connection_request(const RawAddress& bda,

                            const bluetooth::types::ClassOfDevice& cod);

                            const bluetooth::hci::ClassOfDevice& cod);

void btm_acl_connected(const RawAddress& bda, uint16_t handle,

void btm_acl_connected(const RawAddress& bda, uint16_t handle,

                       tHCI_STATUS status, uint8_t enc_mode);

                       tHCI_STATUS status, uint8_t enc_mode);

void on_acl_br_edr_connected(const RawAddress& bda, uint16_t handle,

void on_acl_br_edr_connected(const RawAddress& bda, uint16_t handle,

system/stack/include/sco_hci_link_interface.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ 




#include <cstdint>

#include <cstdint>





#include "hci/class_of_device.h"

#include "stack/include/bt_dev_class.h"

#include "stack/include/bt_dev_class.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hci_error_code.h"

#include "types/class_of_device.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





struct tBTM_ESCO_DATA;

struct tBTM_ESCO_DATA;
@@ -39,6 +39,6 @@ bool btm_sco_removed(uint16_t hci_handle, tHCI_REASON reason); 




void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason);

void btm_sco_on_disconnected(uint16_t hci_handle, tHCI_REASON reason);

void btm_sco_on_esco_connect_request(const RawAddress&,

void btm_sco_on_esco_connect_request(const RawAddress&,

                                     const bluetooth::types::ClassOfDevice&);

                                     const bluetooth::hci::ClassOfDevice&);

void btm_sco_on_sco_connect_request(const RawAddress&,

void btm_sco_on_sco_connect_request(const RawAddress&,

                                    const bluetooth::types::ClassOfDevice&);
 
                                    const bluetooth::hci::ClassOfDevice&);