GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-13 09:17:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

DMR: Fix Hytera Enhanced Not Muting Properly (OR SVC OPT enc bit);

Browse Source
This commit is contained in:
lwvmobile
2025-04-05 07:18:03 -04:00
parent 3312e14422
commit 19864225f6
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dmr_flco.c
View File

@@ -329,12 +329,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
{
if (slot == 0)
{
state->dmr_so |= 0x40; //OR the enc bit onto the SO
state->payload_algid = alg;
state->payload_keyid = key;
state->payload_mi = mi;
}
else
{
state->dmr_soR |= 0x40; //OR the enc bit onto the SO
state->payload_algidR = alg;
state->payload_keyidR = key;
state->payload_miR = mi;

2
src/dmr_pi.c
View File

@@ -30,6 +30,7 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
{
if (state->currentslot == 0)
{
state->dmr_so |= 0x40; //OR the enc bit onto the SO
state->payload_algid = PI_BYTE[0];
state->payload_keyid = PI_BYTE[2];
state->payload_mi = ((unsigned long long int)PI_BYTE[3] << 32ULL) | ((unsigned long long int)PI_BYTE[4] << 24) |
@@ -37,6 +38,7 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
}
else
{
state->dmr_soR |= 0x40; //OR the enc bit onto the SO
state->payload_algidR = PI_BYTE[0];
state->payload_keyidR = PI_BYTE[2];
state->payload_miR = ((unsigned long long int)PI_BYTE[3] << 32ULL) | ((unsigned long long int)PI_BYTE[4] << 24) |