GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-15 10:07:26 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Global rename of BitSetBuffer to BinaryMessage.

Browse Source 
Corrected issue in P25 NID error correction.
This commit is contained in:
dennis.sheirer
2015-01-24 13:37:42 +00:00
parent 871705ece8
commit 9310fb0daf
148 changed files with 513 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class AdjacentStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierProvider;
private IdentifierProvider mReceiveIdentifierProvider;
public AdjacentStatusBroadcastExtended( BitSetBuffer message,
public AdjacentStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/CallAlertExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class CallAlertExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public CallAlertExtended( BitSetBuffer message,
public CallAlertExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class GroupAffiliationQueryExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public GroupAffiliationQueryExtended( BitSetBuffer message,
public GroupAffiliationQueryExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -31,14 +31,15 @@ public class GroupAffiliationResponseExtended extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public GroupAffiliationResponseExtended( BitSetBuffer message,
public GroupAffiliationResponseExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -23,14 +23,15 @@ public class MessageUpdateExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public MessageUpdateExtended( BitSetBuffer message,
public MessageUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class NetworkStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public NetworkStatusBroadcastExtended( BitSetBuffer message,
public NetworkStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Encryption;
@@ -35,14 +35,15 @@ public class ProtectionParameterBroadcast extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public ProtectionParameterBroadcast( BitSetBuffer message,
public ProtectionParameterBroadcast( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.IdentifierProvider;
import decode.p25.message.IdentifierReceiver;
import decode.p25.message.pdu.PDUMessage;
@@ -34,14 +34,15 @@ public class RFSSStatusBroadcastExtended extends PDUMessage
private IdentifierProvider mTransmitIdentifierUpdate;
private IdentifierProvider mReceiveIdentifierUpdate;
public RFSSStatusBroadcastExtended( BitSetBuffer message,
public RFSSStatusBroadcastExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

18
src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java
View File

@@ -1,11 +1,11 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.P25MessageFramer;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
import dsp.fsk.P25MessageFramer;
import edac.CRCP25;
public class RoamingAddressUpdateExtended extends PDUMessage
@@ -62,7 +62,7 @@ public class RoamingAddressUpdateExtended extends PDUMessage
private Format mFormat;
public RoamingAddressUpdateExtended( BitSetBuffer message,
public RoamingAddressUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
@@ -73,7 +73,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else if( mMessage.size() == P25MessageFramer.PDU3_BEGIN )
{
@@ -81,7 +82,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU2( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else if( mMessage.size() == P25MessageFramer.PDU3_DECODED_END )
{
@@ -89,7 +91,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU3( mMessage );
mMessage = CRCP25.correctPDU3( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
else
{
@@ -97,7 +100,8 @@ public class RoamingAddressUpdateExtended extends PDUMessage
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
}

7
src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -21,14 +21,15 @@ public class StatusQueryExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public StatusQueryExtended( BitSetBuffer message,
public StatusQueryExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -23,14 +23,15 @@ public class StatusUpdateExtended extends PDUMessage
230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,
248,249,250,251,252,253,254,255 };
public StatusUpdateExtended( BitSetBuffer message,
public StatusUpdateExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU1( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override

7
src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java
View File

@@ -1,7 +1,7 @@
package decode.p25.message.pdu.osp.control;
import alias.AliasList;
import bits.BitSetBuffer;
import bits.BinaryMessage;
import decode.p25.message.pdu.PDUMessage;
import decode.p25.reference.DataUnitID;
import decode.p25.reference.Opcode;
@@ -25,14 +25,15 @@ public class UnitRegistrationResponseExtended extends PDUMessage
326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,
343,344,345,346,347,348,349,350,351 };
public UnitRegistrationResponseExtended( BitSetBuffer message,
public UnitRegistrationResponseExtended( BinaryMessage message,
DataUnitID duid, AliasList aliasList )
{
super( message, duid, aliasList );
/* Header block is already error detected/corrected - perform error
* detection correction on the intermediate and final data blocks */
mCRC[ 1 ] = CRCP25.correctPDU2( mMessage );
mMessage = CRCP25.correctPDU1( mMessage );
mCRC[ 1 ] = mMessage.getCRC();
}
@Override