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

Commit 348a76c1 authored by Chris Manton's avatar Chris Manton
Browse files

Remove set-once-never-execute l2cb.is_flush_active 

Towards proper interfaces

Bug: 163134718
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I8a5d32e2d190fd11bba2f8b70020730681ca881f
parent 922ea520

system/stack/l2cap/l2c_api.cc

+2 −6
Original line number Diff line number Diff line
@@ -1803,14 +1803,10 @@ uint16_t L2CA_FlushChannel(uint16_t lcid, uint16_t num_to_flush) { 
       * controller */

      if (controller->supports_non_flushable_pb() &&

          (BTM_GetNumScoLinks() == 0)) {

        if (!l2cb.is_flush_active) {

          l2cb.is_flush_active = true;



        /* The only packet type defined - 0 - Automatically-Flushable Only */

        btsnd_hcic_enhanced_flush(p_lcb->handle, 0);

      }

    }

    }



    // Iterate though list and flush the amount requested from

    // the transmit data queue that satisfy the layer and event conditions.

system/stack/l2cap/l2c_int.h

+0 −1
Original line number Diff line number Diff line
@@ -446,7 +446,6 @@ typedef struct { 
  uint16_t non_flushable_pbf; /* L2CAP_PKT_START_NON_FLUSHABLE if controller

                                 supports */

  /* Otherwise, L2CAP_PKT_START */

  bool is_flush_active; /* true if an HCI_Enhanced_Flush has been sent */



#if (L2CAP_CONFORMANCE_TESTING == TRUE)

  uint32_t test_info_resp; /* Conformance testing needs a dynamic response */