Moto Alias for MAC vPDU Setup;

Seperate P25 Moto Alias Block Function from Alias Decode Function;

Move Code to dsd_alias.c;
This commit is contained in:
lwvmobile
2025-02-05 23:39:25 -05:00
parent 8cfaced4b4
commit 29ee3a5f3a
6 changed files with 351 additions and 237 deletions

View File

@@ -15,7 +15,7 @@ static const uint8_t mac_msg_len[256] = {
0, 14, 15, 0, 0, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //2F
5, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //3F
9, 7, 9, 0, 9, 8, 9, 0, 10, 10, 9, 0, 10, 0, 0, 0, //4F
0, 0, 0, 0, 9, 7, 0, 0, 10, 0, 7, 0, 10, 8, 14, 7, //5F
0, 0, 0, 0, 9, 7, 0, 0, 10, 0, 7, 9, 10, 8, 14, 9, //5F (5B was 0, 5F was 7, changed both to 9 to match LCW, but that may not be completely accurate)
9, 9, 0, 0, 9, 0, 0, 9, 10, 0, 7, 10, 10, 7, 0, 9, //6F
9, 29, 9, 9, 9, 9, 10, 13, 9, 9, 9, 11, 9, 9, 0, 0, //7F
8, 18, 0, 7, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, //8F (needed to add 81 and 8f for Harris)
@@ -1634,6 +1634,25 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
fprintf (stderr, "\n MFID90 Group Regroup Add Command ");
}
//look for these in logs (these may need a corrected value set for 5B and 5F in len table)
if (MAC[1+len_a] == 0x5B && MAC[2+len_a] == 0x90)
{
uint8_t len = MAC[3+len_a];
uint8_t mac_bits[24*8]; memset (mac_bits, 0, sizeof(mac_bits));
unpack_byte_array_into_bit_array((uint8_t *)MAC+len_a, mac_bits, len);
fprintf (stderr, " MFID90 (Moto) Talker Alias Header");
// apx_embedded_alias_header_phase2 (opts, state, state->currentslot, mac_bits);
}
if (MAC[1+len_a] == 0x5F && MAC[2+len_a] == 0x90)
{
uint8_t len = MAC[3+len_a];
uint8_t mac_bits[24*8]; memset (mac_bits, 0, sizeof(mac_bits));
unpack_byte_array_into_bit_array((uint8_t *)MAC+len_a, mac_bits, len);
fprintf (stderr, " MFID90 (Moto) Talker Alias Block");
// apx_embedded_alias_blocks_phase2 (opts, state, state->currentslot, mac_bits);
}
//System Service Broadcast
if (MAC[1+len_a] == 0x78)
{