ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2025-01-23 14:41:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win] Improved HidP bindings

Browse source 
Marked arrays with [In] and [Out] as required. Fixes issues with
axis/button capabilities returning empty results.

Added bindings for link collection node transversal.
This commit is contained in:
thefiddler 2014-07-31 09:49:08 +02:00
parent 131de67459
commit f3b3b8860e
1 changed files with 61 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Source/OpenTK/Platform/Windows/Bindings/HidProtocol.cs
View file

@ -43,54 +43,73 @@ namespace OpenTK.Platform.Windows
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetButtonCaps")]
public static extern HidProtocolStatus GetButtonCaps(HidProtocolReportType hidProtocolReportType,
IntPtr button_caps, ref ushort p, byte[] preparsed_data);
IntPtr button_caps, ref ushort p, [In] byte[] preparsed_data);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetButtonCaps")]
public static extern HidProtocolStatus GetButtonCaps(HidProtocolReportType hidProtocolReportType,
HidProtocolButtonCaps[] button_caps, ref ushort p, byte[] preparsed_data);
[Out] HidProtocolButtonCaps[] button_caps, ref ushort p, [In] byte[] preparsed_data);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetCaps")]
public static extern HidProtocolStatus GetCaps(byte[] preparsed_data, ref HidProtocolCaps capabilities);
public static extern HidProtocolStatus GetCaps([In] byte[] preparsed_data, ref HidProtocolCaps capabilities);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetData")]
public static extern HidProtocolStatus GetData(HidProtocolReportType type,
IntPtr data, ref int data_length,
byte[] preparsed_data, IntPtr report, int report_length);
[In] byte[] preparsed_data, IntPtr report, int report_length);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetData")]
public static extern HidProtocolStatus GetData(HidProtocolReportType type,
HidProtocolData[] data, ref int data_length,
byte[] preparsed_data, IntPtr report, int report_length);
[Out] HidProtocolData[] data, ref int data_length,
[In] byte[] preparsed_data, IntPtr report, int report_length);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetLinkCollectionNodes")]
public static extern HidProtocolStatus GetLinkCollectionNodes(
[Out] HidProtocolLinkCollectionNode[] LinkCollectionNodes,
ref int LinkCollectionNodesLength,
[In] byte[] PreparsedData);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetScaledUsageValue")]
static public extern HidProtocolStatus GetScaledUsageValue(HidProtocolReportType type,
HIDPage usage_page, short link_collection, short usage, ref int usage_value,
byte[] preparsed_data, IntPtr report, int report_length);
[In] byte[] preparsed_data, IntPtr report, int report_length);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetSpecificButtonCaps")]
public static extern HidProtocolStatus GetSpecificButtonCaps(HidProtocolReportType ReportType,
HIDPage UsagePage, ushort LinkCollection, ushort Usage,
[Out] HidProtocolButtonCaps[] ButtonCaps, ref ushort ButtonCapsLength,
[In] byte[] PreparsedData);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetUsageValue")]
public static extern HidProtocolStatus GetUsageValue(HidProtocolReportType type,
HIDPage usage_page, short link_collection, short usage, ref uint usage_value,
byte[] preparsed_data, IntPtr report, int report_length);
[In] byte[] preparsed_data, IntPtr report, int report_length);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetValueCaps")]
public static extern HidProtocolStatus GetValueCaps(HidProtocolReportType type,
IntPtr caps, ref ushort caps_length, byte[] preparsed_data);
IntPtr caps, ref ushort caps_length, [In] byte[] preparsed_data);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_GetValueCaps")]
public static extern HidProtocolStatus GetValueCaps(HidProtocolReportType type,
HidProtocolValueCaps[] caps, ref ushort caps_length, byte[] preparsed_data);
[Out] HidProtocolValueCaps[] caps, ref ushort caps_length, [In] byte[] preparsed_data);
[SuppressUnmanagedCodeSecurity]
[DllImport(lib, SetLastError = true, EntryPoint = "HidP_MaxDataListLength")]
public static extern int MaxDataListLength(HidProtocolReportType type, byte[] preparsed_data);
public static extern int MaxDataListLength(HidProtocolReportType type, [In] byte[] preparsed_data);
}
enum HidProtocolCollectionType : byte
{
}
enum HidProtocolReportType : ushort
@ -124,6 +143,7 @@ namespace OpenTK.Platform.Windows
[FieldOffset(56)] public HidProtocolNotRange NotRange;
}
[StructLayout(LayoutKind.Sequential)]
struct HidProtocolCaps
{
public short Usage;
@ -153,6 +173,7 @@ namespace OpenTK.Platform.Windows
[FieldOffset(4), MarshalAs(UnmanagedType.U1)] public bool On;
}
[StructLayout(LayoutKind.Sequential)]
struct HidProtocolNotRange
{
public short Usage;
@ -165,6 +186,35 @@ namespace OpenTK.Platform.Windows
short Reserved4;
}
[StructLayout(LayoutKind.Sequential)]
struct HidProtocolLinkCollectionNode
{
public ushort LinkUsage;
public HIDPage LinkUsagePage;
public ushort Parent;
public ushort NumberOfChildren;
public ushort NextSibling;
public ushort FirstChild;
int bitfield;
public IntPtr UserContext;
public HidProtocolCollectionType CollectionType
{
get
{
return (HidProtocolCollectionType)(bitfield & 0xff);
}
}
public bool IsAlias
{
get
{
return (bitfield & 0x100) == 1;
}
}
}
struct HidProtocolRange
{
public short UsageMin;