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

Commit fab71551 authored by Pavlin Radoslavov's avatar Pavlin Radoslavov
Browse files

Customize Bluetooth sniff interval 

Fix an earlier commit that prevents from customizing some of
the Bluetooth sniff parameters - those cannot be overwritten
anymore in the bdroid_buildcfg.h file.

Also, fixed the indexing in tables bta_dm_pm_cfg[]
and bta_dm_pm_spec[]

Bug: 22676670
Change-Id: I3a7074b9a9c91d312dc5d4314b7c304baf4ae20d
parent d8c7b26d

system/bta/dm/bta_dm_cfg.c

+54 −52
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] 
  {BTA_ID_CG,  BTA_ALL_APP_ID,      1},  /* cg resue ct spec table */

  {BTA_ID_DG,  BTA_ALL_APP_ID,      2},  /* dg spec table */

  {BTA_ID_AV,  BTA_ALL_APP_ID,      4},  /* av spec table */

  {BTA_ID_AVK, BTA_ALL_APP_ID,      13}, /* avk spec table */

  {BTA_ID_AVK, BTA_ALL_APP_ID,     12},  /* avk spec table */

  {BTA_ID_FTC, BTA_ALL_APP_ID,      6},  /* ftc spec table */

  {BTA_ID_FTS, BTA_ALL_APP_ID,      7},  /* fts spec table */

  {BTA_ID_HD,  BTA_ALL_APP_ID,      3},  /* hd spec table */
@@ -144,14 +144,14 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_CFG bta_dm_pm_cfg[BTA_DM_NUM_PM_ENTRY + 1] 
  {BTA_ID_PAN, BTUI_PAN_ID_NAP,    10},  /* NAP spec table */

  {BTA_ID_HS,  BTA_ALL_APP_ID,     11}   /* HS spec table */

#if BLE_INCLUDED == TRUE

  ,{BTA_ID_GATTC,  BTA_ALL_APP_ID,  12}   /* gattc spec table */

  ,{BTA_ID_GATTS,  BTA_ALL_APP_ID,  13}  /* gatts spec table */

  ,{BTA_ID_GATTC,  BTA_ALL_APP_ID,  13}  /* gattc spec table */

  ,{BTA_ID_GATTS,  BTA_ALL_APP_ID,  14}  /* gatts spec table */

#endif

};



tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] =

{

  /* AG */

  /* AG : 0 */

 {

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -170,7 +170,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



  /* CT */

  /* CT, CG : 1 */

 {

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -189,7 +189,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



  /* DG */

  /* DG, PBC : 2 */

 {

  (BTA_DM_PM_ACTIVE),                                             /* no power saving mode allowed */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -208,7 +208,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



   /* HD */

   /* HD : 3 */

 {

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                            /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -221,13 +221,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close */

      {{BTA_DM_PM_SNIFF2, 5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF4,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_SNIFF_HD_IDLE_IDX, 5000}, {BTA_DM_PM_NO_ACTION, 0}},   /* idle */

      {{BTA_DM_PM_SNIFF_HD_ACTIVE_IDX, 0}, {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },



   /* AV */

   /* AV : 4 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -246,7 +246,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



  /* HH */

  /* HH : 5 */

 {

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                            /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -259,13 +259,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close, used for HH suspend   */

      {{BTA_DM_PM_SNIFF2, 7000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_SNIFF_HH_IDLE_IDX, BTA_DM_PM_HH_IDLE_DELAY},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF_HH_ACTIVE_IDX, BTA_DM_PM_HH_ACTIVE_DELAY},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },



  /* FTC, OPC */

  /* FTC, OPC, JV : 6 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -278,13 +278,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },



  /* FTS, OPS */

  /* FTS, PBS, OPS, MSE, BTA_JV_PM_ID_1 : 7 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -303,7 +303,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



   /* HL */

   /* HL : 8 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -322,7 +322,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
  }

 },



  /* PANU */

  /* PANU : 9 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -335,70 +335,72 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },



    /* AVK : 13 */

  /* NAP : 10 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)

  (BTA_DM_PM_SSR2),                                              /* the SSR entry */

#endif

  {

      {{BTA_DM_PM_SNIFF,  3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  sniff */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  active */

      {{BTA_DM_PM_NO_PREF,   0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn close  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF4, 3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF_A2DP_IDX, 5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},   /* busy */



      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 },

  /* NAP */



  /* HS : 11 */

 {

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)

  (BTA_DM_PM_SSR2),                                              /* the SSR entry */

#endif

  {

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  active */

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* conn open sniff  */

      {{BTA_DM_PM_NO_PREF,   0},   {BTA_DM_PM_NO_ACTION, 0}},   /* conn close  */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},   /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},   /* app close */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF,  5000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_SNIFF3, 7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* sco open, active */

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* sco close sniff  */

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},   /* busy */



      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

      {{BTA_DM_PM_RETRY,  7000},   {BTA_DM_PM_NO_ACTION, 0}}    /* mode change retry */

  }

 },



  /* HS */

  /* AVK : 12 */

 {

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

  (BTA_DM_PM_SNIFF),                                             /* allow sniff */

#if (BTM_SSR_INCLUDED == TRUE)

  (BTA_DM_PM_SSR2),                                              /* the SSR entry */

#endif

  {

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* conn open sniff  */

      {{BTA_DM_PM_SNIFF,  3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn open  sniff */

      {{BTA_DM_PM_NO_PREF,   0},   {BTA_DM_PM_NO_ACTION, 0}},    /* conn close  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app open */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* app close */

      {{BTA_DM_PM_SNIFF3, 7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* sco open, active */

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* sco close sniff  */

      {{BTA_DM_PM_SNIFF,  7000},   {BTA_DM_PM_NO_ACTION, 0}},   /* idle */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco open  */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}},    /* sco close   */

      {{BTA_DM_PM_SNIFF4, 3000},   {BTA_DM_PM_NO_ACTION, 0}},    /* idle */

      {{BTA_DM_PM_ACTIVE,    0},   {BTA_DM_PM_NO_ACTION, 0}},    /* busy */

      {{BTA_DM_PM_RETRY,  7000},   {BTA_DM_PM_NO_ACTION, 0}}    /* mode change retry */

      {{BTA_DM_PM_NO_ACTION, 0},   {BTA_DM_PM_NO_ACTION, 0}}     /* mode change retry */

  }

 }



#if BLE_INCLUDED == TRUE

    /* GATTC */

    /* GATTC : 13 */

 ,{

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -419,7 +421,7 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTA_DM_PM_SPEC bta_dm_pm_spec[BTA_DM_NUM_PM_SPEC] = 
      {{BTA_DM_PM_RETRY,   5000},   {BTA_DM_PM_NO_ACTION, 0}}    /* mode change retry */

  }

 }

    /* GATTS */

    /* GATTS : 14 */

 ,{

  (BTA_DM_PM_SNIFF | BTA_DM_PM_PARK),                           /* allow park & sniff */

#if (BTM_SSR_INCLUDED == TRUE)
@@ -481,13 +483,13 @@ tBTA_DM_PM_TYPE_QUALIFIER tBTM_PM_PWR_MD bta_dm_pm_md[] = 
 * services, the setting with lowest latency wins.

 */

/* sniff modes: max interval, min interval, attempt, timeout */

  {800, 400, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF - A2DP */

  {400, 200, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF1 */

  {180, 150, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF2- HD idle */

  {150,  50, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF3- SCO open */

  { 54,  30, 4, 1, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF4- HD active */

  { 36,  36, 2, 0, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF5- HD active */

  {800, 400, 0, 0, BTM_PM_MD_PARK}

  {BTA_DM_PM_SNIFF_MAX, BTA_DM_PM_SNIFF_MIN, BTA_DM_PM_SNIFF_ATTEMPT, BTA_DM_PM_SNIFF_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF - A2DP */

  {BTA_DM_PM_SNIFF1_MAX, BTA_DM_PM_SNIFF1_MIN, BTA_DM_PM_SNIFF1_ATTEMPT, BTA_DM_PM_SNIFF1_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF1 */

  {BTA_DM_PM_SNIFF2_MAX, BTA_DM_PM_SNIFF2_MIN, BTA_DM_PM_SNIFF2_ATTEMPT, BTA_DM_PM_SNIFF2_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF2- HD idle */

  {BTA_DM_PM_SNIFF3_MAX, BTA_DM_PM_SNIFF3_MIN, BTA_DM_PM_SNIFF3_ATTEMPT, BTA_DM_PM_SNIFF3_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF3- SCO open */

  {BTA_DM_PM_SNIFF4_MAX, BTA_DM_PM_SNIFF4_MIN, BTA_DM_PM_SNIFF4_ATTEMPT, BTA_DM_PM_SNIFF4_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF4- HD active */

  {BTA_DM_PM_SNIFF5_MAX, BTA_DM_PM_SNIFF5_MIN, BTA_DM_PM_SNIFF5_ATTEMPT, BTA_DM_PM_SNIFF5_TIMEOUT, BTM_PM_MD_SNIFF}, /* for BTA_DM_PM_SNIFF5- HD active */

  {BTA_DM_PM_PARK_MAX, BTA_DM_PM_PARK_MIN, BTA_DM_PM_PARK_ATTEMPT, BTA_DM_PM_PARK_TIMEOUT, BTM_PM_MD_PARK}



#ifdef BTE_SIM_APP      /* For Insight builds only */

  /* Entries at the end of the bta_dm_pm_md table are user-defined (runtime configurable),

system/bta/include/bta_api.h

+7 −0
Original line number Diff line number Diff line
@@ -1293,6 +1293,13 @@ typedef UINT8 tBTA_DM_PM_ACTION; 
#define BTA_DM_PM_SNIFF4_TIMEOUT 1

#endif



#ifndef BTA_DM_PM_SNIFF5_MAX

#define BTA_DM_PM_SNIFF5_MAX     36

#define BTA_DM_PM_SNIFF5_MIN     30

#define BTA_DM_PM_SNIFF5_ATTEMPT 2

#define BTA_DM_PM_SNIFF5_TIMEOUT 0

#endif



#ifndef BTA_DM_PM_PARK_MAX

#define BTA_DM_PM_PARK_MAX       800

#define BTA_DM_PM_PARK_MIN       400