The-Homebrew-Cloud/cemu-DS4Windows
2
0
Fork 0
mirror of https://github.com/cemu-project/DS4Windows.git synced 2025-03-01 05:15:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jay' into vigem-udpserver

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
DS4Windows/DS4Library/DS4Device.cs
View File

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

2
DS4Windows/HidLibrary/NativeMethods.cs
View File

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