Skip to content

Commit 9e95e64

Browse files
committed
issue jawi#236 - removed SUMP 512kB sample upper limit
1 parent 57fc151 commit 9e95e64

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

device.logicsniffer/src/main/java/org/sump/device/logicsniffer/LogicSnifferAcquisitionTask.java

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public AcquisitionResult call() throws IOException, InterruptedException
108108
final int sampleCount = this.config.getSampleCount();
109109
if ( sampleCount <= 0 )
110110
{
111+
LOG.log( Level.WARNING, "Internal error: did not obtain correct number of samples (" + sampleCount + ")?!" );
111112
throw new InternalError( "Internal error: did not obtain correct number of samples (" + sampleCount + ")?!" );
112113
}
113114

device.logicsniffer/src/main/java/org/sump/device/logicsniffer/LogicSnifferConfig.java

+2-14
Original file line numberDiff line numberDiff line change
@@ -334,19 +334,7 @@ public int getRLEDataWidth()
334334
*/
335335
public int getSampleCount()
336336
{
337-
int samples;
338-
if ( isDoubleDataRateEnabled() )
339-
{
340-
// When the multiplexer is turned on, the upper two channel blocks are
341-
// disabled, leaving only 16 channels for capturing...
342-
samples = getReadCounter() & 0xffff8;
343-
}
344-
else
345-
{
346-
samples = getReadCounter() & 0xffffc;
347-
}
348-
349-
return samples;
337+
return getReadCounter();
350338
}
351339

352340
/**
@@ -777,7 +765,7 @@ public void setSampleCount( final int aCount ) throws IllegalArgumentException
777765
{
778766
throw new IllegalArgumentException( "Sample count cannot be zero!" );
779767
}
780-
this.size = aCount & 0xFFFFF;
768+
this.size = aCount;// & 0xFFFFF;
781769
}
782770

783771
/**

0 commit comments

Comments
 (0)