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

Commit 1efd4c60 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge "Enum-ify stack::include::acl_api_types::tBTM_INQUIRY_STATE" into main

parents 2bc70bd9 2e4b39ac

system/btif/include/btif_acl.h

+2 −2
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


#pragma once



#include <cstdint>

#include "stack/include/acl_api_types.h"



void BTIF_dm_report_inquiry_status_change(uint8_t busy_level_flags);
 
void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE inquiry_state);

system/btif/src/btif_dm.cc

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ static void btif_dm_update_allowlisted_media_players() { 
  list_free(wl_players);

}



void BTIF_dm_report_inquiry_status_change(tBTM_STATUS status) {

void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE status) {

  if (status == BTM_INQUIRY_STARTED) {

    GetInterfaceToProfiles()->events->invoke_discovery_state_changed_cb(

        BT_DISCOVERY_STARTED);

system/stack/include/acl_api_types.h

+5 −3
Original line number Diff line number Diff line
@@ -85,6 +85,8 @@ typedef struct { 
  uint8_t link_quality;

} tBTM_LINK_QUALITY_RESULT;



#define BTM_INQUIRY_STARTED 1

#define BTM_INQUIRY_CANCELLED 2

#define BTM_INQUIRY_COMPLETE 3
 
typedef enum : uint8_t {

  BTM_INQUIRY_STARTED = 1,

  BTM_INQUIRY_CANCELLED = 2,

  BTM_INQUIRY_COMPLETE = 3,

} tBTM_INQUIRY_STATE;

system/test/mock/mock_btif_dm.cc

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "bta/include/bta_sec_api.h"

#include "include/hardware/bluetooth.h"

#include "internal_include/bte_appl.h"

#include "stack/include/acl_api_types.h"

#include "test/common/mock_functions.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"
@@ -58,7 +59,7 @@ uint16_t btif_dm_get_connection_state(const RawAddress& bd_addr) { 
void BTIF_dm_disable() { inc_func_call_count(__func__); }

void BTIF_dm_enable() { inc_func_call_count(__func__); }

void BTIF_dm_on_hw_error() { inc_func_call_count(__func__); }

void BTIF_dm_report_inquiry_status_change(uint8_t status) {

void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE state) {

  inc_func_call_count(__func__);

}

void btif_dm_sec_evt(tBTA_DM_SEC_EVT event, tBTA_DM_SEC* p_data) {