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

Commit c8507d7a authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Modify service_type constants to not collide with constants in GD am: ab7ff119 am: 05ed70d5 

Change-Id: Ia845ce4bb336bab335d73b1a557e670a36adad03
parents e6825d5a 05ed70d5

system/stack/include/bt_types.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -641,9 +641,9 @@ typedef struct { 
} FLOW_SPEC;

} FLOW_SPEC;





/* Values for service_type */

/* Values for service_type */

#define NO_TRAFFIC 0

#define SVC_TYPE_NO_TRAFFIC 0

#define BEST_EFFORT 1

#define SVC_TYPE_BEST_EFFORT 1

#define GUARANTEED 2

#define SVC_TYPE_GUARANTEED 2





/* Service class of the CoD */

/* Service class of the CoD */

#define SERV_CLASS_NETWORKING (1 << 1)

#define SERV_CLASS_NETWORKING (1 << 1)

system/stack/l2cap/l2c_utils.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -1902,13 +1902,13 @@ uint8_t l2cu_process_peer_cfg_req(tL2C_CCB* p_ccb, tL2CAP_CFG_INFO* p_cfg) { 
    /* Make sure service type is not a reserved value; otherwise let upper

    /* Make sure service type is not a reserved value; otherwise let upper

       layer decide if acceptable

       layer decide if acceptable

    */

    */

    if (p_cfg->qos.service_type <= GUARANTEED) {

    if (p_cfg->qos.service_type <= SVC_TYPE_GUARANTEED) {

      p_ccb->peer_cfg.qos = p_cfg->qos;

      p_ccb->peer_cfg.qos = p_cfg->qos;

      p_ccb->peer_cfg.qos_present = true;

      p_ccb->peer_cfg.qos_present = true;

      p_ccb->peer_cfg_bits |= L2CAP_CH_CFG_MASK_QOS;

      p_ccb->peer_cfg_bits |= L2CAP_CH_CFG_MASK_QOS;

    } else /* Illegal service type value */

    } else /* Illegal service type value */

    {

    {

      p_cfg->qos.service_type = BEST_EFFORT;

      p_cfg->qos.service_type = SVC_TYPE_BEST_EFFORT;

      qos_type_ok = false;

      qos_type_ok = false;

    }

    }

  }

  }