mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-16 18:57:24 -05:00
DMR Additions
--Easier to use key entry for privacy modes ---Serpen'tera' 10 mode now available --Slightly improved dmr dibit buffering/inverted dibit buffering --Tweaks to console and ncurses output regarding FID, SVC, and privacy key values --fix for RTL optional support (think I have all the ifdef covered now) --TGT, SRC, FID, SVC, now set on Voice LC Header (not sure why I wasn't before) --other misc tweaks that I can't recall
This commit is contained in:
@@ -72,7 +72,7 @@ int BP[256] = {
|
||||
};
|
||||
|
||||
|
||||
if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0)
|
||||
if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x10)
|
||||
{
|
||||
fprintf (stderr, "%s", KYEL);
|
||||
fprintf(stderr, " BPK %lld", state->K);
|
||||
@@ -93,7 +93,7 @@ if (state->currentslot == 0 && state->K > 0 && state->dmr_so & 0x40 && state->pa
|
||||
}
|
||||
}
|
||||
|
||||
if (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0)
|
||||
if (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x10)
|
||||
{
|
||||
fprintf (stderr, "%s", KYEL);
|
||||
fprintf(stderr, " BPK %lld", state->K);
|
||||
@@ -114,6 +114,70 @@ if (state->currentslot == 1 && state->K > 0 && state->dmr_soR & 0x40 && state->p
|
||||
}
|
||||
}
|
||||
|
||||
if (state->currentslot == 0 && state->H > 0 && state->dmr_so & 0x40 && state->payload_keyid == 0 && state->dmr_fid == 0x68)
|
||||
{
|
||||
|
||||
fprintf (stderr, "%s", KYEL);
|
||||
fprintf(stderr, " HYT %010llX", state->H);
|
||||
fprintf (stderr, "%s", KNRM);
|
||||
k = state->H;
|
||||
|
||||
unsigned long long int msb = 0;
|
||||
|
||||
k = k << 8;
|
||||
k = k | ((k >> 40) & 0xFF);
|
||||
|
||||
for(Frame = 0; Frame < 6; Frame++)
|
||||
{
|
||||
for(i = 0; i < 3; i++)
|
||||
{
|
||||
for(j = 0; j < 48; j++)
|
||||
{
|
||||
x = ( ((k << j) & 0x800000000000) >> 47 );
|
||||
TSVoiceSupFrameL->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= x;
|
||||
}
|
||||
|
||||
k = k << 1;
|
||||
msb = (k >> 32) & 0xFFFF;
|
||||
k = (k << 8) & 0xFFFFFFFF0000;
|
||||
k = k | msb;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (state->currentslot == 1 && state->H > 0 && state->dmr_soR & 0x40 && state->payload_keyidR == 0 && state->dmr_fidR == 0x68)
|
||||
{
|
||||
|
||||
fprintf (stderr, "%s", KYEL);
|
||||
fprintf(stderr, " HYT %010llX", state->H);
|
||||
fprintf (stderr, "%s", KNRM);
|
||||
k = state->H;
|
||||
|
||||
unsigned long long int msb = 0;
|
||||
|
||||
k = k << 8;
|
||||
k = k | ((k >> 40) & 0xFF);
|
||||
|
||||
for(Frame = 0; Frame < 6; Frame++)
|
||||
{
|
||||
for(i = 0; i < 3; i++)
|
||||
{
|
||||
for(j = 0; j < 48; j++)
|
||||
{
|
||||
x = ( ((k << j) & 0x800000000000) >> 47 );
|
||||
TSVoiceSupFrameR->TimeSlotAmbeVoiceFrame[Frame].AmbeBit[i][j] ^= x;
|
||||
}
|
||||
|
||||
k = k << 1;
|
||||
msb = (k >> 32) & 0xFFFF;
|
||||
k = (k << 8) & 0xFFFFFFFF0000;
|
||||
k = k | msb;
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (state->currentslot == 0)
|
||||
{
|
||||
|
||||
|
||||
Reference in New Issue
Block a user