From 4f3ac3214e2669c4127d854517bb1d09a71c3f18 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 12 Jan 2026 14:46:44 -0500 Subject: [PATCH] make slot numerical; --- src/common/network/BaseNetwork.cpp | 10 ++++------ src/common/network/BaseNetwork.h | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/common/network/BaseNetwork.cpp b/src/common/network/BaseNetwork.cpp index 28486718..becd29d1 100644 --- a/src/common/network/BaseNetwork.cpp +++ b/src/common/network/BaseNetwork.cpp @@ -766,18 +766,16 @@ UInt8Array BaseNetwork::readP25P2(bool& ret, uint32_t& frameLength) /* Writes P25 Phase 2 frame data to the network. */ -bool BaseNetwork::writeP25P2(const p25::lc::LC& control, p25::defines::P2_DUID::E duid, bool slot, const uint8_t* data, +bool BaseNetwork::writeP25P2(const p25::lc::LC& control, p25::defines::P2_DUID::E duid, uint8_t slot, const uint8_t* data, const uint8_t controlByte) { if (m_status != NET_STAT_RUNNING && m_status != NET_STAT_MST_RUNNING) return false; - uint8_t slotNo = slot ? 0x00U : 0x01U; - bool resetSeq = false; - if (m_p25P2StreamId[slotNo] = 0U) { + if (m_p25P2StreamId[slot] = 0U) { resetSeq = true; - m_p25P2StreamId[slotNo] = createStreamId(); + m_p25P2StreamId[slot] = createStreamId(); } uint32_t messageLength = 0U; @@ -786,7 +784,7 @@ bool BaseNetwork::writeP25P2(const p25::lc::LC& control, p25::defines::P2_DUID:: return false; } - return writeMaster({ NET_FUNC::PROTOCOL, NET_SUBFUNC::PROTOCOL_SUBFUNC_P25_P2 }, message.get(), messageLength, pktSeq(resetSeq), m_p25P2StreamId[slotNo]); + return writeMaster({ NET_FUNC::PROTOCOL, NET_SUBFUNC::PROTOCOL_SUBFUNC_P25_P2 }, message.get(), messageLength, pktSeq(resetSeq), m_p25P2StreamId[slot]); } /* Helper to test if the P25 ring buffer has data. */ diff --git a/src/common/network/BaseNetwork.h b/src/common/network/BaseNetwork.h index 4b0808f1..32e12932 100644 --- a/src/common/network/BaseNetwork.h +++ b/src/common/network/BaseNetwork.h @@ -861,12 +861,12 @@ namespace network * @brief Writes P25 Phase 2 frame data to the network. * @param[in] control Instance of p25::lc::LC containing link control data. * @param[in] duid P25 Phase 2 DUID type. - * @param[in] slot DMR slot number. + * @param[in] slot P25 Phase 2 slot number. * @param[in] data Buffer containing P25 Phase 2 data to send. * @param[in] controlByte DVM control byte. * @returns bool True, if message was sent, otherwise false. */ - virtual bool writeP25P2(const p25::lc::LC& control, p25::defines::P2_DUID::E duid, bool slot, const uint8_t* data, + virtual bool writeP25P2(const p25::lc::LC& control, p25::defines::P2_DUID::E duid, uint8_t slot, const uint8_t* data, const uint8_t controlByte = 0U); /**