Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add new read() method that sets read buffer size #271

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions usbserial/src/main/java/com/felhr/usbserial/SerialBuffer.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@ public class SerialBuffer
private byte[] readBufferCompatible; // Read buffer for android < 4.2
private boolean debugging = false;

private boolean version;
private int readBufferSize = DEFAULT_READ_BUFFER_SIZE;

public SerialBuffer(boolean version)
{
writeBuffer = new SynchronizedBuffer();
if(version)
{
readBuffer = ByteBuffer.allocate(DEFAULT_READ_BUFFER_SIZE);
readBuffer = ByteBuffer.allocate(readBufferSize);

}else
{
readBufferCompatible = new byte[DEFAULT_READ_BUFFER_SIZE];
readBufferCompatible = new byte[readBufferSize];
}
this.version = version;
}

/*
Expand All @@ -37,6 +41,31 @@ public void debug(boolean value)
debugging = value;
}

public void setReadBufferSize(int readBufferSize)
{
synchronized (this)
{
if(version)
{
readBuffer = ByteBuffer.allocate(readBufferSize);

}else
{
readBufferCompatible = new byte[readBufferSize];
}

this.readBufferSize = readBufferSize;
}
}

public int getReadBufferSize()
{
synchronized (this)
{
return readBufferSize;
}
}

public ByteBuffer getReadBuffer()
{
synchronized(this)
Expand Down
19 changes: 13 additions & 6 deletions usbserial/src/main/java/com/felhr/usbserial/UsbSerialDevice.java
Original file line number Diff line number Diff line change
Expand Up @@ -160,24 +160,31 @@ public int getInitialBaudRate() {
@Override
public int read(UsbReadCallback mCallback)
{
return read(mCallback, serialBuffer.getReadBufferSize());
}

@Override
public int read(UsbReadCallback callback, int readBufferSize) {
if(!asyncMode)
return -1;

if(readBufferSize != serialBuffer.getReadBufferSize())
serialBuffer.setReadBufferSize(readBufferSize);

if(mr1Version)
{
if (workerThread != null) {
workerThread.setCallback(mCallback);
workerThread.getUsbRequest().queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE);
workerThread.setCallback(callback);
workerThread.getUsbRequest().queue(serialBuffer.getReadBuffer(), serialBuffer.getReadBufferSize());
}
}else
{
readThread.setCallback(mCallback);
readThread.setCallback(callback);
//readThread.start();
}
return 0;
}


@Override
public abstract void close();

Expand Down Expand Up @@ -366,7 +373,7 @@ public void doRun()
onReceivedData(data);
}
// Queue a new request
requestIN.queue(serialBuffer.getReadBuffer(), SerialBuffer.DEFAULT_READ_BUFFER_SIZE);
requestIN.queue(serialBuffer.getReadBuffer(), serialBuffer.getReadBufferSize());
}
}

Expand Down Expand Up @@ -434,7 +441,7 @@ public void doRun()
int numberBytes;
if(inEndpoint != null)
numberBytes = connection.bulkTransfer(inEndpoint, serialBuffer.getBufferCompatible(),
SerialBuffer.DEFAULT_READ_BUFFER_SIZE, 0);
serialBuffer.getReadBufferSize(), 0);
else
numberBytes = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public interface UsbSerialInterface
boolean open();
void write(byte[] buffer);
int read(UsbReadCallback mCallback);
int read(UsbReadCallback mCallback, int readBufferSize);
void close();

// Common Usb Serial Operations (I/O Synchronous)
Expand Down