Merge pull request #3 from umjammer/0.0.16v

0.0.16v
umjammer · Jan 30, 2024 · a65fb24 · a65fb24
2 parents b4aaa2a + af5a260
commit a65fb24
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>purejavahidapi</groupId>
   <artifactId>purejavahidapi</artifactId>
-  <version>0.0.15v</version>
+  <version>0.0.16v</version>
 
   <packaging>jar</packaging>
   <name>Pure Java HID-API</name>

diff --git a/src/main/java/purejavahidapi/linux/HidDevice.java b/src/main/java/purejavahidapi/linux/HidDevice.java
@@ -36,7 +36,6 @@
 
 import com.sun.jna.Native;
 import purejavahidapi.DeviceRemovalListener;
-import purejavahidapi.InputReportListener;
 import purejavahidapi.shared.SyncPoint;
 
 import static purejavahidapi.linux.CLibrary.EACCES;
@@ -166,8 +165,12 @@ private void runReadOnBackground() throws IOException {
                     // the HID descriptor AND parse it. I like the Mac OS and Windows ways better, what a mess the world is!
                     int bytes_read = read(m_DeviceHandle, m_InputReportBytes, m_InputReportBytes.length);
                     if (m_InputReportListener != null) {
-                        byte reportID = m_UsesNumberedReports ? m_InputReportBytes[0] : 0;
-                        System.arraycopy(m_InputReportBytes, 0, m_InputReportBytes, 0, bytes_read);
+                        byte reportID = 0;
+                        if (m_UsesNumberedReports) {
+                            reportID = m_InputReportBytes[0];
+                            bytes_read--;
+                            System.arraycopy(m_InputReportBytes, 1, m_InputReportBytes, 0, bytes_read);
+                        }
                         m_InputReportListener.onInputReport(this, reportID, m_InputReportBytes, bytes_read);
                     }
                 }

diff --git a/src/main/java/purejavahidapi/macosx/HidDevice.java b/src/main/java/purejavahidapi/macosx/HidDevice.java
@@ -40,11 +40,8 @@
 import com.sun.jna.Memory;
 import com.sun.jna.NativeLong;
 import com.sun.jna.Pointer;
-import purejavahidapi.DeviceRemovalListener;
-import purejavahidapi.InputReportListener;
 import purejavahidapi.shared.SyncPoint;
 import vavi.util.Debug;
-import vavi.util.StringUtil;
 
 import static purejavahidapi.macosx.CoreFoundationLibrary.*;
 import static purejavahidapi.macosx.IOHIDManagerLibrary.IOHIDDeviceCallback;
@@ -272,8 +269,14 @@ public void callback(Pointer context, int result, Pointer sender, int reportType
             HidDevice dev = m_DevFromCallback.get(this);
             if (dev != null) {
                 if (dev.m_InputReportListener != null) {
-                    int length = report_length.intValue();
+                    int length;
+                    if (reportId == 0) {
+                        length = report_length.intValue();
                     report.read(0, dev.m_InputReportData, 0, length);
+                    } else {
+                        length = report_length.intValue() - 1;
+                        report.read(1, dev.m_InputReportData, 0, length);
+                    }
                     dev.m_InputReportListener.onInputReport(dev, (byte) reportId, dev.m_InputReportData, length);
                 }
             } else

diff --git a/src/main/java/purejavahidapi/windows/HidDevice.java b/src/main/java/purejavahidapi/windows/HidDevice.java
@@ -273,12 +273,17 @@ private void runReadOnBackground() {
                 }
             }
 
-            byte reportId = m_Transfrd[INPUT][0] > 0 ? m_Buffer[INPUT].getByte(0) : 0;
-            m_Buffer[INPUT].read(0, m_InputReportBytes, 0, m_Transfrd[INPUT][0]);
+            if (m_Transfrd[INPUT][0] > 0) {
+                byte reportId = m_Buffer[INPUT].getByte(0);
+                m_Transfrd[INPUT][0]--;
+
+                m_Buffer[INPUT].read(1, m_InputReportBytes, 0, m_Transfrd[INPUT][0]);
 
             if (m_InputReportListener != null)
                 m_InputReportListener.onInputReport(this, reportId, m_InputReportBytes, m_Transfrd[INPUT][0]);
         }
+
+        }
         m_SyncShutdown.waitAndSync();
     }