From 20d12d7e330be7044704800b752a0cb0bf87e259 Mon Sep 17 00:00:00 2001 From: Chris Manton Date: Mon, 7 Sep 2020 12:31:21 -0700 Subject: [PATCH] Remove unnecessary #def BTM_MAX_SCN Towards readable code Bug: 163134718 Tag: #refactor Test: compile & verify basic functions working Change-Id: I8072f187664e015c8a5bd11040ba1de6b77fff07 --- stack/btm/btm_scn.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stack/btm/btm_scn.cc b/stack/btm/btm_scn.cc index 1ee06bb39..803adbd4e 100644 --- a/stack/btm/btm_scn.cc +++ b/stack/btm/btm_scn.cc @@ -18,7 +18,7 @@ #include #include "stack/btm/btm_int_types.h" // tBTM_CB -#include "stack/include/rfcdefs.h" // BTM_MAX_SCN +#include "stack/include/rfcdefs.h" // PORT_MAX_RFC_PORTS extern tBTM_CB btm_cb; @@ -36,7 +36,7 @@ uint8_t BTM_AllocateSCN(void) { BTM_TRACE_DEBUG("BTM_AllocateSCN"); // stack reserves scn 1 for HFP, HSP we still do the correct way - for (x = 1; x < BTM_MAX_SCN; x++) { + for (x = 1; x < PORT_MAX_RFC_PORTS; x++) { if (!btm_cb.btm_scn[x]) { btm_cb.btm_scn[x] = true; return (x + 1); @@ -60,7 +60,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { /* Make sure we don't exceed max port range. * Stack reserves scn 1 for HFP, HSP we still do the correct way. */ - if ((scn >= BTM_MAX_SCN) || (scn == 1)) return false; + if ((scn >= PORT_MAX_RFC_PORTS) || (scn == 1)) return false; /* check if this port is available */ if (!btm_cb.btm_scn[scn - 1]) { @@ -82,7 +82,7 @@ bool BTM_TryAllocateSCN(uint8_t scn) { ******************************************************************************/ bool BTM_FreeSCN(uint8_t scn) { BTM_TRACE_DEBUG("BTM_FreeSCN "); - if (scn <= BTM_MAX_SCN) { + if (scn <= PORT_MAX_RFC_PORTS) { btm_cb.btm_scn[scn - 1] = false; return (true); } else { -- 2.11.0