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

DMR - Move CSBK Acknowledgements to Non MFID10;

Browse Source
This commit is contained in:
lwvmobile
2023-12-23 15:04:01 -05:00
parent b726cc8faf
commit e3c3d15dce
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dmr_csbk.c
View File

@@ -800,33 +800,37 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
fprintf (stderr, " C_ACKVIT (Ackvitation/Authorization) ");
}
if (csbk_o == 32 || csbk_o == 33 || csbk_o == 34 || csbk_o == 35)
if (csbk_fid != 0x10) //if Not Motorola
{
//initial line break
fprintf (stderr, "\n"); //(Acknowledgement)
if (csbk_o == 32) fprintf (stderr, " C_ACKD Outbound TSCC; ");
if (csbk_o == 33) fprintf (stderr, " C_ACKU Inbound TSCC; ");
if (csbk_o == 34) fprintf (stderr, " P_ACKD Outbound Payload; ");
if (csbk_o == 35) fprintf (stderr, " P_ACKU Inbound Payload; ");
//These opcodes to exist on CapMax as well, but don't function the same
if (csbk_o == 32 || csbk_o == 33 || csbk_o == 34 || csbk_o == 35)
{
//initial line break
fprintf (stderr, "\n"); //(Acknowledgement)
if (csbk_o == 32) fprintf (stderr, " C_ACKD Outbound TSCC; ");
if (csbk_o == 33) fprintf (stderr, " C_ACKU Inbound TSCC; ");
if (csbk_o == 34) fprintf (stderr, " P_ACKD Outbound Payload; ");
if (csbk_o == 35) fprintf (stderr, " P_ACKU Inbound Payload; ");
uint8_t response_info = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[16], 7);
uint8_t reason_code = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[23], 8);
uint8_t ack_res1 = cs_pdu_bits[31];
uint8_t response_info = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[16], 7);
uint8_t reason_code = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[23], 8);
uint8_t ack_res1 = cs_pdu_bits[31];
uint32_t ack_target = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[32], 24);
uint32_t ack_source = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[56], 24);
uint32_t ack_target = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[32], 24);
uint32_t ack_source = (uint32_t)ConvertBitIntoBytes(&cs_pdu_bits[56], 24);
//response_info and reason_code start to get really convoluted on decoding them
//for each opcode, so I am just going to put the values out to the console,
//look at ETSI TS 102 361-4 V1.12.1 7.2.7 for more info
//response_info and reason_code start to get really convoluted on decoding them
//for each opcode, so I am just going to put the values out to the console,
//look at ETSI TS 102 361-4 V1.12.1 7.2.7 for more info
fprintf (stderr, "Response: %02X; Reason: %02X; ", response_info, reason_code);
if (ack_res1) fprintf (stderr, " Res: %d", ack_res1);
fprintf (stderr, "Target: %d; Source: %d; ", ack_target, ack_source);
fprintf (stderr, "Response: %02X; Reason: %02X; ", response_info, reason_code);
if (ack_res1) fprintf (stderr, " Res: %d", ack_res1);
fprintf (stderr, "Target: %d; Source: %d; ", ack_target, ack_source);
//check the source and/or target for special gateway identifiers
dmr_gateway_identifier (ack_source, ack_target);
//check the source and/or target for special gateway identifiers
dmr_gateway_identifier (ack_source, ack_target);
}
}
if (csbk_o == 31)