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

Commit 1137fffc authored by Chris Manton's avatar Chris Manton
Browse files

Properly conform tACL_CONN field names 

And put getters in header

Bug: 163134718
Test: cert
Tag: #refactor

Change-Id: I544de67b543b272485e8993fc609288703c16bbf
parent a61d0912

system/stack/acl/acl.cc

+0 −4
Original line number Diff line number Diff line
@@ -21,10 +21,6 @@ 
#include "stack/acl/acl.h"

#include "types/raw_address.h"



tBTM_PM_MODE tACL_CONN::sPolicy::Mode() const { return this->mode.mode_; }



hci_role_t tACL_CONN::sPolicy::Role() const { return this->role.role_; }



void tACL_CONN::Reset() {

  memset(peer_le_features, 0, sizeof(peer_le_features));

  peer_le_features_valid = false;

system/stack/acl/acl.h

+5 −5
Original line number Diff line number Diff line
@@ -312,8 +312,8 @@ struct tACL_CONN { 


  void Reset();



  struct sPolicy {

    tBTM_PM_MODE Mode() const;

  struct tPolicy {

    tBTM_PM_MODE Mode() const { return this->mode.mode_; }

    struct {

      bool IsPending() const { return pending_ != BTM_PM_MD_UNKNOWN; }

      tBTM_PM_MODE Pending() const { return pending_; }
@@ -330,10 +330,10 @@ struct tACL_CONN { 
                                                         tHCI_MODE hci_mode,

                                                         uint16_t interval);

      friend void tACL_CONN::Reset();

      friend tBTM_PM_MODE tACL_CONN::sPolicy::Mode() const;

      friend tBTM_PM_MODE tACL_CONN::tPolicy::Mode() const;

    } mode;



    hci_role_t Role() const;

    hci_role_t Role() const { return this->role.role_; }

    struct {

      unsigned RoleSwitchFailedCount() const { return role_switch_failed_cnt_; }
@@ -341,7 +341,7 @@ struct tACL_CONN { 
      hci_role_t role_{HCI_ROLE_CENTRAL};

      unsigned role_switch_failed_cnt_{0};

      friend void tACL_CONN::Reset();

      friend tBTM_PM_MODE tACL_CONN::sPolicy::Role() const;

      friend tBTM_PM_MODE tACL_CONN::tPolicy::Role() const;

    } role;



    struct {