From 29cd61fdcda768983cce0e2c2d21180e6a5cccd3 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Tue, 26 Sep 2023 08:54:08 -0400 Subject: [PATCH] P25 -- Fix Alignment; Fix Compiler Warning; --- src/p25p1_tsbk.c | 14 +++++++------- src/p25p2_vpdu.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c index 7b948a5..f9167d3 100644 --- a/src/p25p1_tsbk.c +++ b/src/p25p1_tsbk.c @@ -153,14 +153,14 @@ void processTSBK(dsd_opts * opts, dsd_state * state) fprintf (stderr, " %s",KNRM); //This seems to follow the same structure as the MFID 90 Group Regroup Add Command - - //MFID A4 Opcode 1 on TSBK / Opcode 0x41 on vPDU - // P25 PDU Payload #1 [81][A4] [11][0D] [83][4E] [84][2A] [84][EE] -------[39][30] - // MFID A4 Protected: 0 Last Block: 1 - //these values do seem to change, but not often, but seem to pair up into 16-bit values - // P25 PDU Payload #1 [81][A4] [11][0D] [84][2A] [84][EE] [FF][FF] -------[4D][2F] - // MFID A4 Protected: 0 Last Block: 1 + //MFID A4 Opcode 1 on TSBK / Opcode 0x41 on vPDU + // P25 PDU Payload #1 [81][A4] [11][0D] [83][4E] [84][2A] [84][EE] -------[39][30] + // MFID A4 Protected: 0 Last Block: 1 + + //these values do seem to change, but not often, but seem to pair up into 16-bit values + // P25 PDU Payload #1 [81][A4] [11][0D] [84][2A] [84][EE] [FF][FF] -------[4D][2F] + // MFID A4 Protected: 0 Last Block: 1 } diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c index e7a4166..5f932c2 100644 --- a/src/p25p2_vpdu.c +++ b/src/p25p2_vpdu.c @@ -1177,9 +1177,9 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon int res = MAC[3+len_a] >> 6; if (len > 24) len = 24; //should never exceed this len, but just in case it does - fprintf (stderr, "\n MFID A4 (Harris); Res: %d; Len: %d; Opcode: %02X; ", res, len, MAC[1+len_a]); + fprintf (stderr, "\n MFID A4 (Harris); Res: %d; Len: %d; Opcode: %02llX; ", res, len, MAC[1+len_a]); for (i = 1; i < len; i++) - fprintf (stderr, "%02X", MAC[i+len_a]); //might not be a good idea to run this, or it may overflow + fprintf (stderr, "%02llX", MAC[i+len_a]); //might not be a good idea to run this, or it may overflow }