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

Commit 80e5e7aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "legacy: Remove #SDP_RAW_DATA_INCLUDED"

parents 3ccec401 0ebbfe9f

system/btif/src/stack_manager.cc

+8 −0
Original line number Diff line number Diff line
@@ -84,6 +84,14 @@ 
#error "*** Conditional Compilation Directive error"

#endif



#if SDP_RAW_DATA_INCLUDED != TRUE

// Once SDP_RAW_DATA_INCLUDED is no longer exposed via bt_target.h

// this check and error statement may be removed.

#warning \

    "#define SDP_RAW_DATA_INCLUDED preprocessor compilation flag is unsupported"

#error "*** Conditional Compilation Directive error"

#endif



void main_thread_shut_down();

void main_thread_start_up();

void BTA_dm_on_hw_on();

system/stack/include/sdp_api.h

+0 −2
Original line number Diff line number Diff line
@@ -160,12 +160,10 @@ typedef struct { 
  uint16_t num_attr_filters; /* Number of attribute filters  */

  uint16_t attr_filters[SDP_MAX_ATTR_FILTERS]; /* Attributes to filter */

  uint8_t* p_free_mem; /* Pointer to free memory       */

#if (SDP_RAW_DATA_INCLUDED == TRUE)

  uint8_t*

      raw_data; /* Received record from server. allocated/released by client  */

  uint32_t raw_size; /* size of raw_data */

  uint32_t raw_used; /* length of raw_data used */

#endif

} tSDP_DISCOVERY_DB;



/* This structure is used to add protocol lists and find protocol elements */

system/stack/sdp/sdp_discovery.cc

+0 −7
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ static void process_service_search_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
 *                          false if not copied

 *

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

#if (SDP_RAW_DATA_INCLUDED == TRUE)

static bool sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) {

  unsigned int cpy_len, rem_len;

  uint32_t list_len;
@@ -376,7 +375,6 @@ static bool sdp_copy_raw_data(tCONN_CB* p_ccb, bool offset) { 
  }

  return true;

}

#endif



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

 *
@@ -426,7 +424,6 @@ static void process_service_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
      }

      cont_request_needed = true;

    } else {

#if (SDP_RAW_DATA_INCLUDED == TRUE)

      SDP_TRACE_WARNING("process_service_attr_rsp");

      if (!sdp_copy_raw_data(p_ccb, false)) {

        SDP_TRACE_ERROR("sdp_copy_raw_data failed");
@@ -434,8 +431,6 @@ static void process_service_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
        return;

      }



#endif



      /* Save the response in the database. Stop on any error */

      if (!save_attr_seq(p_ccb, &p_ccb->rsp_list[0],

                         &p_ccb->rsp_list[p_ccb->list_len])) {
@@ -628,13 +623,11 @@ static void process_service_search_attr_rsp(tCONN_CB* p_ccb, uint8_t* p_reply, 
/* We now have the full response, which is a sequence of sequences */

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



#if (SDP_RAW_DATA_INCLUDED == TRUE)

  if (!sdp_copy_raw_data(p_ccb, true)) {

    LOG_ERROR("sdp_copy_raw_data failed");

    sdp_disconnect(p_ccb, SDP_ILLEGAL_PARAMETER);

    return;

  }

#endif



  p = &p_ccb->rsp_list[0];