Merge branch 'anotherlab:main' into main

Author: AlexMedia

UsbSerialForAndroid/driver/CdcAcmSerialDriver.cs

@@ -37,6 +37,16 @@ public CdcAcmSerialDriver(UsbDevice device, bool? enableAsyncReads = null)
             mPort = new CdcAcmSerialPort(device, 0, this, enableAsyncReads);
         }
 
+        // Additional constructor for ProbeDevice called by Reflection
+        // Note that this defaults to enableAsyncReads = false as
+        // there is no support for passing additional arguments from ProbeDevice
+        public CdcAcmSerialDriver(UsbDevice device)
+        {
+            mDevice = device;
+            bool enableAsyncReads = false;  // For clarity of understanding
+            mPort = new CdcAcmSerialPort(device, 0, this, enableAsyncReads);
+        }
+
         class CdcAcmSerialPort : CommonUsbSerialPort
         {
             private bool mEnableAsyncReads;

UsbSerialForAndroid/driver/FtdiSerialDriver.cs

@@ -59,7 +59,7 @@ public FtdiSerialDriver(UsbDevice device)
 
             for (int port = 0; port < device.InterfaceCount; port++)
             {
-                mPorts.Add(new FtdiSerialPort(mDevice, port));
+                mPorts.Add(new FtdiSerialPort(mDevice, port, this));
             }
         }
 
@@ -212,7 +212,7 @@ protected int ReadFilter(byte[] buffer, int totalBytesRead, int maxPacketSize)
                     if (length < 0)
                         throw new IOException("Expected at least " + READ_HEADER_LENGTH + " bytes");
 
-                    Buffer.BlockCopy(buffer, srcPos + READ_HEADER_LENGTH, buffer, destPos, length);
+                    Buffer.BlockCopy(mReadBuffer, srcPos + READ_HEADER_LENGTH, buffer, destPos, length);
                     destPos += length;
                 }
                 return destPos;
@@ -497,4 +497,4 @@ public static Dictionary<int, int[]> GetSupportedDevices()
             };
         }
     }
-}
+}