diff --git a/src/bits/BitSetBuffer.java b/src/bits/BinaryMessage.java similarity index 91% rename from src/bits/BitSetBuffer.java rename to src/bits/BinaryMessage.java index 480b78c9..17c5ce39 100644 --- a/src/bits/BitSetBuffer.java +++ b/src/bits/BinaryMessage.java @@ -22,9 +22,11 @@ import java.util.BitSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class BitSetBuffer extends BitSet +import edac.CRC; + +public class BinaryMessage extends BitSet { - private final static Logger mLog = LoggerFactory.getLogger( BitSetBuffer.class ); + private final static Logger mLog = LoggerFactory.getLogger( BinaryMessage.class ); private static final long serialVersionUID = 1L; @@ -48,7 +50,14 @@ public class BitSetBuffer extends BitSet * that the size parameter specified. * @param size */ - public BitSetBuffer( int size ) + + /** + * Used for temporary storage of CRC check results when we're passing this + * message to an EDAC function. + */ + private CRC mCRC; + + public BinaryMessage( int size ) { super( size ); mSize = size; @@ -62,7 +71,7 @@ public class BitSetBuffer extends BitSet * @param size * @param bitsToPreload */ - public BitSetBuffer( int size, boolean[] bitsToPreload ) + public BinaryMessage( int size, boolean[] bitsToPreload ) { this( size ); @@ -86,20 +95,30 @@ public class BitSetBuffer extends BitSet /** * Constructs a new BitSetBuffer from an existing one */ - private BitSetBuffer( BitSetBuffer toCopyFrom ) + private BinaryMessage( BinaryMessage toCopyFrom ) { this( toCopyFrom.size() ); this.or( toCopyFrom ); this.mPointer = toCopyFrom.pointer(); } - public BitSetBuffer( BitSet bitset, int size ) + public BinaryMessage( BitSet bitset, int size ) { this( size ); this.or( bitset ); this.mPointer = size - 1; } + public CRC getCRC() + { + return mCRC; + } + + public void setCRC( CRC crc ) + { + mCRC = crc; + } + /** * Current pointer index */ @@ -136,9 +155,9 @@ public class BitSetBuffer extends BitSet * @param bitsetToAppend - full bitset to be appended to the residual bits array * @return - new Bitset preloaded with residual bits and new bitset */ - public static BitSetBuffer merge( boolean[] preloadBits, BitSetBuffer bitsetToAppend ) + public static BinaryMessage merge( boolean[] preloadBits, BinaryMessage bitsetToAppend ) { - BitSetBuffer returnValue = new BitSetBuffer( preloadBits.length + bitsetToAppend.size(), preloadBits ); + BinaryMessage returnValue = new BinaryMessage( preloadBits.length + bitsetToAppend.size(), preloadBits ); int pointer = 0; @@ -163,9 +182,9 @@ public class BitSetBuffer extends BitSet * Returns a (new) copy of this bitsetbuffer * @return */ - public BitSetBuffer copy() + public BinaryMessage copy() { - return new BitSetBuffer( this ); + return new BinaryMessage( this ); } public boolean isFull() @@ -251,14 +270,15 @@ public class BitSetBuffer extends BitSet /** * Returns this bitset as a reversed bit order array of integer ones and zeros + * from the specified index range */ - public int[] toReverseIntegerArray() + public int[] toReverseIntegerArray( int start, int end ) { - int[] values = new int[ mSize ]; + int[] values = new int[ end - start + 1 ]; - for (int i = nextSetBit( 0 ); i >= 0 && i < mSize; i = nextSetBit( i+1 ) ) + for (int i = nextSetBit( start ); i >= start && i <= end; i = nextSetBit( i+1 ) ) { - values[ mSize - i - 1 ] = 1; + values[ end - i ] = 1; } return values; @@ -531,9 +551,9 @@ public class BitSetBuffer extends BitSet * @param fill - initial fill value * @return - filled buffer */ - public static BitSetBuffer getBuffer( int width, long fill ) + public static BinaryMessage getBuffer( int width, long fill ) { - BitSetBuffer buffer = new BitSetBuffer( width ); + BinaryMessage buffer = new BinaryMessage( width ); buffer.load( 0, width, fill ); @@ -596,7 +616,7 @@ public class BitSetBuffer extends BitSet * @param message - string containing only zeros and ones * @return - loaded buffer */ - public static BitSetBuffer load( String message ) + public static BinaryMessage load( String message ) { if( !message.matches( "[01]*" ) ) { @@ -604,7 +624,7 @@ public class BitSetBuffer extends BitSet "Message must contain only zeros and ones" ); } - BitSetBuffer buffer = new BitSetBuffer( message.length() ); + BinaryMessage buffer = new BinaryMessage( message.length() ); for( int x = 0; x < message.length(); x++ ) { @@ -705,7 +725,7 @@ public class BitSetBuffer extends BitSet */ public void xor( int offset, int width, int value ) { - BitSetBuffer mask = new BitSetBuffer( this.size() ); + BinaryMessage mask = new BinaryMessage( this.size() ); mask.load( offset, width, value ); diff --git a/src/bits/MessageFramer.java b/src/bits/MessageFramer.java index 4be914da..99d07888 100644 --- a/src/bits/MessageFramer.java +++ b/src/bits/MessageFramer.java @@ -22,8 +22,8 @@ import java.util.Iterator; import sample.Broadcaster; import sample.Listener; -import dsp.SyncDetectListener; -import dsp.SyncDetectProvider; +import dsp.symbol.SyncDetectListener; +import dsp.symbol.SyncDetectProvider; /** * MessageFramer - processes bitsets looking for a sync pattern within @@ -39,15 +39,15 @@ public class MessageFramer implements Listener, private boolean[] mSyncPattern; private int mMessageLength; private SyncDetectListener mSyncDetectListener; - private Broadcaster mBroadcaster = - new Broadcaster(); + private Broadcaster mBroadcaster = + new Broadcaster(); private ArrayList mMessageAssemblers = new ArrayList(); private ArrayList mCompletedMessageAssemblers = new ArrayList(); - private BitSetBuffer mPreviousBuffer = null; + private BinaryMessage mPreviousBuffer = null; private SyncPatternMatcher mMatcher; @@ -127,12 +127,12 @@ public class MessageFramer implements Listener, * Allow a message listener to register with this framer to receive * all framed messages */ - public void addMessageListener( Listener listener ) + public void addMessageListener( Listener listener ) { mBroadcaster.addListener( listener ); } - public void removeMessageListener( Listener listener ) + public void removeMessageListener( Listener listener ) { mBroadcaster.removeListener( listener ); } @@ -161,12 +161,12 @@ public class MessageFramer implements Listener, */ private class MessageAssembler implements Listener { - BitSetBuffer mMessage; + BinaryMessage mMessage; boolean mComplete = false; MessageAssembler( int messageLength ) { - mMessage = new BitSetBuffer( messageLength ); + mMessage = new BinaryMessage( messageLength ); } MessageAssembler( int messageLength, boolean[] initialFill ) diff --git a/src/decode/fleetsync1/Fleetsync1Message.java b/src/decode/fleetsync1/Fleetsync1Message.java index 8e45d25b..e218ec26 100644 --- a/src/decode/fleetsync1/Fleetsync1Message.java +++ b/src/decode/fleetsync1/Fleetsync1Message.java @@ -23,15 +23,15 @@ import java.util.Date; import map.Plottable; import message.Message; import alias.Alias; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class Fleetsync1Message extends Message { private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; - public Fleetsync1Message( BitSetBuffer message ) + public Fleetsync1Message( BinaryMessage message ) { mMessage = message; } diff --git a/src/decode/fleetsync1/Fleetsync1MessageProcessor.java b/src/decode/fleetsync1/Fleetsync1MessageProcessor.java index 47a65fbc..8890d5a5 100644 --- a/src/decode/fleetsync1/Fleetsync1MessageProcessor.java +++ b/src/decode/fleetsync1/Fleetsync1MessageProcessor.java @@ -24,9 +24,9 @@ import org.slf4j.LoggerFactory; import sample.Broadcaster; import sample.Listener; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class Fleetsync1MessageProcessor implements Listener +public class Fleetsync1MessageProcessor implements Listener { private final static Logger mLog = LoggerFactory.getLogger( Fleetsync1MessageProcessor.class ); @@ -34,7 +34,7 @@ public class Fleetsync1MessageProcessor implements Listener private Broadcaster mBroadcaster = new Broadcaster(); @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { Fleetsync1Message message = new Fleetsync1Message( buffer ); diff --git a/src/decode/fleetsync2/Fleetsync2MessageProcessor.java b/src/decode/fleetsync2/Fleetsync2MessageProcessor.java index 1c5f7dda..5bf85d02 100644 --- a/src/decode/fleetsync2/Fleetsync2MessageProcessor.java +++ b/src/decode/fleetsync2/Fleetsync2MessageProcessor.java @@ -21,9 +21,9 @@ import message.Message; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class Fleetsync2MessageProcessor implements Listener +public class Fleetsync2MessageProcessor implements Listener { private Broadcaster mBroadcaster = new Broadcaster(); @@ -40,7 +40,7 @@ public class Fleetsync2MessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { FleetsyncMessage message = new FleetsyncMessage( buffer, mAliasList ); diff --git a/src/decode/fleetsync2/FleetsyncMessage.java b/src/decode/fleetsync2/FleetsyncMessage.java index 656e3d80..998d4242 100644 --- a/src/decode/fleetsync2/FleetsyncMessage.java +++ b/src/decode/fleetsync2/FleetsyncMessage.java @@ -31,7 +31,7 @@ import org.jdesktop.swingx.mapviewer.GeoPosition; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; import edac.CRCFleetsync; @@ -111,11 +111,11 @@ public class FleetsyncMessage extends Message private static int[] sGPSSpeedFractional = { 499,498,497,496,495,494,493,492 }; private static int[] sCRC8 = { 532,531,530,529,528,527,526,525,524,523,522,521,520,519,518,517 }; - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private CRC[] mCRC = new CRC[ 8 ]; private AliasList mAliasList; - public FleetsyncMessage( BitSetBuffer message, AliasList list ) + public FleetsyncMessage( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/lj1200/LJ1200Message.java b/src/decode/lj1200/LJ1200Message.java index 2685ed7e..29b30417 100644 --- a/src/decode/lj1200/LJ1200Message.java +++ b/src/decode/lj1200/LJ1200Message.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; import edac.CRCLJ; @@ -65,11 +65,11 @@ public class LJ1200Message extends Message private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" ); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private AliasList mAliasList; private CRC mCRC; - public LJ1200Message( BitSetBuffer message, AliasList list ) + public LJ1200Message( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/lj1200/LJ1200MessageProcessor.java b/src/decode/lj1200/LJ1200MessageProcessor.java index ef865e40..0d4378f2 100644 --- a/src/decode/lj1200/LJ1200MessageProcessor.java +++ b/src/decode/lj1200/LJ1200MessageProcessor.java @@ -25,9 +25,9 @@ import org.slf4j.LoggerFactory; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class LJ1200MessageProcessor implements Listener +public class LJ1200MessageProcessor implements Listener { private final static Logger mLog = LoggerFactory.getLogger( LJ1200MessageProcessor.class ); @@ -52,7 +52,7 @@ public class LJ1200MessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { int sync = buffer.getInt( SYNC ); diff --git a/src/decode/lj1200/LJ1200TransponderMessage.java b/src/decode/lj1200/LJ1200TransponderMessage.java index 7f76676c..9ba9b7c8 100644 --- a/src/decode/lj1200/LJ1200TransponderMessage.java +++ b/src/decode/lj1200/LJ1200TransponderMessage.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; import edac.CRCLJ; @@ -41,11 +41,11 @@ public class LJ1200TransponderMessage extends Message private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" ); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private AliasList mAliasList; private CRC mCRC; - public LJ1200TransponderMessage( BitSetBuffer message, AliasList list ) + public LJ1200TransponderMessage( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/ltrnet/LTRNetISWMessage.java b/src/decode/ltrnet/LTRNetISWMessage.java index 28ea3715..119a810a 100644 --- a/src/decode/ltrnet/LTRNetISWMessage.java +++ b/src/decode/ltrnet/LTRNetISWMessage.java @@ -24,7 +24,7 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; import edac.CRCLTR; @@ -41,7 +41,7 @@ public class LTRNetISWMessage extends LTRNetMessage private LTRNetISWMessage mAuxMessage; - public LTRNetISWMessage( BitSetBuffer message, AliasList list ) + public LTRNetISWMessage( BinaryMessage message, AliasList list ) { super( message, MessageDirection.ISW, list ); diff --git a/src/decode/ltrnet/LTRNetMessage.java b/src/decode/ltrnet/LTRNetMessage.java index fea6aefc..05f57150 100644 --- a/src/decode/ltrnet/LTRNetMessage.java +++ b/src/decode/ltrnet/LTRNetMessage.java @@ -25,7 +25,7 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.DecoderType; import edac.CRC; import edac.CRCLTR; @@ -49,12 +49,12 @@ public abstract class LTRNetMessage extends Message protected static final int[] sSIXTEEN_BITS = { 32,31,30,29,28,27,26,25,24,23,22,21,20,19,18,17 }; protected static final int[] sMANUFACTURER_ID = { 23,22,21,20,19,18,17 }; - protected BitSetBuffer mMessage; + protected BinaryMessage mMessage; protected MessageType mMessageType; protected CRC mCRC; protected AliasList mAliasList; - public LTRNetMessage( BitSetBuffer message, + public LTRNetMessage( BinaryMessage message, MessageDirection direction, AliasList list ) { diff --git a/src/decode/ltrnet/LTRNetMessageProcessor.java b/src/decode/ltrnet/LTRNetMessageProcessor.java index 5377eff9..7a7dcc19 100644 --- a/src/decode/ltrnet/LTRNetMessageProcessor.java +++ b/src/decode/ltrnet/LTRNetMessageProcessor.java @@ -25,9 +25,9 @@ import message.MessageType; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class LTRNetMessageProcessor implements Listener +public class LTRNetMessageProcessor implements Listener { private Broadcaster mBroadcaster = new Broadcaster(); @@ -55,7 +55,7 @@ public class LTRNetMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { LTRNetMessage message; diff --git a/src/decode/ltrnet/LTRNetOSWMessage.java b/src/decode/ltrnet/LTRNetOSWMessage.java index 67d7ba42..abb752f1 100644 --- a/src/decode/ltrnet/LTRNetOSWMessage.java +++ b/src/decode/ltrnet/LTRNetOSWMessage.java @@ -25,7 +25,7 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class LTRNetOSWMessage extends LTRNetMessage { @@ -53,7 +53,7 @@ public class LTRNetOSWMessage extends LTRNetMessage private LTRNetOSWMessage mAuxMessage; - public LTRNetOSWMessage( BitSetBuffer message, AliasList list ) + public LTRNetOSWMessage( BinaryMessage message, AliasList list ) { super( message, MessageDirection.OSW, list ); mMessageType = getType(); diff --git a/src/decode/ltrstandard/LTRStandardISWMessage.java b/src/decode/ltrstandard/LTRStandardISWMessage.java index 5d87d599..f3f08737 100644 --- a/src/decode/ltrstandard/LTRStandardISWMessage.java +++ b/src/decode/ltrstandard/LTRStandardISWMessage.java @@ -24,14 +24,14 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class LTRStandardISWMessage extends LTRStandardMessage { private static final int sCALL_END = 31; private static final int sIDLE = 255; - public LTRStandardISWMessage( BitSetBuffer message, AliasList list ) + public LTRStandardISWMessage( BinaryMessage message, AliasList list ) { super( message, MessageDirection.OSW, list ); mMessageType = getType(); diff --git a/src/decode/ltrstandard/LTRStandardMessage.java b/src/decode/ltrstandard/LTRStandardMessage.java index cba8609b..b598d58c 100644 --- a/src/decode/ltrstandard/LTRStandardMessage.java +++ b/src/decode/ltrstandard/LTRStandardMessage.java @@ -25,7 +25,7 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.DecoderType; import edac.CRC; import edac.CRCLTR; @@ -47,12 +47,12 @@ public abstract class LTRStandardMessage extends Message protected static final int[] sFREE = { 32,31,30,29,28 }; protected static final int[] sCRC = { 39,38,37,36,35,34,33 }; - protected BitSetBuffer mMessage; + protected BinaryMessage mMessage; protected MessageType mMessageType; protected CRC mCRC; protected AliasList mAliasList; - public LTRStandardMessage( BitSetBuffer message, + public LTRStandardMessage( BinaryMessage message, MessageDirection direction, AliasList list ) { diff --git a/src/decode/ltrstandard/LTRStandardMessageProcessor.java b/src/decode/ltrstandard/LTRStandardMessageProcessor.java index 990670a0..510eac6c 100644 --- a/src/decode/ltrstandard/LTRStandardMessageProcessor.java +++ b/src/decode/ltrstandard/LTRStandardMessageProcessor.java @@ -22,9 +22,9 @@ import message.MessageDirection; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class LTRStandardMessageProcessor implements Listener +public class LTRStandardMessageProcessor implements Listener { private MessageDirection mDirection; private Broadcaster mBroadcaster = new Broadcaster(); @@ -37,7 +37,7 @@ public class LTRStandardMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { LTRStandardMessage message; diff --git a/src/decode/ltrstandard/LTRStandardOSWMessage.java b/src/decode/ltrstandard/LTRStandardOSWMessage.java index ed44f2d2..06b897e1 100644 --- a/src/decode/ltrstandard/LTRStandardOSWMessage.java +++ b/src/decode/ltrstandard/LTRStandardOSWMessage.java @@ -24,14 +24,14 @@ import message.MessageDirection; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class LTRStandardOSWMessage extends LTRStandardMessage { private static final int sCALL_END = 31; private static final int sIDLE = 255; - public LTRStandardOSWMessage( BitSetBuffer message, AliasList list ) + public LTRStandardOSWMessage( BinaryMessage message, AliasList list ) { super( message, MessageDirection.OSW, list ); mMessageType = getType(); diff --git a/src/decode/mdc1200/MDCMessage.java b/src/decode/mdc1200/MDCMessage.java index 4e1cb16f..3e83fa3e 100644 --- a/src/decode/mdc1200/MDCMessage.java +++ b/src/decode/mdc1200/MDCMessage.java @@ -24,7 +24,7 @@ import map.Plottable; import message.Message; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class MDCMessage extends Message { @@ -48,10 +48,10 @@ public class MDCMessage extends Message private static int[] sDIGIT_4 = { 67,66,65,64 }; private static int[] sDIGIT_3 = { 71,70,69,68 }; - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private AliasList mAliasList; - public MDCMessage( BitSetBuffer message, AliasList list ) + public MDCMessage( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/mdc1200/MDCMessageProcessor.java b/src/decode/mdc1200/MDCMessageProcessor.java index 84fd2221..a5070666 100644 --- a/src/decode/mdc1200/MDCMessageProcessor.java +++ b/src/decode/mdc1200/MDCMessageProcessor.java @@ -21,9 +21,9 @@ import message.Message; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class MDCMessageProcessor implements Listener +public class MDCMessageProcessor implements Listener { private static int sMESSAGE_LENGTH = 112; @@ -41,7 +41,7 @@ public class MDCMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { /** * De-interleave the 112 bits of message one, starting after the sync @@ -80,7 +80,7 @@ public class MDCMessageProcessor implements Listener * bit will be a 0 after decode, despite what is currently in the buffer, * in order to maintain correct polarity of the decoded message. */ - private void removeNRZIEncoding( BitSetBuffer buffer ) + private void removeNRZIEncoding( BinaryMessage buffer ) { /** * Clear bit position 0, the first bit of the sync pattern, to start @@ -111,7 +111,7 @@ public class MDCMessageProcessor implements Listener /** * Deinterleaves a 112-bit packet, starting at the offset into the buffer */ - private void deinterleave( BitSetBuffer buffer, int offset ) + private void deinterleave( BinaryMessage buffer, int offset ) { if( buffer.size() < sMESSAGE_LENGTH + offset ) { @@ -119,7 +119,7 @@ public class MDCMessageProcessor implements Listener + "cannot deinterleave message - message buffer too short" ); } - BitSetBuffer deinterleaved = new BitSetBuffer( 112 ); + BinaryMessage deinterleaved = new BinaryMessage( 112 ); int deinterleavedPointer = 0; diff --git a/src/decode/mpt1327/MPT1327Message.java b/src/decode/mpt1327/MPT1327Message.java index 30c41c84..27bacd1b 100644 --- a/src/decode/mpt1327/MPT1327Message.java +++ b/src/decode/mpt1327/MPT1327Message.java @@ -29,7 +29,7 @@ import map.Plottable; import message.Message; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; import edac.CRCFleetsync; @@ -123,12 +123,12 @@ public class MPT1327Message extends Message private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" ); Calendar mCalendar = new GregorianCalendar(); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private CRC[] mCRC = new CRC[ 5 ]; private AliasList mAliasList; private MPTMessageType mMessageType; - public MPT1327Message( BitSetBuffer message, AliasList list ) + public MPT1327Message( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/mpt1327/MPT1327MessageProcessor.java b/src/decode/mpt1327/MPT1327MessageProcessor.java index 5e36dfbe..1c73216a 100644 --- a/src/decode/mpt1327/MPT1327MessageProcessor.java +++ b/src/decode/mpt1327/MPT1327MessageProcessor.java @@ -21,9 +21,9 @@ import message.Message; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class MPT1327MessageProcessor implements Listener +public class MPT1327MessageProcessor implements Listener { private Broadcaster mBroadcaster = new Broadcaster(); @@ -40,7 +40,7 @@ public class MPT1327MessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { MPT1327Message message = new MPT1327Message( buffer, mAliasList ); diff --git a/src/dsp/fsk/C4FMFrameListener.java b/src/decode/p25/C4FMFrameListener.java similarity index 70% rename from src/dsp/fsk/C4FMFrameListener.java rename to src/decode/p25/C4FMFrameListener.java index 8cef52eb..ce4767c1 100644 --- a/src/dsp/fsk/C4FMFrameListener.java +++ b/src/decode/p25/C4FMFrameListener.java @@ -1,6 +1,6 @@ -package dsp.fsk; +package decode.p25; -import bits.BitSetBuffer; +import bits.BinaryMessage; public interface C4FMFrameListener { @@ -10,6 +10,6 @@ public interface C4FMFrameListener * @param buffer - framed message without the sync pattern * @param inverted - flag indicating if the message was received inverted */ - public void receive( BitSetBuffer buffer, boolean inverted ); + public void receive( BinaryMessage buffer, boolean inverted ); } diff --git a/src/dsp/fsk/C4FMSlicer.java b/src/decode/p25/C4FMSlicer.java similarity index 97% rename from src/dsp/fsk/C4FMSlicer.java rename to src/decode/p25/C4FMSlicer.java index 199c4ce5..720c290e 100644 --- a/src/dsp/fsk/C4FMSlicer.java +++ b/src/decode/p25/C4FMSlicer.java @@ -1,5 +1,6 @@ -package dsp.fsk; +package decode.p25; +import dsp.symbol.Dibit; import sample.Broadcaster; import sample.Listener; import sample.real.RealSampleListener; diff --git a/src/dsp/fsk/C4FMSymbolFilter.java b/src/decode/p25/C4FMSymbolFilter.java similarity index 99% rename from src/dsp/fsk/C4FMSymbolFilter.java rename to src/decode/p25/C4FMSymbolFilter.java index e3ebd0de..4ce6445f 100644 --- a/src/dsp/fsk/C4FMSymbolFilter.java +++ b/src/decode/p25/C4FMSymbolFilter.java @@ -1,4 +1,4 @@ -package dsp.fsk; +package decode.p25; import instrument.Instrumentable; import instrument.tap.Tap; diff --git a/src/decode/p25/P25Decoder.java b/src/decode/p25/P25Decoder.java index cd1b8b84..39f786aa 100644 --- a/src/decode/p25/P25Decoder.java +++ b/src/decode/p25/P25Decoder.java @@ -39,12 +39,10 @@ import dsp.filter.ComplexFIRFilter; import dsp.filter.FilterFactory; import dsp.filter.FloatFIRFilter; import dsp.filter.Window.WindowType; -import dsp.fsk.C4FMSlicer; -import dsp.fsk.C4FMSymbolFilter; -import dsp.fsk.P25MessageFramer; import dsp.gain.DirectGainControl; import dsp.nbfm.FMDiscriminator; import dsp.nbfm.FilteringNBFMDemodulator; +import dsp.symbol.FrameSync; public class P25Decoder extends Decoder implements DirectFrequencyController, Instrumentable diff --git a/src/decode/p25/P25Interleave.java b/src/decode/p25/P25Interleave.java index c25b0587..8e3713ad 100644 --- a/src/decode/p25/P25Interleave.java +++ b/src/decode/p25/P25Interleave.java @@ -5,7 +5,7 @@ import java.util.BitSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; /** * Utility class to process interleave of P25 Voice and Data messages. @@ -65,19 +65,19 @@ public class P25Interleave * @param start - starting bit index for the block * @param end - ending bit index for the block, plus 1 */ - public static BitSetBuffer deinterleaveData( BitSetBuffer message, + public static BinaryMessage deinterleaveData( BinaryMessage message, int start, int end ) { return deinterleave( DATA_DEINTERLEAVE, message, start, end ); } - public static BitSetBuffer deinterleaveVoice( BitSetBuffer message, + public static BinaryMessage deinterleaveVoice( BinaryMessage message, int start, int end ) { return deinterleave( VOICE_DEINTERLEAVE, message, start, end ); } - public static BitSetBuffer deinterleave( int[] pattern, BitSetBuffer message, + public static BinaryMessage deinterleave( int[] pattern, BinaryMessage message, int start, int end ) { BitSet original = message.get( start, end ); @@ -106,19 +106,19 @@ public class P25Interleave * @param start - starting bit index for the block * @param end - ending bit index for the block, plus 1 */ - public static BitSetBuffer interleaveData( BitSetBuffer message, + public static BinaryMessage interleaveData( BinaryMessage message, int start, int end ) { return interleave( DATA_INTERLEAVE, message, start, end ); } - public static BitSetBuffer interleaveVoice( BitSetBuffer message, + public static BinaryMessage interleaveVoice( BinaryMessage message, int start, int end ) { return interleave( VOICE_INTERLEAVE, message, start, end ); } - public static BitSetBuffer interleave( int[] pattern, BitSetBuffer message, + public static BinaryMessage interleave( int[] pattern, BinaryMessage message, int start, int end ) { BitSet original = message.get( start, end ); @@ -146,7 +146,7 @@ public class P25Interleave int end = 196; String interleaved = "0010010100000000000000000000000000000000000010100011001011111010101010101010101010101010010111101010100011010000000000000000000000000000110001011010011010101010101010101010101010101010100101100101"; - BitSetBuffer b = new BitSetBuffer( end ); + BinaryMessage b = new BinaryMessage( end ); for( int x = 0; x < end; x++ ) { diff --git a/src/dsp/fsk/P25MessageFramer.java b/src/decode/p25/P25MessageFramer.java similarity index 94% rename from src/dsp/fsk/P25MessageFramer.java rename to src/decode/p25/P25MessageFramer.java index 28892678..b61ca44a 100644 --- a/src/dsp/fsk/P25MessageFramer.java +++ b/src/decode/p25/P25MessageFramer.java @@ -1,4 +1,4 @@ -package dsp.fsk; +package decode.p25; import java.util.ArrayList; @@ -9,12 +9,9 @@ import org.slf4j.LoggerFactory; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import bits.BitSetFullException; import bits.SyncPatternMatcher; -import decode.p25.P25Interleave; -import decode.p25.Trellis_1_2_Rate; -import decode.p25.Trellis_3_4_Rate; import decode.p25.message.P25Message; import decode.p25.message.hdu.HDUMessage; import decode.p25.message.ldu.LDU1Message; @@ -30,6 +27,7 @@ import decode.p25.message.tdu.lc.TDULinkControlMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.message.tsbk.TSBKMessageFactory; import decode.p25.reference.DataUnitID; +import dsp.symbol.Dibit; import edac.BCH_63_16_11; import edac.CRC; import edac.CRCP25; @@ -163,7 +161,7 @@ public class P25MessageFramer implements Listener /* Starting position of the status symbol counter is 24 symbols to * account for the 48-bit sync pattern which is not included in message */ private int mStatusSymbolPointer = 24; - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private int mMessageLength; private boolean mComplete = false; private boolean mActive = false; @@ -172,7 +170,7 @@ public class P25MessageFramer implements Listener public P25MessageAssembler() { mMessageLength = mDUID.getMessageLength(); - mMessage = new BitSetBuffer( mMessageLength ); + mMessage = new BinaryMessage( mMessageLength ); reset(); } @@ -234,9 +232,9 @@ public class P25MessageFramer implements Listener switch( mDUID ) { case NID: - CRC crc = mNIDDecoder.correctNID( mMessage ); + mMessage = mNIDDecoder.correctNID( mMessage ); - if( crc != CRC.FAILED_CRC ) + if( mMessage.getCRC() != CRC.FAILED_CRC ) { int value = mMessage.getInt( P25Message.DUID ); @@ -281,11 +279,11 @@ public class P25MessageFramer implements Listener * unsuccessful decode due to excessive errors */ if( mHalfRate.decode( mMessage, PDU0_BEGIN, PDU0_END ) ) { - CRC pduCRC = CRCP25.correctCCITT80( mMessage, + mMessage = CRCP25.correctCCITT80( mMessage, PDU0_BEGIN, PDU0_CRC_BEGIN ); - if( pduCRC != CRC.FAILED_CRC ) + if( mMessage.getCRC() != CRC.FAILED_CRC ) { boolean confirmed = mMessage.get( PDUMessage.CONFIRMATION_REQUIRED_INDICATOR ); @@ -462,12 +460,12 @@ public class P25MessageFramer implements Listener if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) ) { - CRC tsbkCRC = CRCP25.correctCCITT80( mMessage, + mMessage = CRCP25.correctCCITT80( mMessage, TSBK_BEGIN, TSBK_CRC_START ); - if( tsbkCRC != CRC.FAILED_CRC ) + if( mMessage.getCRC() != CRC.FAILED_CRC ) { - BitSetBuffer tsbkBuffer1 = mMessage.copy(); + BinaryMessage tsbkBuffer1 = mMessage.copy(); tsbkBuffer1.setSize( TSBK_DECODED_END ); TSBKMessage tsbkMessage1 = TSBKMessageFactory.getMessage( @@ -503,12 +501,12 @@ public class P25MessageFramer implements Listener * unsuccessful decode due to excessive errors */ if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) ) { - CRC tsbkCRC = CRCP25.correctCCITT80( mMessage, + mMessage = CRCP25.correctCCITT80( mMessage, TSBK_BEGIN, TSBK_CRC_START ); - if( tsbkCRC != CRC.FAILED_CRC ) + if( mMessage.getCRC() != CRC.FAILED_CRC ) { - BitSetBuffer tsbkBuffer2 = mMessage.copy(); + BinaryMessage tsbkBuffer2 = mMessage.copy(); tsbkBuffer2.setSize( TSBK_DECODED_END ); TSBKMessage tsbkMessage2 = TSBKMessageFactory.getMessage( @@ -544,12 +542,12 @@ public class P25MessageFramer implements Listener * unsuccessful decode due to excessive errors */ if( mHalfRate.decode( mMessage, TSBK_BEGIN, TSBK_END ) ) { - CRC tsbkCRC = CRCP25.correctCCITT80( mMessage, + mMessage = CRCP25.correctCCITT80( mMessage, TSBK_BEGIN, TSBK_CRC_START ); - if( tsbkCRC != CRC.FAILED_CRC ) + if( mMessage.getCRC() != CRC.FAILED_CRC ) { - BitSetBuffer tsbkBuffer3 = mMessage.copy(); + BinaryMessage tsbkBuffer3 = mMessage.copy(); tsbkBuffer3.setSize( TSBK_DECODED_END ); TSBKMessage tsbkMessage3 = TSBKMessageFactory.getMessage( diff --git a/src/decode/p25/Trellis_1_2_Rate.java b/src/decode/p25/Trellis_1_2_Rate.java index a9f47899..3bf37f63 100644 --- a/src/decode/p25/Trellis_1_2_Rate.java +++ b/src/decode/p25/Trellis_1_2_Rate.java @@ -6,8 +6,8 @@ import java.util.Random; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; -import dsp.fsk.Dibit; +import bits.BinaryMessage; +import dsp.symbol.Dibit; public class Trellis_1_2_Rate { @@ -97,7 +97,7 @@ public class Trellis_1_2_Rate return sb.toString(); } - public boolean decode( BitSetBuffer message, int start, int end ) + public boolean decode( BinaryMessage message, int start, int end ) { /* load each of the nodes with de-interleaved constellations */ for( int index = 0; index < 49; index++ ) @@ -148,7 +148,7 @@ public class Trellis_1_2_Rate return true; } - private Constellation getConstellation( BitSetBuffer message, int index ) + private Constellation getConstellation( BinaryMessage message, int index ) { int transmittedValue = 0; @@ -500,7 +500,7 @@ public class Trellis_1_2_Rate { Random random = new Random(); - BitSetBuffer buffer = new BitSetBuffer( 196 ); + BinaryMessage buffer = new BinaryMessage( 196 ); try { diff --git a/src/decode/p25/Trellis_3_4_Rate.java b/src/decode/p25/Trellis_3_4_Rate.java index d8f5d7b6..0f1ed03a 100644 --- a/src/decode/p25/Trellis_3_4_Rate.java +++ b/src/decode/p25/Trellis_3_4_Rate.java @@ -8,8 +8,8 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; -import dsp.fsk.Dibit; +import bits.BinaryMessage; +import dsp.symbol.Dibit; public class Trellis_3_4_Rate { @@ -102,7 +102,7 @@ public class Trellis_3_4_Rate * * @return - original message with decoded message bits.. */ - public boolean decode( BitSetBuffer message, int start, int end ) + public boolean decode( BinaryMessage message, int start, int end ) { reset(); @@ -190,7 +190,7 @@ public class Trellis_3_4_Rate } } - private Con getConstellation( BitSetBuffer message, int index ) + private Con getConstellation( BinaryMessage message, int index ) { int value = message.getInt( index, index + 3 ); return Con.fromTransmittedValue( value ); @@ -642,7 +642,7 @@ public class Trellis_3_4_Rate { String raw = "12:58:51.635 DEBUG dsp.fsk.P25MessageFramer - AFTER DEINTERLEAVE: 00100110000011001010010101111101000101010110100111111100101011000111011011000110000000000000000000000111111101011000001000001111000110000000000010101011110110010000000001011011000000010100011110110001000010100100011111000000000100000000000000000000010000000000001100000000000000011010101010101010101010100010001010000110010111111101101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000101000001010000010100000010111001001000011100101011010101010101001010011"; - BitSetBuffer message = BitSetBuffer.load( raw ); + BinaryMessage message = BinaryMessage.load( raw ); mLog.debug( "MSG: " + message.toString() ); diff --git a/src/decode/p25/message/P25Message.java b/src/decode/p25/message/P25Message.java index 5d312332..f552165b 100644 --- a/src/decode/p25/message/P25Message.java +++ b/src/decode/p25/message/P25Message.java @@ -6,7 +6,7 @@ import map.Plottable; import message.Message; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import edac.CRC; @@ -24,13 +24,13 @@ public class P25Message extends Message protected SimpleDateFormat mTimeDurationFormat = new SimpleDateFormat( "HH:mm:ss.SSS"); - protected BitSetBuffer mMessage; + protected BinaryMessage mMessage; protected DataUnitID mDUID; protected AliasList mAliasList; protected CRC[] mCRC; - public P25Message( BitSetBuffer message, + public P25Message( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { @@ -46,7 +46,7 @@ public class P25Message extends Message return mCRC; } - public BitSetBuffer getSourceMessage() + public BinaryMessage getSourceMessage() { return mMessage; } diff --git a/src/decode/p25/message/hdu/HDUMessage.java b/src/decode/p25/message/hdu/HDUMessage.java index b3977b06..3b0114a7 100644 --- a/src/decode/p25/message/hdu/HDUMessage.java +++ b/src/decode/p25/message/hdu/HDUMessage.java @@ -1,7 +1,7 @@ package decode.p25.message.hdu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; import decode.p25.reference.Encryption; @@ -22,7 +22,7 @@ public class HDUMessage extends P25Message public static final int[] TALKGROUP_ID = { 372,373,374,375,388,389,390,391, 392,393,406,407,408,409,410,411 }; - public HDUMessage( BitSetBuffer message, DataUnitID duid, + public HDUMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/ldu/LDU1Message.java b/src/decode/p25/message/ldu/LDU1Message.java index d50ab67f..8a7cb1c7 100644 --- a/src/decode/p25/message/ldu/LDU1Message.java +++ b/src/decode/p25/message/ldu/LDU1Message.java @@ -1,7 +1,7 @@ package decode.p25.message.ldu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.P25Interleave; import decode.p25.reference.DataUnitID; import decode.p25.reference.LinkControlOpcode; @@ -25,7 +25,7 @@ public class LDU1Message extends LDUMessage // public static final int[] OCTET_7 = { 732,733,734,735,740,741,742,743 }; // public static final int[] OCTET_8 = { 744,745,750,751,752,753,754,755 }; - public LDU1Message( BitSetBuffer message, DataUnitID duid, + public LDU1Message( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/ldu/LDU2Message.java b/src/decode/p25/message/ldu/LDU2Message.java index c345dc57..e0175f66 100644 --- a/src/decode/p25/message/ldu/LDU2Message.java +++ b/src/decode/p25/message/ldu/LDU2Message.java @@ -1,7 +1,7 @@ package decode.p25.message.ldu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Encryption; import edac.CRC; @@ -28,7 +28,7 @@ public class LDU2Message extends LDUMessage public static final int[] KEY_ID = { 916,917,918,919,924,925,926,927,928, 929,934,935,936,937,938,939 }; - public LDU2Message( BitSetBuffer message, DataUnitID duid, + public LDU2Message( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/ldu/LDUMessage.java b/src/decode/p25/message/ldu/LDUMessage.java index d7aa682f..96554a97 100644 --- a/src/decode/p25/message/ldu/LDUMessage.java +++ b/src/decode/p25/message/ldu/LDUMessage.java @@ -1,7 +1,7 @@ package decode.p25.message.ldu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.P25Interleave; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; @@ -22,7 +22,7 @@ public class LDUMessage extends P25Message public static final int[] LOW_SPEED_DATA = { 1456,1457,1458,1459,1460,1461, 1462,1463,1472,1473,1474,1475,1476,1477,1478,1479 }; - public LDUMessage( BitSetBuffer message, DataUnitID duid, + public LDUMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/pdu/PDUMessage.java b/src/decode/p25/message/pdu/PDUMessage.java index 065901a2..15290b7a 100644 --- a/src/decode/p25/message/pdu/PDUMessage.java +++ b/src/decode/p25/message/pdu/PDUMessage.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -26,7 +26,7 @@ public class PDUMessage extends P25Message public static final int[] PDU_CRC = { 144,145,146,147,148,149,150,151,152, 153,154,155,156,157,158,159 }; - public PDUMessage( BitSetBuffer message, DataUnitID duid, AliasList aliasList ) + public PDUMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/pdu/PDUMessageFactory.java b/src/decode/p25/message/pdu/PDUMessageFactory.java index 72e95ea7..aa831079 100644 --- a/src/decode/p25/message/pdu/PDUMessageFactory.java +++ b/src/decode/p25/message/pdu/PDUMessageFactory.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.pdu.osp.control.AdjacentStatusBroadcastExtended; import decode.p25.message.pdu.osp.control.CallAlertExtended; import decode.p25.message.pdu.osp.control.GroupAffiliationQueryExtended; @@ -29,7 +29,7 @@ import decode.p25.reference.Vendor; public class PDUMessageFactory { - public static PDUMessage getMessage( BitSetBuffer message, + public static PDUMessage getMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java b/src/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java index b1ae4715..6195f62f 100644 --- a/src/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java +++ b/src/decode/p25/message/pdu/UnitToUnitChannelGrantExtended.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -42,14 +42,15 @@ public abstract class UnitToUnitChannelGrantExtended extends PDUMessage private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public UnitToUnitChannelGrantExtended( BitSetBuffer message, + public UnitToUnitChannelGrantExtended( 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.correctPDU2( mMessage ); + mCRC[ 1 ] = mMessage.getCRC(); } public String getMessage() diff --git a/src/decode/p25/message/pdu/confirmed/PDUConfirmedMessage.java b/src/decode/p25/message/pdu/confirmed/PDUConfirmedMessage.java index ffe42fc8..b171e5ee 100644 --- a/src/decode/p25/message/pdu/confirmed/PDUConfirmedMessage.java +++ b/src/decode/p25/message/pdu/confirmed/PDUConfirmedMessage.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.pdu.PDUMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.PDUType; @@ -23,7 +23,7 @@ public class PDUConfirmedMessage extends PDUMessage public static final int[] FRAGMENT_SEQUENCE_NUMBER = { 133,134,135 }; public static final int[] PDU_TYPE = { 176,177,178,179 }; - public PDUConfirmedMessage( BitSetBuffer message, AliasList aliasList ) + public PDUConfirmedMessage( BinaryMessage message, AliasList aliasList ) { super( message, DataUnitID.PDUC, aliasList ); diff --git a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextAccept.java b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextAccept.java index 4b4019f8..fa47e6c7 100644 --- a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextAccept.java +++ b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextAccept.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.pdu.PDUMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.MDPConfigurationOption; @@ -50,7 +50,7 @@ public class SNDCPActivateTDSContextAccept extends PDUConfirmedMessage sb.append( "NAC:" ); sb.append( getNAC() ); - sb.append( " LLID:" ); + sb.append( " PDUC LLID:" ); sb.append( getLogicalLinkID() ); sb.append( " ACCEPT SNDCP PACKET DATA ACTIVATE " ); sb.append( getNetworkAddressType() ); diff --git a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextReject.java b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextReject.java index f98071d3..f8d0ec8b 100644 --- a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextReject.java +++ b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextReject.java @@ -25,7 +25,7 @@ public class SNDCPActivateTDSContextReject extends PDUConfirmedMessage sb.append( "NAC:" ); sb.append( getNAC() ); - sb.append( " LLID:" ); + sb.append( " PDUC LLID:" ); sb.append( getLogicalLinkID() ); sb.append( " REJECT SNDCP PACKET DATA ACTIVATE - REASON:" ); sb.append( getReason().getLabel() ); diff --git a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextRequest.java b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextRequest.java index 37052212..194087ce 100644 --- a/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextRequest.java +++ b/src/decode/p25/message/pdu/confirmed/SNDCPActivateTDSContextRequest.java @@ -36,7 +36,7 @@ public class SNDCPActivateTDSContextRequest extends PDUConfirmedMessage sb.append( "NAC:" ); sb.append( getNAC() ); - sb.append( " LLID:" ); + sb.append( " PDUC LLID:" ); sb.append( getLogicalLinkID() ); sb.append( " REQUEST SNDCP PACKET DATA ACTIVATE " ); sb.append( getNetworkAddressType() ); diff --git a/src/decode/p25/message/pdu/confirmed/SNDCPDeactivateTDSContext.java b/src/decode/p25/message/pdu/confirmed/SNDCPDeactivateTDSContext.java index f704ef6c..c8d0b778 100644 --- a/src/decode/p25/message/pdu/confirmed/SNDCPDeactivateTDSContext.java +++ b/src/decode/p25/message/pdu/confirmed/SNDCPDeactivateTDSContext.java @@ -27,7 +27,7 @@ public class SNDCPDeactivateTDSContext extends PDUConfirmedMessage sb.append( "NAC:" ); sb.append( getNAC() ); - sb.append( " LLID:" ); + sb.append( " PDUC LLID:" ); sb.append( getLogicalLinkID() ); sb.append( " REQUEST SNDCP PACKET DATA DEACTIVATE " ); sb.append( getDeactivationType() ); diff --git a/src/decode/p25/message/pdu/confirmed/SNDCPUserData.java b/src/decode/p25/message/pdu/confirmed/SNDCPUserData.java index b8adccba..bb242dda 100644 --- a/src/decode/p25/message/pdu/confirmed/SNDCPUserData.java +++ b/src/decode/p25/message/pdu/confirmed/SNDCPUserData.java @@ -70,7 +70,7 @@ public class SNDCPUserData extends PDUConfirmedMessage sb.append( "NAC:" ); sb.append( getNAC() ); - sb.append( " LLID:" ); + sb.append( " PDUC LLID:" ); sb.append( getLogicalLinkID() ); sb.append( " SNDCP NSAPI:" ); sb.append( getNSAPI() ); diff --git a/src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java b/src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java index adcaaeee..b12f9375 100644 --- a/src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java +++ b/src/decode/p25/message/pdu/osp/control/AdjacentStatusBroadcastExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/CallAlertExtended.java b/src/decode/p25/message/pdu/osp/control/CallAlertExtended.java index bf062c03..eeb84130 100644 --- a/src/decode/p25/message/pdu/osp/control/CallAlertExtended.java +++ b/src/decode/p25/message/pdu/osp/control/CallAlertExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java b/src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java index cfaea4ae..0725a28a 100644 --- a/src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java +++ b/src/decode/p25/message/pdu/osp/control/GroupAffiliationQueryExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java b/src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java index 2ccd57fd..06d312a1 100644 --- a/src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java +++ b/src/decode/p25/message/pdu/osp/control/GroupAffiliationResponseExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java b/src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java index 43bf8a64..f73213fa 100644 --- a/src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java +++ b/src/decode/p25/message/pdu/osp/control/MessageUpdateExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java b/src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java index 3bfccd52..f2e06dd6 100644 --- a/src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java +++ b/src/decode/p25/message/pdu/osp/control/NetworkStatusBroadcastExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java b/src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java index c2c921c2..b99858a9 100644 --- a/src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java +++ b/src/decode/p25/message/pdu/osp/control/ProtectionParameterBroadcast.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java b/src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java index e7397a74..d72cebde 100644 --- a/src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java +++ b/src/decode/p25/message/pdu/osp/control/RFSSStatusBroadcastExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java b/src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java index bf366a93..32337408 100644 --- a/src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java +++ b/src/decode/p25/message/pdu/osp/control/RoamingAddressUpdateExtended.java @@ -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(); } } diff --git a/src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java b/src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java index 4828a994..9ff27ed4 100644 --- a/src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java +++ b/src/decode/p25/message/pdu/osp/control/StatusQueryExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java b/src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java index 0e5b0b20..9f831af0 100644 --- a/src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java +++ b/src/decode/p25/message/pdu/osp/control/StatusUpdateExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java b/src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java index 58fc3f56..faedb1e5 100644 --- a/src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java +++ b/src/decode/p25/message/pdu/osp/control/UnitRegistrationResponseExtended.java @@ -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 diff --git a/src/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java b/src/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java index 3921f05a..0335fba0 100644 --- a/src/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java +++ b/src/decode/p25/message/pdu/osp/data/GroupDataChannelGrantExtended.java @@ -3,7 +3,7 @@ package decode.p25.message.pdu.osp.data; import java.util.Date; 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; @@ -39,14 +39,15 @@ public class GroupDataChannelGrantExtended extends PDUMessage private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public GroupDataChannelGrantExtended( BitSetBuffer message, + public GroupDataChannelGrantExtended( 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 diff --git a/src/decode/p25/message/pdu/osp/data/IndividualDataChannelGrantExtended.java b/src/decode/p25/message/pdu/osp/data/IndividualDataChannelGrantExtended.java index 45ab5a82..efeaf5f7 100644 --- a/src/decode/p25/message/pdu/osp/data/IndividualDataChannelGrantExtended.java +++ b/src/decode/p25/message/pdu/osp/data/IndividualDataChannelGrantExtended.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierReceiver; import decode.p25.message.pdu.UnitToUnitChannelGrantExtended; import decode.p25.reference.DataUnitID; @@ -11,7 +11,7 @@ public class IndividualDataChannelGrantExtended extends UnitToUnitChannelGrantExtended implements IdentifierReceiver { - public IndividualDataChannelGrantExtended( BitSetBuffer message, + public IndividualDataChannelGrantExtended( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java b/src/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java index 40f927f4..ffa7dfbb 100644 --- a/src/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java +++ b/src/decode/p25/message/pdu/osp/voice/GroupVoiceChannelGrantExplicit.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu.osp.voice; 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; @@ -37,14 +37,15 @@ public class GroupVoiceChannelGrantExplicit extends PDUMessage private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public GroupVoiceChannelGrantExplicit( BitSetBuffer message, + public GroupVoiceChannelGrantExplicit( 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 diff --git a/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java b/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java index e405cda7..9398c614 100644 --- a/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java +++ b/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantExplicit.java @@ -3,7 +3,7 @@ package decode.p25.message.pdu.osp.voice; import java.util.Date; 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; @@ -39,14 +39,15 @@ public class TelephoneInterconnectChannelGrantExplicit extends PDUMessage private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public TelephoneInterconnectChannelGrantExplicit( BitSetBuffer message, + public TelephoneInterconnectChannelGrantExplicit( 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 diff --git a/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantUpdateExplicit.java b/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantUpdateExplicit.java index f7d6803e..320dfe4f 100644 --- a/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantUpdateExplicit.java +++ b/src/decode/p25/message/pdu/osp/voice/TelephoneInterconnectChannelGrantUpdateExplicit.java @@ -1,14 +1,14 @@ package decode.p25.message.pdu.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class TelephoneInterconnectChannelGrantUpdateExplicit extends TelephoneInterconnectChannelGrantExplicit { - public TelephoneInterconnectChannelGrantUpdateExplicit( BitSetBuffer message, + public TelephoneInterconnectChannelGrantUpdateExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/pdu/osp/voice/UnitToUnitAnswerRequestExplicit.java b/src/decode/p25/message/pdu/osp/voice/UnitToUnitAnswerRequestExplicit.java index 108b5341..39904e82 100644 --- a/src/decode/p25/message/pdu/osp/voice/UnitToUnitAnswerRequestExplicit.java +++ b/src/decode/p25/message/pdu/osp/voice/UnitToUnitAnswerRequestExplicit.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu.osp.voice; 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; @@ -27,14 +27,15 @@ public class UnitToUnitAnswerRequestExplicit 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 UnitToUnitAnswerRequestExplicit( BitSetBuffer message, + public UnitToUnitAnswerRequestExplicit( 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 diff --git a/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantExtended.java b/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantExtended.java index f856b191..b065f085 100644 --- a/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantExtended.java +++ b/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantExtended.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierReceiver; import decode.p25.message.pdu.UnitToUnitChannelGrantExtended; import decode.p25.reference.DataUnitID; @@ -11,7 +11,7 @@ public class UnitToUnitVoiceChannelGrantExtended extends UnitToUnitChannelGrantExtended implements IdentifierReceiver { - public UnitToUnitVoiceChannelGrantExtended( BitSetBuffer message, + public UnitToUnitVoiceChannelGrantExtended( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java b/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java index ab2121d5..1900433f 100644 --- a/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java +++ b/src/decode/p25/message/pdu/osp/voice/UnitToUnitVoiceChannelGrantUpdateExtended.java @@ -1,7 +1,7 @@ package decode.p25.message.pdu.osp.voice; 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; @@ -43,14 +43,15 @@ public class UnitToUnitVoiceChannelGrantUpdateExtended extends PDUMessage private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public UnitToUnitVoiceChannelGrantUpdateExtended( BitSetBuffer message, + public UnitToUnitVoiceChannelGrantUpdateExtended( 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.correctPDU2( mMessage ); + mCRC[ 1 ] = mMessage.getCRC(); } @Override diff --git a/src/decode/p25/message/tdu/TDULinkControlMessage.java b/src/decode/p25/message/tdu/TDULinkControlMessage.java index cb6d7c36..2c9f1468 100644 --- a/src/decode/p25/message/tdu/TDULinkControlMessage.java +++ b/src/decode/p25/message/tdu/TDULinkControlMessage.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; import decode.p25.reference.LinkControlOpcode; @@ -51,7 +51,7 @@ public class TDULinkControlMessage extends P25Message public static final ReedSolomon_24_12_13 mReedSolomonDecoder = new ReedSolomon_24_12_13(); - public TDULinkControlMessage( BitSetBuffer message, DataUnitID duid, + public TDULinkControlMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); @@ -167,9 +167,9 @@ public class TDULinkControlMessage extends P25Message while( x < mMessage.size() ) { - boolean passes = Galois24.checkAndCorrect( mMessage, x ); + mMessage = Galois24.checkAndCorrect( mMessage, x ); - if( !passes ) + if( !( mMessage.getCRC() == CRC.PASSED ) ) { mCRC[ 1 ] = CRC.FAILED_CRC; } diff --git a/src/decode/p25/message/tdu/TDUMessage.java b/src/decode/p25/message/tdu/TDUMessage.java index 0c31c8d2..441baee7 100644 --- a/src/decode/p25/message/tdu/TDUMessage.java +++ b/src/decode/p25/message/tdu/TDUMessage.java @@ -1,14 +1,14 @@ package decode.p25.message.tdu; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; import edac.CRC; public class TDUMessage extends P25Message { - public TDUMessage( BitSetBuffer message, DataUnitID duid, + public TDUMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tdu/lc/TDULinkControlMessage.java b/src/decode/p25/message/tdu/lc/TDULinkControlMessage.java index 5f9f2983..6efebdaf 100644 --- a/src/decode/p25/message/tdu/lc/TDULinkControlMessage.java +++ b/src/decode/p25/message/tdu/lc/TDULinkControlMessage.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.reference.DataUnitID; import decode.p25.reference.LinkControlOpcode; @@ -51,7 +51,7 @@ public class TDULinkControlMessage extends P25Message public static final ReedSolomon_24_12_13 mReedSolomonDecoder = new ReedSolomon_24_12_13(); - public TDULinkControlMessage( BitSetBuffer message, DataUnitID duid, + public TDULinkControlMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); @@ -167,9 +167,9 @@ public class TDULinkControlMessage extends P25Message while( x < mMessage.size() ) { - boolean passes = Galois24.checkAndCorrect( mMessage, x ); + mMessage = Galois24.checkAndCorrect( mMessage, x ); - if( !passes ) + if( !( mMessage.getCRC() == CRC.PASSED ) ) { mCRC[ 1 ] = CRC.FAILED_CRC; } diff --git a/src/decode/p25/message/tsbk/ChannelGrant.java b/src/decode/p25/message/tsbk/ChannelGrant.java index ae1475e0..0b7d3a59 100644 --- a/src/decode/p25/message/tsbk/ChannelGrant.java +++ b/src/decode/p25/message/tsbk/ChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -16,7 +16,7 @@ public abstract class ChannelGrant extends ServiceMessage private IdentifierProvider mIdentifierUpdate; - public ChannelGrant( BitSetBuffer message, + public ChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/GroupChannelGrant.java b/src/decode/p25/message/tsbk/GroupChannelGrant.java index 59fbfd61..e224dea2 100644 --- a/src/decode/p25/message/tsbk/GroupChannelGrant.java +++ b/src/decode/p25/message/tsbk/GroupChannelGrant.java @@ -2,7 +2,7 @@ package decode.p25.message.tsbk; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; public abstract class GroupChannelGrant extends ChannelGrant @@ -13,7 +13,7 @@ public abstract class GroupChannelGrant extends ChannelGrant public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public GroupChannelGrant( BitSetBuffer message, + public GroupChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/GroupChannelGrantExplicit.java b/src/decode/p25/message/tsbk/GroupChannelGrantExplicit.java index 99d6e2ce..c35f196e 100644 --- a/src/decode/p25/message/tsbk/GroupChannelGrantExplicit.java +++ b/src/decode/p25/message/tsbk/GroupChannelGrantExplicit.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.reference.DataUnitID; @@ -19,7 +19,7 @@ public abstract class GroupChannelGrantExplicit extends ChannelGrant private IdentifierProvider mTransmitIdentifierUpdate; private IdentifierProvider mReceiveIdentifierUpdate; - public GroupChannelGrantExplicit( BitSetBuffer message, + public GroupChannelGrantExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/GroupMultiChannelGrant.java b/src/decode/p25/message/tsbk/GroupMultiChannelGrant.java index 5561d3fb..553db4e1 100644 --- a/src/decode/p25/message/tsbk/GroupMultiChannelGrant.java +++ b/src/decode/p25/message/tsbk/GroupMultiChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -24,7 +24,7 @@ public abstract class GroupMultiChannelGrant extends ChannelGrant private IdentifierProvider mIdentifierUpdate1; private IdentifierProvider mIdentifierUpdate2; - public GroupMultiChannelGrant( BitSetBuffer message, + public GroupMultiChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/ServiceMessage.java b/src/decode/p25/message/tsbk/ServiceMessage.java index 694ddec5..88548fca 100644 --- a/src/decode/p25/message/tsbk/ServiceMessage.java +++ b/src/decode/p25/message/tsbk/ServiceMessage.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; public abstract class ServiceMessage extends TSBKMessage @@ -12,7 +12,7 @@ public abstract class ServiceMessage extends TSBKMessage public static final int DUPLEX_MODE = 82; public static final int SESSION_MODE = 83; - public ServiceMessage( BitSetBuffer message, + public ServiceMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/TSBKMessage.java b/src/decode/p25/message/tsbk/TSBKMessage.java index 74e57d5b..6aa79d87 100644 --- a/src/decode/p25/message/tsbk/TSBKMessage.java +++ b/src/decode/p25/message/tsbk/TSBKMessage.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.P25Message; import decode.p25.message.tsbk.motorola.MotorolaOpcode; import decode.p25.message.tsbk.vendor.VendorOpcode; @@ -32,7 +32,7 @@ public class TSBKMessage extends P25Message public static final int[] BLOCK12 = { 152,153,154,155,156,157,158,159 }; public static final int CRC_START = 144; - public TSBKMessage( BitSetBuffer message, DataUnitID duid, AliasList aliasList ) + public TSBKMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/TSBKMessageFactory.java b/src/decode/p25/message/tsbk/TSBKMessageFactory.java index 435427b6..4542b96b 100644 --- a/src/decode/p25/message/tsbk/TSBKMessageFactory.java +++ b/src/decode/p25/message/tsbk/TSBKMessageFactory.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.motorola.ChannelCWIDUpdate; import decode.p25.message.tsbk.motorola.MotorolaOpcode; import decode.p25.message.tsbk.motorola.MotorolaTSBKMessage; @@ -54,7 +54,7 @@ import decode.p25.reference.Vendor; public class TSBKMessageFactory { - public static TSBKMessage getMessage( BitSetBuffer message, + public static TSBKMessage getMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/UnitChannelGrant.java b/src/decode/p25/message/tsbk/UnitChannelGrant.java index fc718d76..678fe0b3 100644 --- a/src/decode/p25/message/tsbk/UnitChannelGrant.java +++ b/src/decode/p25/message/tsbk/UnitChannelGrant.java @@ -2,7 +2,7 @@ package decode.p25.message.tsbk; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; public abstract class UnitChannelGrant extends ChannelGrant @@ -13,7 +13,7 @@ public abstract class UnitChannelGrant extends ChannelGrant public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public UnitChannelGrant( BitSetBuffer message, + public UnitChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/motorola/ChannelCWIDUpdate.java b/src/decode/p25/message/tsbk/motorola/ChannelCWIDUpdate.java index 640c8c5a..7f4dd023 100644 --- a/src/decode/p25/message/tsbk/motorola/ChannelCWIDUpdate.java +++ b/src/decode/p25/message/tsbk/motorola/ChannelCWIDUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.motorola; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -24,7 +24,7 @@ public class ChannelCWIDUpdate extends MotorolaTSBKMessage private IdentifierProvider mIdentifierUpdate; - public ChannelCWIDUpdate( BitSetBuffer message, + public ChannelCWIDUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/motorola/MotorolaTSBKMessage.java b/src/decode/p25/message/tsbk/motorola/MotorolaTSBKMessage.java index 48e582e3..39851513 100644 --- a/src/decode/p25/message/tsbk/motorola/MotorolaTSBKMessage.java +++ b/src/decode/p25/message/tsbk/motorola/MotorolaTSBKMessage.java @@ -1,13 +1,13 @@ package decode.p25.message.tsbk.motorola; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; public class MotorolaTSBKMessage extends TSBKMessage { - public MotorolaTSBKMessage( BitSetBuffer message, DataUnitID duid, + public MotorolaTSBKMessage( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/motorola/SystemLoading.java b/src/decode/p25/message/tsbk/motorola/SystemLoading.java index 5059603c..766bfaad 100644 --- a/src/decode/p25/message/tsbk/motorola/SystemLoading.java +++ b/src/decode/p25/message/tsbk/motorola/SystemLoading.java @@ -1,13 +1,13 @@ package decode.p25.message.tsbk.motorola; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; public class SystemLoading extends MotorolaTSBKMessage { - public SystemLoading( BitSetBuffer message, DataUnitID duid, + public SystemLoading( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/osp/control/AcknowledgeResponse.java b/src/decode/p25/message/tsbk/osp/control/AcknowledgeResponse.java index 9460b3f7..7f399f4e 100644 --- a/src/decode/p25/message/tsbk/osp/control/AcknowledgeResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/AcknowledgeResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -20,7 +20,7 @@ public class AcknowledgeResponse extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public AcknowledgeResponse( BitSetBuffer message, + public AcknowledgeResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java b/src/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java index 9a50acba..9924d9c3 100644 --- a/src/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java +++ b/src/decode/p25/message/tsbk/osp/control/AdjacentStatusBroadcast.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.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.tsbk.TSBKMessage; @@ -28,7 +28,7 @@ public class AdjacentStatusBroadcast extends TSBKMessage implements IdentifierRe private IdentifierProvider mIdentifierUpdate; - public AdjacentStatusBroadcast( BitSetBuffer message, + public AdjacentStatusBroadcast( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/AuthenticationCommand.java b/src/decode/p25/message/tsbk/osp/control/AuthenticationCommand.java index c220ca10..62db6654 100644 --- a/src/decode/p25/message/tsbk/osp/control/AuthenticationCommand.java +++ b/src/decode/p25/message/tsbk/osp/control/AuthenticationCommand.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -15,7 +15,7 @@ public class AuthenticationCommand extends TSBKMessage public static final int[] TARGET_ID = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public AuthenticationCommand( BitSetBuffer message, + public AuthenticationCommand( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/CallAlert.java b/src/decode/p25/message/tsbk/osp/control/CallAlert.java index 9e51bebf..50a531e5 100644 --- a/src/decode/p25/message/tsbk/osp/control/CallAlert.java +++ b/src/decode/p25/message/tsbk/osp/control/CallAlert.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -13,7 +13,7 @@ public class CallAlert extends TSBKMessage public static final int[] SOURCE_ID = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public CallAlert( BitSetBuffer message, + public CallAlert( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/DenyResponse.java b/src/decode/p25/message/tsbk/osp/control/DenyResponse.java index 36e96bab..1981488c 100644 --- a/src/decode/p25/message/tsbk/osp/control/DenyResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/DenyResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.DenyReason; @@ -21,7 +21,7 @@ public class DenyResponse extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public DenyResponse( BitSetBuffer message, + public DenyResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/ExtendedFunctionCommand.java b/src/decode/p25/message/tsbk/osp/control/ExtendedFunctionCommand.java index cb85e5a7..f63d2422 100644 --- a/src/decode/p25/message/tsbk/osp/control/ExtendedFunctionCommand.java +++ b/src/decode/p25/message/tsbk/osp/control/ExtendedFunctionCommand.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.ExtendedFunction; @@ -16,7 +16,7 @@ public class ExtendedFunctionCommand extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public ExtendedFunctionCommand( BitSetBuffer message, + public ExtendedFunctionCommand( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java b/src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java index 41490477..58c4bad1 100644 --- a/src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java +++ b/src/decode/p25/message/tsbk/osp/control/GroupAffiliationQuery.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -13,7 +13,7 @@ public class GroupAffiliationQuery extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public GroupAffiliationQuery( BitSetBuffer message, + public GroupAffiliationQuery( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/GroupAffiliationResponse.java b/src/decode/p25/message/tsbk/osp/control/GroupAffiliationResponse.java index d161a578..3c59ef10 100644 --- a/src/decode/p25/message/tsbk/osp/control/GroupAffiliationResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/GroupAffiliationResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -18,7 +18,7 @@ public class GroupAffiliationResponse extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public GroupAffiliationResponse( BitSetBuffer message, + public GroupAffiliationResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java index 8ca820c8..b9e2ba66 100644 --- a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java +++ b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; @@ -18,7 +18,7 @@ public abstract class IdentifierUpdate extends TSBKMessage 119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136, 137,138,139,140,141,142,143 }; - public IdentifierUpdate( BitSetBuffer message, + public IdentifierUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java index f64d4d19..60e62f00 100644 --- a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java +++ b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateNonVUHF.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -13,7 +13,7 @@ public class IdentifierUpdateNonVUHF extends IdentifierUpdate public static final int[] TRANSMIT_OFFSET = { 94,95,96,97,98,99,100,101 }; - public IdentifierUpdateNonVUHF( BitSetBuffer message, + public IdentifierUpdateNonVUHF( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java index 70420048..d6dca040 100644 --- a/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java +++ b/src/decode/p25/message/tsbk/osp/control/IdentifierUpdateVUHF.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -14,7 +14,7 @@ public class IdentifierUpdateVUHF extends IdentifierUpdate public static final int[] TRANSMIT_OFFSET = { 89,90,91,92,93,94,95,96,97,98, 99,100,101 }; - public IdentifierUpdateVUHF( BitSetBuffer message, + public IdentifierUpdateVUHF( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/LocationRegistrationResponse.java b/src/decode/p25/message/tsbk/osp/control/LocationRegistrationResponse.java index 9111807c..2d8b3375 100644 --- a/src/decode/p25/message/tsbk/osp/control/LocationRegistrationResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/LocationRegistrationResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -17,7 +17,7 @@ public class LocationRegistrationResponse extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public LocationRegistrationResponse( BitSetBuffer message, + public LocationRegistrationResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/MessageUpdate.java b/src/decode/p25/message/tsbk/osp/control/MessageUpdate.java index 7dd33641..4fcbee3b 100644 --- a/src/decode/p25/message/tsbk/osp/control/MessageUpdate.java +++ b/src/decode/p25/message/tsbk/osp/control/MessageUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -15,7 +15,7 @@ public class MessageUpdate extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public MessageUpdate( BitSetBuffer message, + public MessageUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java b/src/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java index 0fe58369..0fdb25ec 100644 --- a/src/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java +++ b/src/decode/p25/message/tsbk/osp/control/NetworkStatusBroadcast.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.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.tsbk.TSBKMessage; @@ -25,7 +25,7 @@ public class NetworkStatusBroadcast extends TSBKMessage implements IdentifierRec private IdentifierProvider mIdentifierUpdate; - public NetworkStatusBroadcast( BitSetBuffer message, + public NetworkStatusBroadcast( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/ProtectionParameterUpdate.java b/src/decode/p25/message/tsbk/osp/control/ProtectionParameterUpdate.java index 7ad8e2ad..aa2d9e81 100644 --- a/src/decode/p25/message/tsbk/osp/control/ProtectionParameterUpdate.java +++ b/src/decode/p25/message/tsbk/osp/control/ProtectionParameterUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Encryption; @@ -15,7 +15,7 @@ public class ProtectionParameterUpdate extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public ProtectionParameterUpdate( BitSetBuffer message, + public ProtectionParameterUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/QueuedResponse.java b/src/decode/p25/message/tsbk/osp/control/QueuedResponse.java index cb24ee51..8548d0e3 100644 --- a/src/decode/p25/message/tsbk/osp/control/QueuedResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/QueuedResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -21,7 +21,7 @@ public class QueuedResponse extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public QueuedResponse( BitSetBuffer message, + public QueuedResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java b/src/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java index db4edefa..5b5b6742 100644 --- a/src/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java +++ b/src/decode/p25/message/tsbk/osp/control/RFSSStatusBroadcast.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.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.tsbk.TSBKMessage; @@ -25,7 +25,7 @@ public class RFSSStatusBroadcast extends TSBKMessage implements IdentifierReceiv private IdentifierProvider mIdentifierUpdate; - public RFSSStatusBroadcast( BitSetBuffer message, + public RFSSStatusBroadcast( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/RadioUnitMonitorCommand.java b/src/decode/p25/message/tsbk/osp/control/RadioUnitMonitorCommand.java index cc5e1200..a7e8217d 100644 --- a/src/decode/p25/message/tsbk/osp/control/RadioUnitMonitorCommand.java +++ b/src/decode/p25/message/tsbk/osp/control/RadioUnitMonitorCommand.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -14,7 +14,7 @@ public class RadioUnitMonitorCommand extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public RadioUnitMonitorCommand( BitSetBuffer message, + public RadioUnitMonitorCommand( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/RoamingAddressCommand.java b/src/decode/p25/message/tsbk/osp/control/RoamingAddressCommand.java index c392bf14..27967138 100644 --- a/src/decode/p25/message/tsbk/osp/control/RoamingAddressCommand.java +++ b/src/decode/p25/message/tsbk/osp/control/RoamingAddressCommand.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -18,7 +18,7 @@ public class RoamingAddressCommand extends TSBKMessage public static final int[] TARGET_ID = { 120,121,122,123,124,125,126,127,128, 129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public RoamingAddressCommand( BitSetBuffer message, + public RoamingAddressCommand( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java b/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java index e8c8511d..3fb885d7 100644 --- a/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java +++ b/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcast.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.message.tsbk.TSBKMessage; @@ -33,7 +33,7 @@ public class SecondaryControlChannelBroadcast extends TSBKMessage private IdentifierProvider mIdentifierUpdate1; private IdentifierProvider mIdentifierUpdate2; - public SecondaryControlChannelBroadcast( BitSetBuffer message, + public SecondaryControlChannelBroadcast( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcastExplicit.java b/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcastExplicit.java index 42cd2c76..9cdb0369 100644 --- a/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcastExplicit.java +++ b/src/decode/p25/message/tsbk/osp/control/SecondaryControlChannelBroadcastExplicit.java @@ -4,7 +4,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -14,7 +14,7 @@ public class SecondaryControlChannelBroadcastExplicit private final static Logger mLog = LoggerFactory.getLogger( SecondaryControlChannelBroadcastExplicit.class ); - public SecondaryControlChannelBroadcastExplicit( BitSetBuffer message, + public SecondaryControlChannelBroadcastExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/osp/control/StatusQuery.java b/src/decode/p25/message/tsbk/osp/control/StatusQuery.java index 9d55e4b8..321bf613 100644 --- a/src/decode/p25/message/tsbk/osp/control/StatusQuery.java +++ b/src/decode/p25/message/tsbk/osp/control/StatusQuery.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -13,7 +13,7 @@ public class StatusQuery extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public StatusQuery( BitSetBuffer message, + public StatusQuery( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/StatusUpdate.java b/src/decode/p25/message/tsbk/osp/control/StatusUpdate.java index dfce3b1f..ac4da983 100644 --- a/src/decode/p25/message/tsbk/osp/control/StatusUpdate.java +++ b/src/decode/p25/message/tsbk/osp/control/StatusUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -15,7 +15,7 @@ public class StatusUpdate extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 160,161,162,163,164,165,166, 167,168,169,170,171,184,185,186,187,188,189,190,190,192,193,194,195 }; - public StatusUpdate( BitSetBuffer message, + public StatusUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/SystemServiceBroadcast.java b/src/decode/p25/message/tsbk/osp/control/SystemServiceBroadcast.java index 52f4d0b8..ed3f298f 100644 --- a/src/decode/p25/message/tsbk/osp/control/SystemServiceBroadcast.java +++ b/src/decode/p25/message/tsbk/osp/control/SystemServiceBroadcast.java @@ -3,7 +3,7 @@ package decode.p25.message.tsbk.osp.control; import java.util.List; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -18,7 +18,7 @@ public class SystemServiceBroadcast extends TSBKMessage public static final int[] REQUEST_PRIORITY_LEVEL = { 136,137,138,139,140, 141,142,143 }; - public SystemServiceBroadcast( BitSetBuffer message, + public SystemServiceBroadcast( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/TimeAndDateAnnouncement.java b/src/decode/p25/message/tsbk/osp/control/TimeAndDateAnnouncement.java index 8dc8ebd5..08f36752 100644 --- a/src/decode/p25/message/tsbk/osp/control/TimeAndDateAnnouncement.java +++ b/src/decode/p25/message/tsbk/osp/control/TimeAndDateAnnouncement.java @@ -7,7 +7,7 @@ import java.util.GregorianCalendar; import java.util.TimeZone; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -32,7 +32,7 @@ public class TimeAndDateAnnouncement extends TSBKMessage private SimpleDateFormat mTimeFormatter = new SimpleDateFormat( "EEE, d MMM yyyy HH:mm:ss Z" ); - public TimeAndDateAnnouncement( BitSetBuffer message, DataUnitID duid, + public TimeAndDateAnnouncement( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/osp/control/UnitDeregistrationAcknowledge.java b/src/decode/p25/message/tsbk/osp/control/UnitDeregistrationAcknowledge.java index b0614202..2bd147fc 100644 --- a/src/decode/p25/message/tsbk/osp/control/UnitDeregistrationAcknowledge.java +++ b/src/decode/p25/message/tsbk/osp/control/UnitDeregistrationAcknowledge.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -16,7 +16,7 @@ public class UnitDeregistrationAcknowledge extends TSBKMessage public static final int[] SOURCE_ID = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public UnitDeregistrationAcknowledge( BitSetBuffer message, + public UnitDeregistrationAcknowledge( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/UnitRegistrationCommand.java b/src/decode/p25/message/tsbk/osp/control/UnitRegistrationCommand.java index 87742d1f..28f18beb 100644 --- a/src/decode/p25/message/tsbk/osp/control/UnitRegistrationCommand.java +++ b/src/decode/p25/message/tsbk/osp/control/UnitRegistrationCommand.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -13,7 +13,7 @@ public class UnitRegistrationCommand extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public UnitRegistrationCommand( BitSetBuffer message, + public UnitRegistrationCommand( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/control/UnitRegistrationResponse.java b/src/decode/p25/message/tsbk/osp/control/UnitRegistrationResponse.java index 1675e236..9e4809dd 100644 --- a/src/decode/p25/message/tsbk/osp/control/UnitRegistrationResponse.java +++ b/src/decode/p25/message/tsbk/osp/control/UnitRegistrationResponse.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.control; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -16,7 +16,7 @@ public class UnitRegistrationResponse extends TSBKMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public UnitRegistrationResponse( BitSetBuffer message, + public UnitRegistrationResponse( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncement.java b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncement.java index 1c0f76fb..bf4d0e97 100644 --- a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncement.java +++ b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncement.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupMultiChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class GroupDataChannelAnnouncement extends GroupMultiChannelGrant { - public GroupDataChannelAnnouncement( BitSetBuffer message, + public GroupDataChannelAnnouncement( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncementExplicit.java b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncementExplicit.java index 8baa0e7d..796a754f 100644 --- a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncementExplicit.java +++ b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelAnnouncementExplicit.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupChannelGrantExplicit; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class GroupDataChannelAnnouncementExplicit extends GroupChannelGrantExplicit { - public GroupDataChannelAnnouncementExplicit( BitSetBuffer message, + public GroupDataChannelAnnouncementExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelGrant.java b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelGrant.java index 32e0c62b..62eff3eb 100644 --- a/src/decode/p25/message/tsbk/osp/data/GroupDataChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/data/GroupDataChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -9,7 +9,7 @@ import decode.p25.reference.Opcode; public class GroupDataChannelGrant extends GroupChannelGrant { - public GroupDataChannelGrant( BitSetBuffer message, + public GroupDataChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/IndividualDataChannelGrant.java b/src/decode/p25/message/tsbk/osp/data/IndividualDataChannelGrant.java index 6f8e4227..ac42a1a0 100644 --- a/src/decode/p25/message/tsbk/osp/data/IndividualDataChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/data/IndividualDataChannelGrant.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.UnitChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class IndividualDataChannelGrant extends UnitChannelGrant { - public IndividualDataChannelGrant( BitSetBuffer message, + public IndividualDataChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/SNDCPData.java b/src/decode/p25/message/tsbk/osp/data/SNDCPData.java index 6e1b54cf..577c8662 100644 --- a/src/decode/p25/message/tsbk/osp/data/SNDCPData.java +++ b/src/decode/p25/message/tsbk/osp/data/SNDCPData.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.ServiceMessage; import decode.p25.reference.DataUnitID; @@ -15,7 +15,7 @@ public abstract class SNDCPData extends ServiceMessage public static final int[] SOURCE_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public SNDCPData( BitSetBuffer message, + public SNDCPData( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelAnnouncementExplicit.java b/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelAnnouncementExplicit.java index 8d11c1ba..90dc4636 100644 --- a/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelAnnouncementExplicit.java +++ b/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelAnnouncementExplicit.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -25,7 +25,7 @@ public class SNDCPDataChannelAnnouncementExplicit extends SNDCPData private IdentifierProvider mIdentifierUpdateTransmit; private IdentifierProvider mIdentifierUpdateReceive; - public SNDCPDataChannelAnnouncementExplicit( BitSetBuffer message, + public SNDCPDataChannelAnnouncementExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelGrant.java b/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelGrant.java index 2affb5f1..e85ebe13 100644 --- a/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/data/SNDCPDataChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.IdentifierProvider; import decode.p25.message.IdentifierReceiver; import decode.p25.reference.DataUnitID; @@ -21,7 +21,7 @@ public class SNDCPDataChannelGrant extends SNDCPData implements IdentifierReceiv private IdentifierProvider mIdentifierUpdateTransmit; private IdentifierProvider mIdentifierUpdateReceive; - public SNDCPDataChannelGrant( BitSetBuffer message, + public SNDCPDataChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/data/SNDCPDataPageRequest.java b/src/decode/p25/message/tsbk/osp/data/SNDCPDataPageRequest.java index cd51844b..0a53c5c4 100644 --- a/src/decode/p25/message/tsbk/osp/data/SNDCPDataPageRequest.java +++ b/src/decode/p25/message/tsbk/osp/data/SNDCPDataPageRequest.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.data; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; public class SNDCPDataPageRequest extends SNDCPData @@ -12,7 +12,7 @@ public class SNDCPDataPageRequest extends SNDCPData public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public SNDCPDataPageRequest( BitSetBuffer message, + public SNDCPDataPageRequest( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrant.java b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrant.java index 9bec67c9..1232c291 100644 --- a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrant.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class GroupVoiceChannelGrant extends GroupChannelGrant { - public GroupVoiceChannelGrant( BitSetBuffer message, + public GroupVoiceChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdate.java b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdate.java index 7a7c3b45..30a9446d 100644 --- a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdate.java +++ b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdate.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupMultiChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class GroupVoiceChannelGrantUpdate extends GroupMultiChannelGrant { - public GroupVoiceChannelGrantUpdate( BitSetBuffer message, + public GroupVoiceChannelGrantUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdateExplicit.java b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdateExplicit.java index b818c5be..0a2b776d 100644 --- a/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdateExplicit.java +++ b/src/decode/p25/message/tsbk/osp/voice/GroupVoiceChannelGrantUpdateExplicit.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.GroupChannelGrantExplicit; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class GroupVoiceChannelGrantUpdateExplicit extends GroupChannelGrantExplicit { - public GroupVoiceChannelGrantUpdateExplicit( BitSetBuffer message, + public GroupVoiceChannelGrantUpdateExplicit( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectAnswerRequest.java b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectAnswerRequest.java index bc532999..5fe3ee75 100644 --- a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectAnswerRequest.java +++ b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectAnswerRequest.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.TSBKMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Digit; @@ -26,7 +26,7 @@ public class TelephoneInterconnectAnswerRequest extends TSBKMessage public static final int[] TARGET_ADDRESS = { 120,121,122,123,124,125,126, 127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143 }; - public TelephoneInterconnectAnswerRequest( BitSetBuffer message, + public TelephoneInterconnectAnswerRequest( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrant.java b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrant.java index b4156c09..174232f4 100644 --- a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.UnitChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -11,7 +11,7 @@ public class TelephoneInterconnectVoiceChannelGrant extends UnitChannelGrant public static final int[] CALL_TIMER = { 96,97,98,99,100,101,102,103, 104,105,106,107,108,109,110,111 }; - public TelephoneInterconnectVoiceChannelGrant( BitSetBuffer message, + public TelephoneInterconnectVoiceChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrantUpdate.java b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrantUpdate.java index b0bc2bc3..5459f361 100644 --- a/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrantUpdate.java +++ b/src/decode/p25/message/tsbk/osp/voice/TelephoneInterconnectVoiceChannelGrantUpdate.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; @@ -9,7 +9,7 @@ public class TelephoneInterconnectVoiceChannelGrantUpdate extends TelephoneInterconnectVoiceChannelGrant { - public TelephoneInterconnectVoiceChannelGrantUpdate( BitSetBuffer message, + public TelephoneInterconnectVoiceChannelGrantUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitAnswerRequest.java b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitAnswerRequest.java index 51a8c8b3..b1b8aabf 100644 --- a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitAnswerRequest.java +++ b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitAnswerRequest.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.UnitChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class UnitToUnitAnswerRequest extends UnitChannelGrant { - public UnitToUnitAnswerRequest( BitSetBuffer message, + public UnitToUnitAnswerRequest( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrant.java b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrant.java index d3335d47..8c191d27 100644 --- a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrant.java +++ b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrant.java @@ -1,7 +1,7 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.UnitChannelGrant; import decode.p25.message.tsbk.osp.control.IdentifierUpdate; import decode.p25.reference.DataUnitID; @@ -9,7 +9,7 @@ import decode.p25.reference.Opcode; public class UnitToUnitVoiceChannelGrant extends UnitChannelGrant { - public UnitToUnitVoiceChannelGrant( BitSetBuffer message, + public UnitToUnitVoiceChannelGrant( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { diff --git a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrantUpdate.java b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrantUpdate.java index 4595add9..0f0e0014 100644 --- a/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrantUpdate.java +++ b/src/decode/p25/message/tsbk/osp/voice/UnitToUnitVoiceChannelGrantUpdate.java @@ -1,14 +1,14 @@ package decode.p25.message.tsbk.osp.voice; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.p25.message.tsbk.UnitChannelGrant; import decode.p25.reference.DataUnitID; import decode.p25.reference.Opcode; public class UnitToUnitVoiceChannelGrantUpdate extends UnitChannelGrant { - public UnitToUnitVoiceChannelGrantUpdate( BitSetBuffer message, + public UnitToUnitVoiceChannelGrantUpdate( BinaryMessage message, DataUnitID duid, AliasList aliasList ) { super( message, duid, aliasList ); diff --git a/src/decode/passport/PassportMessage.java b/src/decode/passport/PassportMessage.java index 29ace89e..b1f9c282 100644 --- a/src/decode/passport/PassportMessage.java +++ b/src/decode/passport/PassportMessage.java @@ -26,7 +26,7 @@ import message.Message; import message.MessageType; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import decode.DecoderType; import edac.CRC; import edac.CRCPassport; @@ -53,12 +53,12 @@ public class PassportMessage extends Message private static final int[] sTYPE = { 48,47,46,45 }; private static final int[] sFREE = { 59,58,57,56,55,54,53,52,51,50,49 }; private static final int[] sCHECKSUM = { 67,66,65,64,63,62,61,60 }; - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private CRC mCRC; private AliasList mAliasList; private PassportMessage mIdleMessage; - public PassportMessage( BitSetBuffer message, + public PassportMessage( BinaryMessage message, PassportMessage idleMessage, AliasList list ) { @@ -68,12 +68,12 @@ public class PassportMessage extends Message mAliasList = list; } - public PassportMessage( BitSetBuffer message, AliasList list ) + public PassportMessage( BinaryMessage message, AliasList list ) { this( message, null, list ); } - public BitSetBuffer getBitSetBuffer() + public BinaryMessage getBitSetBuffer() { return mMessage; } diff --git a/src/decode/passport/PassportMessageProcessor.java b/src/decode/passport/PassportMessageProcessor.java index f0a80921..c3031390 100644 --- a/src/decode/passport/PassportMessageProcessor.java +++ b/src/decode/passport/PassportMessageProcessor.java @@ -24,9 +24,9 @@ import message.MessageType; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class PassportMessageProcessor implements Listener +public class PassportMessageProcessor implements Listener { private Broadcaster mBroadcaster = new Broadcaster(); private IdleMessageFinder mIdleFinder = new IdleMessageFinder(); @@ -39,7 +39,7 @@ public class PassportMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { PassportMessage message; diff --git a/src/decode/tait/Tait1200ANIMessage.java b/src/decode/tait/Tait1200ANIMessage.java index e4264819..1c472a72 100644 --- a/src/decode/tait/Tait1200ANIMessage.java +++ b/src/decode/tait/Tait1200ANIMessage.java @@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; public class Tait1200ANIMessage extends Message @@ -66,11 +66,11 @@ public class Tait1200ANIMessage extends Message private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" ); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private AliasList mAliasList; private CRC mCRC; - public Tait1200ANIMessage( BitSetBuffer message, AliasList list ) + public Tait1200ANIMessage( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/tait/Tait1200ANIMessageProcessor.java b/src/decode/tait/Tait1200ANIMessageProcessor.java index 531938be..e091b620 100644 --- a/src/decode/tait/Tait1200ANIMessageProcessor.java +++ b/src/decode/tait/Tait1200ANIMessageProcessor.java @@ -25,9 +25,9 @@ import org.slf4j.LoggerFactory; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class Tait1200ANIMessageProcessor implements Listener +public class Tait1200ANIMessageProcessor implements Listener { private final static Logger mLog = LoggerFactory.getLogger( Tait1200ANIMessageProcessor.class ); @@ -47,7 +47,7 @@ public class Tait1200ANIMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { mBroadcaster.receive( new Tait1200ANIMessage( buffer, mAliasList ) ); } diff --git a/src/decode/tait/Tait1200GPSMessage.java b/src/decode/tait/Tait1200GPSMessage.java index 1aa5f56e..59a899d8 100644 --- a/src/decode/tait/Tait1200GPSMessage.java +++ b/src/decode/tait/Tait1200GPSMessage.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; import alias.Alias; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; import edac.CRC; public class Tait1200GPSMessage extends Message @@ -113,11 +113,11 @@ public class Tait1200GPSMessage extends Message private static SimpleDateFormat mSDF = new SimpleDateFormat( "yyyyMMdd HHmmss" ); - private BitSetBuffer mMessage; + private BinaryMessage mMessage; private AliasList mAliasList; private CRC mCRC; - public Tait1200GPSMessage( BitSetBuffer message, AliasList list ) + public Tait1200GPSMessage( BinaryMessage message, AliasList list ) { mMessage = message; mAliasList = list; diff --git a/src/decode/tait/Tait1200GPSMessageProcessor.java b/src/decode/tait/Tait1200GPSMessageProcessor.java index 3ff49126..6e1887b0 100644 --- a/src/decode/tait/Tait1200GPSMessageProcessor.java +++ b/src/decode/tait/Tait1200GPSMessageProcessor.java @@ -25,9 +25,9 @@ import org.slf4j.LoggerFactory; import sample.Broadcaster; import sample.Listener; import alias.AliasList; -import bits.BitSetBuffer; +import bits.BinaryMessage; -public class Tait1200GPSMessageProcessor implements Listener +public class Tait1200GPSMessageProcessor implements Listener { private final static Logger mLog = LoggerFactory.getLogger( Tait1200GPSMessageProcessor.class ); @@ -47,7 +47,7 @@ public class Tait1200GPSMessageProcessor implements Listener } @Override - public void receive( BitSetBuffer buffer ) + public void receive( BinaryMessage buffer ) { mBroadcaster.receive( new Tait1200GPSMessage( buffer, mAliasList ) ); } diff --git a/src/dsp/fsk/FSK2Decoder.java b/src/dsp/fsk/FSK2Decoder.java index a9c06789..99a5e392 100644 --- a/src/dsp/fsk/FSK2Decoder.java +++ b/src/dsp/fsk/FSK2Decoder.java @@ -28,7 +28,8 @@ import java.util.List; import sample.Listener; import sample.real.RealSampleListener; import buffer.BooleanAveragingBuffer; -import dsp.fsk.SymbolEvent.Shift; +import dsp.symbol.SymbolEvent; +import dsp.symbol.SymbolEvent.Shift; /** * Binary Frequency Shift Keying (FSK) decoder. Implements a BFSK correlation diff --git a/src/dsp/fsk/LTRFSKDecoder.java b/src/dsp/fsk/LTRFSKDecoder.java index b5603d3c..9a81180c 100644 --- a/src/dsp/fsk/LTRFSKDecoder.java +++ b/src/dsp/fsk/LTRFSKDecoder.java @@ -34,7 +34,8 @@ import dsp.filter.FloatHalfBandFilter; import dsp.filter.FloatHalfBandNoDecimateFilter; import dsp.filter.LTRPulseShapingFilter; import dsp.filter.SquaringFilter; -import dsp.fsk.Slicer.Output; +import dsp.symbol.Slicer; +import dsp.symbol.Slicer.Output; public class LTRFSKDecoder implements RealSampleListener, Instrumentable { diff --git a/src/dsp/fsk/Dibit.java b/src/dsp/symbol/Dibit.java similarity index 99% rename from src/dsp/fsk/Dibit.java rename to src/dsp/symbol/Dibit.java index 700e10a0..d2d86b18 100644 --- a/src/dsp/fsk/Dibit.java +++ b/src/dsp/symbol/Dibit.java @@ -1,4 +1,4 @@ -package dsp.fsk; +package dsp.symbol; public enum Dibit { diff --git a/src/decode/p25/FrameSync.java b/src/dsp/symbol/FrameSync.java similarity index 91% rename from src/decode/p25/FrameSync.java rename to src/dsp/symbol/FrameSync.java index ed15e37f..01042c06 100644 --- a/src/decode/p25/FrameSync.java +++ b/src/dsp/symbol/FrameSync.java @@ -1,4 +1,4 @@ -package decode.p25; +package dsp.symbol; public enum FrameSync { diff --git a/src/dsp/fsk/Slicer.java b/src/dsp/symbol/Slicer.java similarity index 98% rename from src/dsp/fsk/Slicer.java rename to src/dsp/symbol/Slicer.java index 5fb9a83e..8b9a1455 100644 --- a/src/dsp/fsk/Slicer.java +++ b/src/dsp/symbol/Slicer.java @@ -1,11 +1,11 @@ -package dsp.fsk; +package dsp.symbol; import instrument.tap.stream.SymbolEventTap; import java.util.BitSet; import sample.Listener; -import dsp.fsk.SymbolEvent.Shift; +import dsp.symbol.SymbolEvent.Shift; /** * Symbol slicer with auto-aligning baud timing diff --git a/src/dsp/fsk/SymbolEvent.java b/src/dsp/symbol/SymbolEvent.java similarity index 98% rename from src/dsp/fsk/SymbolEvent.java rename to src/dsp/symbol/SymbolEvent.java index 6fe6c855..5bcd3495 100644 --- a/src/dsp/fsk/SymbolEvent.java +++ b/src/dsp/symbol/SymbolEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package dsp.fsk; +package dsp.symbol; import java.util.BitSet; diff --git a/src/dsp/SyncDetectListener.java b/src/dsp/symbol/SyncDetectListener.java similarity index 98% rename from src/dsp/SyncDetectListener.java rename to src/dsp/symbol/SyncDetectListener.java index 6e883e77..633cc964 100644 --- a/src/dsp/SyncDetectListener.java +++ b/src/dsp/symbol/SyncDetectListener.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package dsp; +package dsp.symbol; /** * Interface to allow an external process indicate that it has detected a diff --git a/src/dsp/SyncDetectProvider.java b/src/dsp/symbol/SyncDetectProvider.java similarity index 97% rename from src/dsp/SyncDetectProvider.java rename to src/dsp/symbol/SyncDetectProvider.java index f352a059..10001c96 100644 --- a/src/dsp/SyncDetectProvider.java +++ b/src/dsp/symbol/SyncDetectProvider.java @@ -15,7 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package dsp; +package dsp.symbol; + public interface SyncDetectProvider { diff --git a/src/edac/BCH_63_16_11.java b/src/edac/BCH_63_16_11.java index 122cb5d5..f7e925af 100644 --- a/src/edac/BCH_63_16_11.java +++ b/src/edac/BCH_63_16_11.java @@ -1,9 +1,11 @@ package edac; +import java.util.Arrays; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; /******************************************************************************* * SDR Trunk @@ -43,18 +45,20 @@ public class BCH_63_16_11 extends BerlekempMassey_63 * * @return - true = success, false = failure */ - public CRC correctNID( BitSetBuffer message ) + public BinaryMessage correctNID( BinaryMessage message ) { CRC status = CRC.PASSED; - int[] original = message.toReverseIntegerArray(); + int[] original = message.toReverseIntegerArray( 0, 62 ); int[] corrected = new int[ 63 ]; boolean irrecoverableErrors = decode( original, corrected ); if( irrecoverableErrors ) { - return CRC.FAILED_CRC; + message.setCRC( CRC.FAILED_CRC ); + + return message; } else { @@ -78,15 +82,17 @@ public class BCH_63_16_11 extends BerlekempMassey_63 } } - return status; + message.setCRC( status ); + + return message; } public static void main( String[] args ) { - String orig = "001001100000110010100101011111010001010101101001111111001010110"; - String error = "010110000000110010100101011011010001011101101001101111001110110"; -// xxxxxx x x x x - BitSetBuffer errorMessage = BitSetBuffer.load( error ); + String orig = "0010011000000011010010100000000110000111110011101010001010110000"; + String error = "0001010100000011010010100000000110000111100011001010001010110000"; + + BinaryMessage errorMessage = BinaryMessage.load( error ); BCH_63_16_11 bch = new BCH_63_16_11(); @@ -94,10 +100,10 @@ public class BCH_63_16_11 extends BerlekempMassey_63 mLog.debug( " ERR:" + errorMessage.toString() ); mLog.debug( " " ); - CRC status = bch.correctNID( errorMessage ); + errorMessage = bch.correctNID( errorMessage ); - mLog.debug( " CRC: " + status.name() ); - mLog.debug( "CORR:" + errorMessage.toString().substring( 0, 16 ) ); + mLog.debug( " CRC: " + errorMessage.getCRC().name() ); + mLog.debug( "CORR:" + errorMessage.toString() ); mLog.debug( "ORIG:" + orig ); } } diff --git a/src/edac/BerlekempMassey_63.java b/src/edac/BerlekempMassey_63.java index cf7b4631..f3875a9a 100644 --- a/src/edac/BerlekempMassey_63.java +++ b/src/edac/BerlekempMassey_63.java @@ -180,7 +180,7 @@ public class BerlekempMassey_63 /** * Decodes * @param input - * @param recd + * @param output * @return */ /* assume we have received bits grouped into mm-bit symbols in recd[i], @@ -201,7 +201,7 @@ public class BerlekempMassey_63 symbols will be okay and that if we are in luck, the errors are in the parity part of the transmitted codeword). Of course, these insoluble cases can be returned as error flags to the calling routine if desired. */ - public boolean decode( final int[] input, int[] recd ) //input, output + public boolean decode( final int[] input, int[] output ) //input, output { int u, q; int[][] elp = new int[ NN - KK + 2 ][ NN - KK ]; @@ -222,7 +222,7 @@ public class BerlekempMassey_63 /* put recd[i] into index form (ie as powers of alpha) */ for( int i = 0; i < NN; i++ ) { - recd[ i ] = index_of[ input[ i ] ]; + output[ i ] = index_of[ input[ i ] ]; } /* first form the syndromes */ @@ -232,10 +232,10 @@ public class BerlekempMassey_63 for( int j = 0; j < NN; j++ ) { - if( recd[ j ] != -1 ) + if( output[ j ] != -1 ) { /* recd[j] in index form */ - s[ i ] ^= alpha_to[ ( recd[ j ] + i * j ) % NN ]; + s[ i ] ^= alpha_to[ ( output[ j ] + i * j ) % NN ]; } } @@ -455,13 +455,13 @@ public class BerlekempMassey_63 { err[ i ] = 0; - if( recd[ i ] != -1 ) /* convert recd[] to polynomial form */ + if( output[ i ] != -1 ) /* convert recd[] to polynomial form */ { - recd[ i ] = alpha_to[ recd[ i ] ]; + output[ i ] = alpha_to[ output[ i ] ]; } else { - recd[ i ] = 0; + output[ i ] = 0; } } @@ -493,7 +493,7 @@ public class BerlekempMassey_63 q = q % NN; err[loc[i]] = alpha_to[(err[loc[i]] - q + NN) % NN]; - recd[loc[i]] ^= err[loc[i]]; /*recd[i] must be in polynomial form */ + output[loc[i]] ^= err[loc[i]]; /*recd[i] must be in polynomial form */ } } } @@ -515,13 +515,13 @@ public class BerlekempMassey_63 /* no non-zero syndromes => no errors: output received codeword */ for (int i = 0; i < NN; i++) { - if (recd[i] != -1) /* convert recd[] to polynomial form */ + if (output[i] != -1) /* convert recd[] to polynomial form */ { - recd[i] = alpha_to[recd[i]]; + output[i] = alpha_to[output[i]]; } else { - recd[i] = 0; + output[i] = 0; } } } @@ -530,13 +530,13 @@ public class BerlekempMassey_63 { for (int i = 0; i < NN; i++) /* could return error flag if desired */ { - if (recd[i] != -1) /* convert recd[] to polynomial form */ + if (output[i] != -1) /* convert recd[] to polynomial form */ { - recd[i] = alpha_to[recd[i]]; + output[i] = alpha_to[output[i]]; } else { - recd[i] = 0; /* just output received codeword as is */ + output[i] = 0; /* just output received codeword as is */ } } } diff --git a/src/edac/CRCLJ.java b/src/edac/CRCLJ.java index 51f3e425..c255a68e 100644 --- a/src/edac/CRCLJ.java +++ b/src/edac/CRCLJ.java @@ -22,7 +22,7 @@ import java.util.BitSet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; /** * LJ CRC checksum utility @@ -108,7 +108,7 @@ public class CRCLJ * Determines if FUNCTION AND ADDRESS bits pass the LJ CRC checksum * using a lookup table of CRC checksum values derived from the CRC-16 value */ - public static CRC checkAndCorrect( BitSetBuffer message ) + public static CRC checkAndCorrect( BinaryMessage message ) { int calculated = 0; //Starting value @@ -203,7 +203,7 @@ public class CRCLJ public static void main( String[] args ) { - BitSetBuffer msg = BitSetBuffer.load( "01010101101010101010000100011000000000100001000110000000001000010001100000000010" ); + BinaryMessage msg = BinaryMessage.load( "01010101101010101010000100011000000000100001000110000000001000010001100000000010" ); CRC crc = checkAndCorrect( msg ); diff --git a/src/edac/CRCP25.java b/src/edac/CRCP25.java index f4f9cd8b..f094afff 100644 --- a/src/edac/CRCP25.java +++ b/src/edac/CRCP25.java @@ -20,7 +20,7 @@ package edac; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; /** * P25 CRC check/correction methods @@ -222,7 +222,7 @@ public class CRCP25 * Performs error detection and single-bit error correction against the * data blocks of a PDU1 message. */ - public static CRC correctPDU1( BitSetBuffer message ) + public static BinaryMessage correctPDU1( BinaryMessage message ) { return correctPDU( message, PDU1_CHECKSUMS, 224 ); } @@ -231,7 +231,7 @@ public class CRCP25 * Performs error detection and single-bit error correction against the * data blocks of a PDU2 message. */ - public static CRC correctPDU2( BitSetBuffer message ) + public static BinaryMessage correctPDU2( BinaryMessage message ) { return correctPDU( message, PDU2_CHECKSUMS, 320 ); } @@ -240,12 +240,12 @@ public class CRCP25 * Performs error detection and single-bit error correction against the * data blocks of a PDU3 message. */ - public static CRC correctPDU3( BitSetBuffer message ) + public static BinaryMessage correctPDU3( BinaryMessage message ) { return correctPDU( message, PDU3_CHECKSUMS, 416 ); } - public static CRC correctPDU( BitSetBuffer message, long[] checksums, int crcStart ) + public static BinaryMessage correctPDU( BinaryMessage message, long[] checksums, int crcStart ) { long calculated = 0; //Starting value @@ -265,7 +265,9 @@ public class CRCP25 if( error == 0 || error == 0xFFFFFFFFl ) { - return CRC.PASSED; + message.setCRC( CRC.PASSED ); + + return message; } else { @@ -274,21 +276,25 @@ public class CRCP25 if( errorLocation >= 0 ) { message.flip( errorLocation + messageStart ); + + message.setCRC( CRC.CORRECTED ); - return CRC.CORRECTED; + return message; } } - return CRC.FAILED_CRC; + message.setCRC( CRC.FAILED_CRC ); + + return message; } /** * Error detection and correction of single-bit errors for CCITT 16-bit * CRC protected 80-bit messages. */ - public static CRC correctCCITT80( BitSetBuffer message, - int messageStart, - int crcStart ) + public static BinaryMessage correctCCITT80( BinaryMessage message, + int messageStart, + int crcStart ) { int calculated = 0; //Starting value @@ -306,7 +312,9 @@ public class CRCP25 if( residual == 0 || residual == 0xFFFF ) { - return CRC.PASSED; + message.setCRC( CRC.PASSED ); + + return message; } else { @@ -316,11 +324,15 @@ public class CRCP25 { message.flip( errorLocation + messageStart ); - return CRC.CORRECTED; + message.setCRC( CRC.CORRECTED ); + + return message; } } - return CRC.FAILED_CRC; + message.setCRC( CRC.FAILED_CRC ); + + return message; } /** @@ -330,7 +342,7 @@ public class CRCP25 * were generated assuming that the message is contiguous from 0 - 134 bits. * No data correction is performed. */ - public static CRC checkCRC9( BitSetBuffer message, int messageStart ) + public static CRC checkCRC9( BinaryMessage message, int messageStart ) { int calculated = 0x0; //Initial fill of all ones @@ -372,7 +384,7 @@ public class CRCP25 * * @return - true if all 12 segments of the message can be checked/corrected */ - public static boolean correctGalois24( BitSetBuffer tdulc ) + public static boolean correctGalois24( BinaryMessage tdulc ) { boolean passes = true; @@ -380,7 +392,10 @@ public class CRCP25 while( x < tdulc.size() && passes ) { - passes = Galois24.checkAndCorrect( tdulc, x ); + + tdulc = Galois24.checkAndCorrect( tdulc, x ); + + passes = tdulc.getCRC() == CRC.PASSED; x += 24; } @@ -392,7 +407,7 @@ public class CRCP25 /** * Calculates the value of the message checksum as a long */ - public static long getLongChecksum( BitSetBuffer message, + public static long getLongChecksum( BinaryMessage message, int crcStart, int crcLength ) { return message.getLong( crcStart, crcStart + crcLength - 1 ); @@ -401,7 +416,7 @@ public class CRCP25 /** * Calculates the value of the message checksum as an integer */ - public static int getIntChecksum( BitSetBuffer message, + public static int getIntChecksum( BinaryMessage message, int crcStart, int crcLength ) { return message.getInt( crcStart, crcStart + crcLength - 1 ); @@ -443,7 +458,7 @@ public class CRCP25 { String raw = "000000001000001100000001010001111011000100001010010001111100000000000101000000000000000001000000000000110000000000000001101010101010101010101010"; - BitSetBuffer message = BitSetBuffer.load( raw ); + BinaryMessage message = BinaryMessage.load( raw ); mLog.debug( "MSG:" + message.toString() ); diff --git a/src/edac/CRCPassport.java b/src/edac/CRCPassport.java index 7546835e..c652064d 100644 --- a/src/edac/CRCPassport.java +++ b/src/edac/CRCPassport.java @@ -19,7 +19,7 @@ package edac; import java.util.BitSet; -import bits.BitSetBuffer; +import bits.BinaryMessage; /** * Passport CRC checksum utility @@ -168,7 +168,7 @@ public class CRCPassport * used in the decoder. For right now, correct any messages where the * residual indicates that the final 1 or 2 bits are bad. */ - public static BitSetBuffer correct( BitSetBuffer msg ) + public static BinaryMessage correct( BinaryMessage msg ) { int residual = (int)( 0xFF & getResidual( msg ) ); @@ -208,7 +208,7 @@ public class CRCPassport * Performs an even parity check on the bitset. If the number of bits that * are set is an even number, then it passes the even parity check */ - public static boolean isEvenParity( BitSetBuffer bits ) + public static boolean isEvenParity( BinaryMessage bits ) { return ( bits.cardinality() % 2 == 0 ); } diff --git a/src/edac/CRCUtil.java b/src/edac/CRCUtil.java index 85bdcf39..aaed8a0b 100644 --- a/src/edac/CRCUtil.java +++ b/src/edac/CRCUtil.java @@ -20,7 +20,7 @@ package edac; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; public class CRCUtil { @@ -44,7 +44,7 @@ public class CRCUtil for( int x = 0; x < messageSize; x++ ) { - BitSetBuffer message = new BitSetBuffer( messageSize + crcSize ); + BinaryMessage message = new BinaryMessage( messageSize + crcSize ); message.load( messageSize, crcSize, initialFill ); @@ -130,7 +130,7 @@ public class CRCUtil * @return message with all message bits zeroed out, and the remainder * placed in the crc field which starts at index messageLength */ - public static BitSetBuffer decode( BitSetBuffer message, + public static BinaryMessage decode( BinaryMessage message, int messageStart, int messageSize, long polynomial, @@ -140,7 +140,7 @@ public class CRCUtil i >= messageStart && i < messageSize; i = message.nextSetBit( i+1 ) ) { - BitSetBuffer polySet = new BitSetBuffer( crcSize + i + 1 ); + BinaryMessage polySet = new BinaryMessage( crcSize + i + 1 ); polySet.load( i, crcSize + 1, polynomial ); diff --git a/src/edac/Galois24.java b/src/edac/Galois24.java index b5553919..fc2f62ce 100644 --- a/src/edac/Galois24.java +++ b/src/edac/Galois24.java @@ -3,7 +3,7 @@ package edac; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import bits.BitSetBuffer; +import bits.BinaryMessage; /******************************************************************************* * SDR Trunk @@ -45,7 +45,7 @@ public class Galois24 0x040, 0x020, 0x010, 0x008, 0x004, 0x002, 0x001 }; - private static int calculateChecksum( BitSetBuffer message, int startIndex ) + private static int calculateChecksum( BinaryMessage message, int startIndex ) { int calculated = 0; //Starting value @@ -60,7 +60,7 @@ public class Galois24 return calculated; } - public static boolean checkAndCorrect( BitSetBuffer message, int startIndex ) + public static BinaryMessage checkAndCorrect( BinaryMessage message, int startIndex ) { boolean parityError = message.cardinality() % 2 != 0; @@ -73,8 +73,10 @@ public class Galois24 { message.flip( startIndex + 23 ); } + + message.setCRC( CRC.PASSED ); - return true; + return message; } /* Get original message value */ @@ -123,10 +125,14 @@ public class Galois24 if( Integer.bitCount( original ^ corrected ) > 3 ) { - return false; + message.setCRC( CRC.FAILED_CRC ); + + return message; } - return true; + message.setCRC( CRC.PASSED ); + + return message; } else { @@ -139,10 +145,12 @@ public class Galois24 } } - return false; + message.setCRC( CRC.FAILED_CRC ); + + return message; } - private static int getSyndrome( BitSetBuffer message, int startIndex ) + private static int getSyndrome( BinaryMessage message, int startIndex ) { int calculated = calculateChecksum( message, startIndex ); @@ -156,7 +164,7 @@ public class Galois24 /* NID + TDULC message */ String msg = "0010011000001111100100110011000100111010000111010001000000000000000000000000000000000000000000000100101010010111000000000000000000000000000010010111101111111111000000000000000000000000000000000000000000000000000110001011100001111101010110111001001011010010101111010010000010110011101111111100100000010001111100011010010100001101111001111001100000111000"; - BitSetBuffer message = BitSetBuffer.load( msg ); + BinaryMessage message = BinaryMessage.load( msg ); mLog.debug( "MSG: " + message.toString() ); @@ -164,9 +172,9 @@ public class Galois24 while( x < msg.length() ) { - boolean passes = checkAndCorrect( message, x ); + message = checkAndCorrect( message, x ); - mLog.debug( "X:" + x + " Pass:" + passes ); + mLog.debug( "X:" + x + " Pass:" + ( message.getCRC()== CRC.PASSED ) ); x += 24; } } diff --git a/src/instrument/tap/event/SyncDetectTap.java b/src/instrument/tap/event/SyncDetectTap.java index 5375a76b..b6b123ed 100644 --- a/src/instrument/tap/event/SyncDetectTap.java +++ b/src/instrument/tap/event/SyncDetectTap.java @@ -20,8 +20,8 @@ package instrument.tap.event; import instrument.tap.Tap; import instrument.tap.TapListener; import instrument.tap.TapType; -import dsp.SyncDetectListener; -import dsp.SyncDetectProvider; +import dsp.symbol.SyncDetectListener; +import dsp.symbol.SyncDetectProvider; public class SyncDetectTap extends Tap implements SyncDetectListener, diff --git a/src/instrument/tap/stream/DibitTap.java b/src/instrument/tap/stream/DibitTap.java index 1b1f8f02..16069bce 100644 --- a/src/instrument/tap/stream/DibitTap.java +++ b/src/instrument/tap/stream/DibitTap.java @@ -20,7 +20,7 @@ package instrument.tap.stream; import instrument.tap.TapListener; import instrument.tap.TapType; import sample.Listener; -import dsp.fsk.Dibit; +import dsp.symbol.Dibit; public class DibitTap extends StreamTap implements Listener diff --git a/src/instrument/tap/stream/DibitTapViewPanel.java b/src/instrument/tap/stream/DibitTapViewPanel.java index 5c496cfd..4769cac8 100644 --- a/src/instrument/tap/stream/DibitTapViewPanel.java +++ b/src/instrument/tap/stream/DibitTapViewPanel.java @@ -30,7 +30,7 @@ import java.awt.geom.Rectangle2D; import java.util.List; import java.util.Observable; -import dsp.fsk.Dibit; +import dsp.symbol.Dibit; public class DibitTapViewPanel extends TapViewPanel { diff --git a/src/instrument/tap/stream/SymbolEventTap.java b/src/instrument/tap/stream/SymbolEventTap.java index a5b05185..9763f090 100644 --- a/src/instrument/tap/stream/SymbolEventTap.java +++ b/src/instrument/tap/stream/SymbolEventTap.java @@ -20,7 +20,7 @@ package instrument.tap.stream; import instrument.tap.TapListener; import instrument.tap.TapType; import sample.Listener; -import dsp.fsk.SymbolEvent; +import dsp.symbol.SymbolEvent; public class SymbolEventTap extends StreamTap implements Listener { diff --git a/src/instrument/tap/stream/SymbolEventTapViewPanel.java b/src/instrument/tap/stream/SymbolEventTapViewPanel.java index f1e4ab27..32c6ec99 100644 --- a/src/instrument/tap/stream/SymbolEventTapViewPanel.java +++ b/src/instrument/tap/stream/SymbolEventTapViewPanel.java @@ -29,7 +29,7 @@ import java.awt.geom.Rectangle2D; import java.util.List; import java.util.Observable; -import dsp.fsk.SymbolEvent; +import dsp.symbol.SymbolEvent; public class SymbolEventTapViewPanel extends TapViewPanel {