Skip to content

Use maxPacketSize of Interface 0 for the buffer in getUsbStringDescriptor and getLanguages #18

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use maxPacketSize of Interface 0 for the buffer in getUsbStringDescriptor and getLanguages #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions src/main/java/org/usb4java/javax/AbstractDevice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,8 @@ public final UsbStringDescriptor getUsbStringDescriptor(final byte index)
final short[] languages = getLanguages();
final DeviceHandle handle = open();
final short langId = languages.length == 0 ? 0 : languages[0];
final ByteBuffer data = ByteBuffer.allocateDirect(256);
final byte maxBufferSize = getUsbDeviceDescriptor().bMaxPacketSize0();
final ByteBuffer data = ByteBuffer.allocateDirect(maxBufferSize);
final int result =
LibUsb.getStringDescriptor(handle, index, langId, data);
if (result < 0)
Expand Down Expand Up @@ -536,7 +537,8 @@ public final String getString(final byte index) throws UsbException,
private short[] getLanguages() throws UsbException
{
final DeviceHandle handle = open();
final ByteBuffer buffer = ByteBuffer.allocateDirect(256);
final byte maxBufferSize = getUsbDeviceDescriptor().bMaxPacketSize0();
final ByteBuffer buffer = ByteBuffer.allocateDirect(maxBufferSize);
final int result = LibUsb.getDescriptor(handle, LibUsb.DT_STRING,
(byte) 0, buffer);
if (result < 0)
Expand Down