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

Commit 30d47125 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Remove #BTA_HH_INCLUDED am: 8dfee78f am: de176119 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2004377

Change-Id: Iea0c6b194a47fd8800e51e857c7213127f5a37a2
parents 2dacd679 de176119

system/bta/dm/bta_dm_pm.cc

+0 −4
Original line number Diff line number Diff line
@@ -53,12 +53,10 @@ static int bta_dm_get_sco_index(); 
static void bta_dm_pm_stop_timer_by_index(tBTA_PM_TIMER* p_timer,

                                          uint8_t timer_idx);



#if (BTA_HH_INCLUDED == TRUE)

#include "../hh/bta_hh_int.h"

/* BTA_DM_PM_SSR1 will be dedicated for HH SSR setting entry, no other profile

 * can use it */

#define BTA_DM_PM_SSR_HH BTA_DM_PM_SSR1

#endif

static void bta_dm_pm_ssr(const RawAddress& peer_addr, int ssr);



tBTA_DM_CONNECTED_SRVCS bta_dm_conn_srvcs;
@@ -790,7 +788,6 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, int ssr) { 
    }

    /* find the ssr index with the smallest max latency. */

    tBTA_DM_SSR_SPEC* p_spec_cur = &p_bta_dm_ssr_spec[current_ssr_index];

#if (BTA_HH_INCLUDED == TRUE)

    /* HH has the per connection SSR preference, already read the SSR params

     * from BTA HH */

    if (current_ssr_index == BTA_DM_PM_SSR_HH) {
@@ -799,7 +796,6 @@ static void bta_dm_pm_ssr(const RawAddress& peer_addr, int ssr) { 
        continue;

      }

    }

#endif

    if (p_spec_cur->max_lat < p_spec->max_lat ||

        (ssr_index == BTA_DM_PM_SSR0 && current_ssr_index != BTA_DM_PM_SSR0)) {

      LOG_DEBUG(

system/bta/hh/bta_hh_act.cc

+1 −4
Original line number Diff line number Diff line
@@ -25,12 +25,10 @@ 
#define LOG_TAG "bluetooth"



// BTA_HH_INCLUDED

#include "bt_target.h"  // Must be first to define build configuration

#if (BTA_HH_INCLUDED == TRUE)



#include <cstdint>

#include <string>



#include "bt_target.h"  // Must be first to define build configuration

#include "bta/hh/bta_hh_int.h"

#include "bta/include/bta_hh_api.h"

#include "bta/include/bta_hh_co.h"
@@ -170,7 +168,6 @@ void bta_hh_disc_cmpl(void) { 
  if (HID_HostDeregister() != HID_SUCCESS) status = BTA_HH_ERR;



  bta_hh_cleanup_disable(status);

#endif

}



/*******************************************************************************

system/bta/hh/bta_hh_api.cc

+0 −9
Original line number Diff line number Diff line
@@ -26,10 +26,7 @@ 


#include <cstdint>



// BTA_HH_INCLUDED

#include "bt_target.h"  // Must be first to define build configuration

#if (BTA_HH_INCLUDED == TRUE)



#include "bta/hh/bta_hh_int.h"

#include "bta/sys/bta_sys.h"

#include "osi/include/allocator.h"
@@ -359,9 +356,3 @@ void BTA_HhRemoveDev(uint8_t dev_handle) { 


  bta_sys_sendmsg(p_buf);

}
 


/******************************************************************************/

/*                          Utility Function */

/******************************************************************************/



#endif /* BTA_HH_INCLUDED */

system/bta/hh/bta_hh_main.cc

+1 −5
Original line number Diff line number Diff line
@@ -23,12 +23,10 @@ 
 ******************************************************************************/



#include <string.h>  // memset



#include <cstdint>



#include "bt_target.h"  // Must be first to define build configuration



#if (BTA_HH_INCLUDED == TRUE)



#include "bta/hh/bta_hh_int.h"

#include "osi/include/allocator.h"

#include "stack/include/bt_hdr.h"
@@ -441,5 +439,3 @@ static const char* bta_hh_state_code(tBTA_HH_STATE state_code) { 
      return "unknown HID Host state";

  }

}
 


#endif /* BTA_HH_INCLUDED */

system/bta/hh/bta_hh_utils.cc

+2 −4
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
 *

 ******************************************************************************/

#include <string.h>  // memset



#include <cstring>



#include "bt_target.h"  // Must be first to define build configuration

#if (BTA_HH_INCLUDED == TRUE)



#include "bt_trace.h"   // Legacy trace logging

#include "bta/hh/bta_hh_int.h"

#include "btif/include/btif_storage.h"
@@ -377,4 +376,3 @@ void bta_hh_trace_dev_db(void) { 
  APPL_TRACE_DEBUG("*********************************************************");

}

#endif
 
#endif /* HL_INCLUDED */