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

Commit eddbc3af authored by Chris Manton's avatar Chris Manton
Browse files

stack::rnr Extract Remote Name Request data structure 

Bug: 347109678
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: I6f8f838e848061e3d7610107a9d7fefc8cb6eaf1
parent 885537f2

system/stack/btm/neighbor_inquiry.h

+3 −21
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ 
#include "stack/include/bt_device_type.h"

#include "stack/include/bt_name.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_status.h"

#include "stack/include/hci_error_code.h"

#include "stack/rnr/remote_name_request.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"
@@ -198,16 +199,6 @@ inline std::string btm_inquiry_cmpl_status_text( 
  }

}



/* Structure returned with remote name  request */

typedef struct {

  tBTM_STATUS status;

  RawAddress bd_addr;

  BD_NAME remote_bd_name;

  tHCI_STATUS hci_status;

} tBTM_REMOTE_DEV_NAME;



typedef void(tBTM_NAME_CMPL_CB)(const tBTM_REMOTE_DEV_NAME*);



struct tBTM_INQUIRY_VAR_ST {

  alarm_t* classic_inquiry_timer;
@@ -220,16 +211,7 @@ struct tBTM_INQUIRY_VAR_ST { 
  uint16_t inq_scan_type;

  uint16_t page_scan_type; /* current page scan type */



  struct {

    tBTM_NAME_CMPL_CB* p_remname_cmpl_cb{nullptr};

    alarm_t* remote_name_timer{nullptr};

    RawAddress

        remname_bda{}; /* Name of bd addr for active remote name request */

    bool remname_active{

        false}; /* State of a remote name request by external API */

    tBT_DEVICE_TYPE remname_dev_type{

        BT_DEVICE_TYPE_UNKNOWN}; /* Whether it's LE or BREDR name request */

  } rnr;

  bluetooth::rnr::RemoteNameRequest rnr;



  tBTM_CMPL_CB* p_inq_cmpl_cb;

  tBTM_INQ_RESULTS_CB* p_inq_results_cb;

system/stack/rnr/remote_name_request.h

0 → 100644
+50 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

#pragma once



#include "osi/include/alarm.h"

#include "stack/include/bt_device_type.h"

#include "stack/include/bt_name.h"

#include "stack/include/btm_status.h"

#include "stack/include/hci_error_code.h"

#include "types/raw_address.h"



/* Structure returned with remote name  request */

typedef struct {

  tBTM_STATUS status;

  RawAddress bd_addr;

  BD_NAME remote_bd_name;

  tHCI_STATUS hci_status;

} tBTM_REMOTE_DEV_NAME;



typedef void(tBTM_NAME_CMPL_CB)(const tBTM_REMOTE_DEV_NAME*);



namespace bluetooth {

namespace rnr {



class RemoteNameRequest {

 public:

  tBTM_NAME_CMPL_CB* p_remname_cmpl_cb{nullptr};

  alarm_t* remote_name_timer{nullptr};

  RawAddress remname_bda{}; /* Name of bd addr for active remote name request */

  bool remname_active{

      false}; /* State of a remote name request by external API */

  tBT_DEVICE_TYPE remname_dev_type{

      BT_DEVICE_TYPE_UNKNOWN}; /* Whether it's LE or BREDR name request */

};



}  // namespace rnr

}  // namespace bluetooth