implement remaining code required for permit-tg and embedded STC support [untested, considered experimental]; implement proper DMR T3 grant fixes to handle slot granting properly;
Bryan Biedenkapp
3 years ago
parent
a2b1f37b56
commit
2ae52143ab
@ -0,0 +1,316 @@
|
||||
/**
|
||||
* Digital Voice Modem - Host Software
|
||||
* GPLv2 Open Source. Use is subject to license terms.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* @package DVM / Host Software
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Copyright (C) 2023 by Bryan Biedenkapp N2PLL
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
#include "dmr/lookups/DMRAffiliationLookup.h"
|
||||
#include "Log.h"
|
||||
|
||||
using namespace dmr::lookups;
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdio>
|
||||
#include <cstring>
|
||||
#include <ctime>
|
||||
|
||||
// ---------------------------------------------------------------------------
|
||||
// Public Class Members
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the DMRAffiliationLookup class.
|
||||
/// </summary>
|
||||
/// <param name="verbose">Flag indicating whether verbose logging is enabled.</param>
|
||||
DMRAffiliationLookup::DMRAffiliationLookup(bool verbose) : ::lookups::AffiliationLookup("DMR Affiliation", verbose),
|
||||
m_grantChSlotTable(),
|
||||
m_tsccChNo(0U),
|
||||
m_tsccSlot(0U)
|
||||
{
|
||||
/* stub */
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Finalizes a instance of the DMRAffiliationLookup class.
|
||||
/// </summary>
|
||||
DMRAffiliationLookup::~DMRAffiliationLookup()
|
||||
{
|
||||
/* stub */
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to grant a channel.
|
||||
/// </summary>
|
||||
/// <param name="dstId"></param>
|
||||
/// <param name="grantTimeout"></param>
|
||||
/// <returns></returns>
|
||||
bool DMRAffiliationLookup::grantCh(uint32_t dstId, uint32_t grantTimeout)
|
||||
{
|
||||
uint32_t chNo = m_rfChTable.at(0);
|
||||
uint8_t slot = getAvailableSlotForChannel(chNo);
|
||||
|
||||
if (slot == 0U) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return grantChSlot(dstId, slot, grantTimeout);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to grant a channel and slot.
|
||||
/// </summary>
|
||||
/// <param name="dstId"></param>
|
||||
/// <param name="slot"></param>
|
||||
/// <param name="grantTimeout"></param>
|
||||
/// <returns></returns>
|
||||
bool DMRAffiliationLookup::grantChSlot(uint32_t dstId, uint8_t slot, uint32_t grantTimeout)
|
||||
{
|
||||
if (dstId == 0U) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!isRFChAvailable()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t chNo = m_rfChTable.at(0);
|
||||
if (chNo == m_tsccChNo && slot == m_tsccSlot) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (getAvailableSlotForChannel(chNo) == 0U || chNo == m_tsccChNo) {
|
||||
auto it = std::find(m_rfChTable.begin(), m_rfChTable.end(), chNo);
|
||||
m_rfChTable.erase(it);
|
||||
}
|
||||
|
||||
m_grantChTable[dstId] = chNo;
|
||||
m_grantChSlotTable[dstId] = std::make_tuple(chNo, slot);
|
||||
m_rfGrantChCnt++;
|
||||
|
||||
m_grantTimers[dstId] = Timer(1000U, grantTimeout);
|
||||
m_grantTimers[dstId].start();
|
||||
|
||||
if (m_verbose) {
|
||||
LogMessage(LOG_HOST, "%s, granting channel, chNo = %u, slot = %u, dstId = %u",
|
||||
m_name, chNo, slot, dstId);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to release the channel grant for the destination ID.
|
||||
/// </summary>
|
||||
/// <param name="dstId"></param>
|
||||
/// <param name="releaseAll"></param>
|
||||
bool DMRAffiliationLookup::releaseGrant(uint32_t dstId, bool releaseAll)
|
||||
{
|
||||
if (dstId == 0U && !releaseAll) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// are we trying to release all grants?
|
||||
if (dstId == 0U && releaseAll) {
|
||||
LogWarning(LOG_HOST, "%s, force releasing all channel grants", m_name);
|
||||
|
||||
std::vector<uint32_t> gntsToRel = std::vector<uint32_t>();
|
||||
for (auto it = m_grantChTable.begin(); it != m_grantChTable.end(); ++it) {
|
||||
uint32_t dstId = it->first;
|
||||
gntsToRel.push_back(dstId);
|
||||
}
|
||||
|
||||
// release grants
|
||||
for (auto it = gntsToRel.begin(); it != gntsToRel.end(); ++it) {
|
||||
releaseGrant(*it, false);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (isGranted(dstId)) {
|
||||
uint32_t chNo = m_grantChTable.at(dstId);
|
||||
std::tuple<uint32_t, uint8_t> slotData = m_grantChSlotTable.at(dstId);
|
||||
uint8_t slot = std::get<1>(slotData);
|
||||
|
||||
if (m_verbose) {
|
||||
LogMessage(LOG_HOST, "%s, releasing channel grant, chNo = %u, slot = %u, dstId = %u",
|
||||
m_name, chNo, slot, dstId);
|
||||
}
|
||||
|
||||
m_grantChTable[dstId] = 0U;
|
||||
m_grantChSlotTable.erase(dstId);
|
||||
|
||||
auto it = std::find(m_rfChTable.begin(), m_rfChTable.end(), chNo);
|
||||
if (it == m_rfChTable.end()) {
|
||||
m_rfChTable.push_back(chNo);
|
||||
}
|
||||
|
||||
if (m_rfGrantChCnt > 0U) {
|
||||
m_rfGrantChCnt--;
|
||||
}
|
||||
else {
|
||||
m_rfGrantChCnt = 0U;
|
||||
}
|
||||
|
||||
m_grantTimers[dstId].stop();
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to determine if the channel number is busy.
|
||||
/// </summary>
|
||||
/// <param name="chNo"></param>
|
||||
/// <returns></returns>
|
||||
bool DMRAffiliationLookup::isChBusy(uint32_t chNo) const
|
||||
{
|
||||
if (chNo == 0U) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// lookup dynamic channel grant table entry
|
||||
for (auto it = m_grantChTable.begin(); it != m_grantChTable.end(); ++it) {
|
||||
if (it->second == chNo) {
|
||||
uint8_t slotCount = 0U;
|
||||
if (chNo == m_tsccChNo) {
|
||||
slotCount++; // one slot is *always* used for TSCC
|
||||
}
|
||||
|
||||
for (auto it = m_grantChSlotTable.begin(); it != m_grantChSlotTable.end(); ++it) {
|
||||
uint32_t foundChNo = std::get<0>(it->second);
|
||||
if (foundChNo == chNo)
|
||||
slotCount++;
|
||||
}
|
||||
|
||||
if (slotCount == 2U) {
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to get the slot granted for the given destination ID.
|
||||
/// </summary>
|
||||
/// <param name="dstId"></param>
|
||||
/// <returns></returns>
|
||||
uint8_t DMRAffiliationLookup::getGrantedSlot(uint32_t dstId) const
|
||||
{
|
||||
if (dstId == 0U) {
|
||||
return 0U;
|
||||
}
|
||||
|
||||
// lookup dynamic channel grant table entry
|
||||
for (auto it = m_grantChSlotTable.begin(); it != m_grantChSlotTable.end(); ++it) {
|
||||
if (it->first == dstId) {
|
||||
uint8_t slot = std::get<1>(it->second);
|
||||
return slot;
|
||||
}
|
||||
}
|
||||
|
||||
return 0U;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to set a slot for the given channel as being the TSCC.
|
||||
/// </summary>
|
||||
/// <param name="chNo"></param>
|
||||
/// <param name="slot"></param>
|
||||
/// <returns></returns>
|
||||
void DMRAffiliationLookup::setSlotForChannelTSCC(uint32_t chNo, uint8_t slot)
|
||||
{
|
||||
assert(chNo != 0U);
|
||||
if ((slot == 0U) || (slot > 2U)) {
|
||||
return;
|
||||
}
|
||||
|
||||
m_tsccChNo = chNo;
|
||||
m_tsccSlot = slot;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Helper to determine the first available slot for given the channel number.
|
||||
/// </summary>
|
||||
/// <param name="chNo"></param>
|
||||
/// <returns></returns>
|
||||
uint8_t DMRAffiliationLookup::getAvailableSlotForChannel(uint32_t chNo) const
|
||||
{
|
||||
if (chNo == 0U) {
|
||||
return 0U;
|
||||
}
|
||||
|
||||
uint8_t slot = 1U;
|
||||
|
||||
// lookup dynamic channel slot grant table entry
|
||||
bool grantedSlot = false;
|
||||
int slotCount = 0U;
|
||||
for (auto it = m_grantChSlotTable.begin(); it != m_grantChSlotTable.end(); ++it) {
|
||||
uint32_t foundChNo = std::get<0>(it->second);
|
||||
if (foundChNo == chNo)
|
||||
{
|
||||
uint8_t foundSlot = std::get<1>(it->second);
|
||||
if (slot == foundSlot) {
|
||||
switch (foundSlot) {
|
||||
case 1U:
|
||||
slot = 2U;
|
||||
break;
|
||||
case 2U:
|
||||
slot = 1U;
|
||||
break;
|
||||
}
|
||||
|
||||
grantedSlot = true;
|
||||
slotCount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (slotCount == 2U) {
|
||||
slot = 0U;
|
||||
return slot;
|
||||
}
|
||||
|
||||
// are we trying to assign the TSCC slot?
|
||||
if (chNo == m_tsccChNo && slot == m_tsccSlot) {
|
||||
if (!grantedSlot) {
|
||||
// since we didn't find a slot being granted out -- utilize the slot opposing the TSCC
|
||||
switch (m_tsccSlot) {
|
||||
case 1U:
|
||||
slot = 2U;
|
||||
break;
|
||||
case 2U:
|
||||
slot = 1U;
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
slot = 0U; // TSCC is not assignable
|
||||
}
|
||||
}
|
||||
|
||||
return slot;
|
||||
}
|
||||
@ -0,0 +1,77 @@
|
||||
/**
|
||||
* Digital Voice Modem - Host Software
|
||||
* GPLv2 Open Source. Use is subject to license terms.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* @package DVM / Host Software
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* Copyright (C) 2023 by Bryan Biedenkapp N2PLL
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
#if !defined(__DMR_AFFILIATION_LOOKUP_H__)
|
||||
#define __DMR_AFFILIATION_LOOKUP_H__
|
||||
|
||||
#include "Defines.h"
|
||||
#include "lookups/AffiliationLookup.h"
|
||||
|
||||
#include <tuple>
|
||||
|
||||
namespace dmr
|
||||
{
|
||||
namespace lookups
|
||||
{
|
||||
// ---------------------------------------------------------------------------
|
||||
// Class Declaration
|
||||
// Implements a lookup table class that contains DMR slot grant
|
||||
// information.
|
||||
// ---------------------------------------------------------------------------
|
||||
|
||||
class HOST_SW_API DMRAffiliationLookup : public ::lookups::AffiliationLookup {
|
||||
public:
|
||||
/// <summary>Initializes a new instance of the DMRAffiliationLookup class.</summary>
|
||||
DMRAffiliationLookup(bool verbose);
|
||||
/// <summary>Finalizes a instance of the DMRAffiliationLookup class.</summary>
|
||||
virtual ~DMRAffiliationLookup();
|
||||
|
||||
/// <summary>Helper to grant a channel.</summary>
|
||||
virtual bool grantCh(uint32_t dstId, uint32_t grantTimeout);
|
||||
/// <summary>Helper to grant a channel and slot.</summary>
|
||||
bool grantChSlot(uint32_t dstId, uint8_t slot, uint32_t grantTimeout);
|
||||
/// <summary>Helper to release the channel grant for the destination ID.</summary>
|
||||
virtual bool releaseGrant(uint32_t dstId, bool releaseAll);
|
||||
/// <summary>Helper to determine if the channel number is busy.</summary>
|
||||
virtual bool isChBusy(uint32_t chNo) const;
|
||||
/// <summary>Helper to get the slot granted for the given destination ID.</summary>
|
||||
uint8_t getGrantedSlot(uint32_t dstId) const;
|
||||
|
||||
/// <summary>Helper to set a slot for the given channel as being the TSCC.</summary>
|
||||
void setSlotForChannelTSCC(uint32_t chNo, uint8_t slot);
|
||||
|
||||
/// <summary>Helper to determine the first available slot for given the channel number.</summary>
|
||||
uint8_t getAvailableSlotForChannel(uint32_t chNo) const;
|
||||
|
||||
protected:
|
||||
std::unordered_map<uint32_t, std::tuple<uint32_t, uint8_t>> m_grantChSlotTable;
|
||||
|
||||
uint32_t m_tsccChNo;
|
||||
uint8_t m_tsccSlot;
|
||||
};
|
||||
} // namespace lookups
|
||||
} // namespace dmr
|
||||
|
||||
#endif // __DMR_AFFILIATION_LOOKUP_H__
|
||||
Loading…
Reference in new issue