Skip to content

Commit

Permalink
Clean up the OVCM CSBK code.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonathan Naylor committed Nov 7, 2019
1 parent e74df48 commit 231efdf
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions DMRCSBK.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2015,2016 by Jonathan Naylor G4KLX
* Copyright (C) 2019 by Patrick Maier DK5MP
*
* 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
Expand Down Expand Up @@ -156,17 +157,15 @@ bool CDMRCSBK::getOVCM() const
// "Unit to Unit Voice Service Request CSBK" and
// "Unit to Unit Voice Service Answer Response CSBK"
if ((m_CSBKO == CSBKO_UUVREQ) || (m_CSBKO == CSBKO_UUANSRSP))
{
bOVCM = (m_data[2U] & 0x04U) == 0x04U;
}

return bOVCM;
}

void CDMRCSBK::setOVCM(bool ovcm)
{
// Set OVCM only in CSBKs having the service options information
if ((m_CSBKO == CSBKO_UUVREQ) || (m_CSBKO == CSBKO_UUANSRSP))
{
if ((m_CSBKO == CSBKO_UUVREQ) || (m_CSBKO == CSBKO_UUANSRSP)) {
if (ovcm)
m_data[2U] |= 0x04U;
else
Expand Down

0 comments on commit 231efdf

Please sign in to comment.