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

Commit bdcdbe3e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "eatt: Add upper tester to trigger Read Multiple Value Len Req" into... 

Merge "eatt: Add upper tester to trigger Read Multiple Value Len Req" into tm-d1-dev am: d1a740b9 am: 2d812ecf

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



Change-Id: Id68591b4ac5cc9991689172be00681b1df2971ae
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7d0c2f0a 2d812ecf

system/internal_include/bt_target.h

+5 −0
Original line number Diff line number Diff line
@@ -555,6 +555,11 @@ 
#ifndef GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_NOTIF

#define GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_NOTIF FALSE

#endif



/* Used only for GATT Multiple Variable Length READ PTS tests */

#ifndef GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_READ

#define GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_READ FALSE

#endif

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

 *

 * SMP

system/stack/gatt/gatt_api.cc

+32 −0
Original line number Diff line number Diff line
@@ -819,6 +819,10 @@ tGATT_STATUS GATTC_Read(uint16_t conn_id, tGATT_READ_TYPE type, 
  uint8_t tcb_idx = GATT_GET_TCB_IDX(conn_id);

  tGATT_TCB* p_tcb = gatt_get_tcb_by_idx(tcb_idx);

  tGATT_REG* p_reg = gatt_get_regcb(gatt_if);

#if (GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_READ == TRUE)

  static uint16_t cached_read_handle;

  static int cached_tcb_idx = -1;

#endif



  VLOG(1) << __func__ << ": conn_id=" << loghex(conn_id)

          << ", type=" << loghex(type);
@@ -862,6 +866,34 @@ tGATT_STATUS GATTC_Read(uint16_t conn_id, tGATT_READ_TYPE type, 
      break;

    }

    case GATT_READ_BY_HANDLE:

#if (GATT_UPPER_TESTER_MULT_VARIABLE_LENGTH_READ == TRUE)

      LOG_INFO("Upper tester: Handle read 0x%04x", p_read->by_handle.handle);

      /* This is upper tester for the  Multi Read stuff as this is mandatory for

       * EATT, even Android is not making use of this operation :/ */

      if (cached_tcb_idx < 0) {

        cached_tcb_idx = tcb_idx;

        LOG_INFO("Upper tester: Read multiple  - first read");

        cached_read_handle = p_read->by_handle.handle;

      } else if (cached_tcb_idx == tcb_idx) {

        LOG_INFO("Upper tester: Read multiple  - second read");

        cached_tcb_idx = -1;

        tGATT_READ_MULTI* p_read_multi =

            (tGATT_READ_MULTI*)osi_malloc(sizeof(tGATT_READ_MULTI));

        p_read_multi->num_handles = 2;

        p_read_multi->handles[0] = cached_read_handle;

        p_read_multi->handles[1] = p_read->by_handle.handle;

        p_read_multi->variable_len = true;



        p_clcb->s_handle = 0;

        p_clcb->op_subtype = GATT_READ_MULTIPLE_VAR_LEN;

        p_clcb->p_attr_buf = (uint8_t*)p_read_multi;

        p_clcb->cid = gatt_tcb_get_att_cid(*p_tcb, true /* eatt support */);



        break;

      }



      FALLTHROUGH_INTENDED;

#endif

    case GATT_READ_PARTIAL:

      p_clcb->uuid = Uuid::kEmpty;

      p_clcb->s_handle = p_read->by_handle.handle;

system/stack/gatt/gatt_cl.cc

+5 −0
Original line number Diff line number Diff line
@@ -200,6 +200,11 @@ void gatt_act_read(tGATT_CLCB* p_clcb, uint16_t offset) { 
      memcpy(&msg.read_multi, p_clcb->p_attr_buf, sizeof(tGATT_READ_MULTI));

      break;



    case GATT_READ_MULTIPLE_VAR_LEN:

      op_code = GATT_REQ_READ_MULTI_VAR;

      memcpy(&msg.read_multi, p_clcb->p_attr_buf, sizeof(tGATT_READ_MULTI));

      break;



    case GATT_READ_INC_SRV_UUID128:

      op_code = GATT_REQ_READ;

      msg.handle = p_clcb->s_handle;

system/stack/include/gatt_api.h

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ enum { 
  GATT_READ_BY_TYPE = 1,

  GATT_READ_BY_HANDLE,

  GATT_READ_MULTIPLE,

  GATT_READ_MULTIPLE_VAR_LEN,

  GATT_READ_CHAR_VALUE,

  GATT_READ_PARTIAL,

  GATT_READ_MAX