Merge branch 'jay' into vigem-udpserver

This commit is contained in:
Travis Nickles 2018-10-11 03:41:11 -05:00
commit 2ef6fe312f
2 changed files with 338 additions and 333 deletions

View File

@ -705,6 +705,8 @@ namespace DS4Windows
uint HamSeed = 2351727372;
private unsafe void performDs4Input()
{
unchecked
{
firstActive = DateTime.UtcNow;
NativeMethods.HidD_SetNumInputBuffers(hDevice.safeReadHandle.DangerousGetHandle(), 2);
@ -759,7 +761,7 @@ namespace DS4Windows
//Array.Copy(btInputReport, 2, inputReport, 0, inputReport.Length);
fixed (byte* byteP = &btInputReport[2], imp = inputReport)
{
for (int j = 0; j < BT_INPUT_REPORT_LENGTH-2;j++)
for (int j = 0; j < BT_INPUT_REPORT_LENGTH - 2; j++)
{
imp[j] = byteP[j];
}
@ -979,7 +981,7 @@ namespace DS4Windows
for (int i = 6; i < 12; i++)
{
pbAccel[i-6] = pbInput[i];
pbAccel[i - 6] = pbInput[i];
}
sixAxis.handleSixaxis(pbGyro, pbAccel, cState, elapsedDeltaTime);
@ -1089,6 +1091,7 @@ namespace DS4Windows
error = string.Empty;
cState.CopyTo(pState);
}
lock (eventQueueLock)
{

View File

@ -1,8 +1,10 @@
using System;
using System.Runtime.InteropServices;
using System.Security;
using Microsoft.Win32.SafeHandles;
namespace DS4Windows
{
[SuppressUnmanagedCodeSecurity]
internal static class NativeMethods
{
[StructLayout(LayoutKind.Sequential)]