AVRC uses the same mtu (part 2)

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Ie7e5be1bd0b1c94aac122aedf3ee05dac45e386e

diff --git a/bta/ar/bta_ar.cc b/bta/ar/bta_ar.cc
index 0120b74..782fe3f 100644 (file)
--- a/bta/ar/bta_ar.cc
+++ b/bta/ar/bta_ar.cc
@@ -122,9 +122,9 @@ void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr,
  * Returns          void
  *
  ******************************************************************************/
-void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br) {
+void bta_ar_reg_avct(uint16_t mtu_br) {
   if (bta_ar_cb.avct_registered == 0) {
-    AVCT_Register(mtu, mtu_br);
+    AVCT_Register(mtu_br);
   }
   bta_ar_cb.avct_registered |= BTA_AR_AV_MASK;
 }

diff --git a/bta/av/bta_av_main.cc b/bta/av/bta_av_main.cc
index bfdfc89..923ddff 100644 (file)
--- a/bta/av/bta_av_main.cc
+++ b/bta/av/bta_av_main.cc
@@ -472,7 +472,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {
       if (bta_av_cb.features & (BTA_AV_FEAT_RCTG)) {
         /* register with no authorization; let AVDTP use authorization instead
          */
-        bta_ar_reg_avct(kAvrcMtu, p_bta_av_cfg->avrc_br_mtu);
+        bta_ar_reg_avct(p_bta_av_cfg->avrc_br_mtu);
 
         /* For the Audio Sink role we support additional TG to support
          * absolute volume.
@@ -619,7 +619,7 @@ static void bta_av_api_register(tBTA_AV_DATA* p_data) {
       if (bta_av_cb.features & (BTA_AV_FEAT_RCCT)) {
         /* if TG is not supported, we need to register to AVCT now */
         if ((bta_av_cb.features & (BTA_AV_FEAT_RCTG)) == 0) {
-          bta_ar_reg_avct(kAvrcMtu, p_bta_av_cfg->avrc_br_mtu);
+          bta_ar_reg_avct(p_bta_av_cfg->avrc_br_mtu);
           bta_av_rc_create(&bta_av_cb, AVCT_ACP, 0, BTA_AV_NUM_LINKS + 1);
         }
         /* create an SDP record as AVRC CT. We create 1.3 for SOURCE

diff --git a/bta/include/bta_ar_api.h b/bta/include/bta_ar_api.h
index 562e6fb..a100467 100644 (file)
--- a/bta/include/bta_ar_api.h
+++ b/bta/include/bta_ar_api.h
@@ -97,7 +97,7 @@ extern void bta_ar_avdt_conn(tBTA_SYS_ID sys_id, const RawAddress& bd_addr,
  * Returns          void
  *
  ******************************************************************************/
-extern void bta_ar_reg_avct(uint16_t mtu, uint16_t mtu_br);
+extern void bta_ar_reg_avct(uint16_t mtu_br);
 
 /*******************************************************************************
  *

diff --git a/bta/include/bta_av_api.h b/bta/include/bta_av_api.h
index 1d30946..ea9f627 100644 (file)
--- a/bta/include/bta_av_api.h
+++ b/bta/include/bta_av_api.h
@@ -373,8 +373,6 @@ struct tBTA_AV_SCB;
 union tBTA_AV_DATA;
 typedef void (*tBTA_AV_ACT)(tBTA_AV_SCB* p_cb, tBTA_AV_DATA* p_data);
 
-constexpr uint16_t kAvrcMtu = 512; /* AVRCP MTU at L2CAP for control channel */
-
 /* AV configuration structure */
 typedef struct {
   uint32_t company_id;  /* AVRCP Company ID */

diff --git a/stack/avct/avct_api.cc b/stack/avct/avct_api.cc
index f620528..5ad1b61 100644 (file)
--- a/stack/avct/avct_api.cc
+++ b/stack/avct/avct_api.cc
@@ -53,19 +53,15 @@ tAVCT_CB avct_cb;
  * Returns          void
  *
  ******************************************************************************/
-void AVCT_Register(uint16_t mtu, UNUSED_ATTR uint16_t mtu_br) {
+void AVCT_Register(uint16_t mtu_br) {
   AVCT_TRACE_API("AVCT_Register");
 
   /* initialize AVCTP data structures */
   memset(&avct_cb, 0, sizeof(tAVCT_CB));
 
-  if (mtu < AVCT_MIN_CONTROL_MTU) mtu = AVCT_MIN_CONTROL_MTU;
-  /* store mtu */
-  avct_cb.mtu = mtu;
-
   /* register PSM with L2CAP */
   L2CA_Register2(AVCT_PSM, avct_l2c_appl, true /* enable_snoop */, nullptr,
-                 avct_cb.mtu, BTA_SEC_AUTHENTICATE);
+                 kAvrcMtu, BTA_SEC_AUTHENTICATE);
 
   /* Include the browsing channel which uses eFCR */
   tL2CAP_ERTM_INFO ertm_info;

diff --git a/stack/avct/avct_int.h b/stack/avct/avct_int.h
index b07b2bc..9ae0960 100644 (file)
--- a/stack/avct/avct_int.h
+++ b/stack/avct/avct_int.h
@@ -134,7 +134,6 @@ typedef struct {
   tAVCT_LCB lcb[AVCT_NUM_LINKS]; /* link control blocks */
   tAVCT_BCB bcb[AVCT_NUM_LINKS]; /* browse control blocks */
   tAVCT_CCB ccb[AVCT_NUM_CONN];  /* connection control blocks */
-  uint16_t mtu;                  /* our L2CAP MTU */
   uint16_t mtu_br;               /* our L2CAP MTU for the Browsing channel */
   uint8_t trace_level;           /* trace level */
 } tAVCT_CB;
@@ -223,4 +222,5 @@ extern const tL2CAP_APPL_INFO avct_l2c_br_appl;
 void avct_l2c_disconnect(uint16_t lcid, uint16_t result);
 void avct_l2c_br_disconnect(uint16_t lcid, uint16_t result);
 
+constexpr uint16_t kAvrcMtu = 512;
 #endif /* AVCT_INT_H */

diff --git a/stack/avct/avct_l2c.cc b/stack/avct/avct_l2c.cc
index 06133a8..1b1fc0d 100644 (file)
--- a/stack/avct/avct_l2c.cc
+++ b/stack/avct/avct_l2c.cc
@@ -142,7 +142,7 @@ void avct_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,
     /* Send L2CAP config req */
     memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));
     cfg.mtu_present = true;
-    cfg.mtu = avct_cb.mtu;
+    cfg.mtu = kAvrcMtu;
     L2CA_ConfigReq(lcid, &cfg);
     AVCT_TRACE_DEBUG("avct_l2c snd Cfg Req");
   }
@@ -181,7 +181,7 @@ void avct_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) {
         /* Send L2CAP config req */
         memset(&cfg, 0, sizeof(tL2CAP_CFG_INFO));
         cfg.mtu_present = true;
-        cfg.mtu = avct_cb.mtu;
+        cfg.mtu = kAvrcMtu;
         L2CA_ConfigReq(lcid, &cfg);
         AVCT_TRACE_DEBUG("avct_l2c snd Cfg Req");
       }

diff --git a/stack/include/avct_api.h b/stack/include/avct_api.h
index af3d0e1..a6ef229 100644 (file)
--- a/stack/include/avct_api.h
+++ b/stack/include/avct_api.h
@@ -136,7 +136,7 @@ typedef struct {
  * Returns          void
  *
  ******************************************************************************/
-extern void AVCT_Register(uint16_t mtu, uint16_t mtu_br);
+extern void AVCT_Register(uint16_t mtu_br);
 
 /*******************************************************************************
  *