update sdl Merge commit '4d48f9d23713d94b861da7b5d41baf2a41334994'
This commit is contained in:
4
external/sdl/SDL/src/hidapi/ios/hid.m
vendored
4
external/sdl/SDL/src/hidapi/ios/hid.m
vendored
@ -20,6 +20,8 @@
|
||||
*/
|
||||
#include "SDL_internal.h"
|
||||
|
||||
#if defined(__IOS__) || defined(__TVOS__)
|
||||
|
||||
#ifndef SDL_HIDAPI_DISABLED
|
||||
|
||||
#include "../SDL_hidapi_c.h"
|
||||
@ -1031,3 +1033,5 @@ HID_API_EXPORT const wchar_t* HID_API_CALL hid_error(hid_device *dev)
|
||||
}
|
||||
|
||||
#endif /* !SDL_HIDAPI_DISABLED */
|
||||
|
||||
#endif /* __IOS__ || __TVOS__ */
|
||||
|
@ -31,6 +31,7 @@
|
||||
#pragma warning(push)
|
||||
#pragma warning(disable: 4200)
|
||||
#pragma warning(disable: 4201)
|
||||
#pragma warning(disable: 4214)
|
||||
#endif
|
||||
|
||||
#include <windows.h>
|
||||
@ -118,9 +119,9 @@ typedef struct hid_pp_link_collection_node_ {
|
||||
USHORT NumberOfChildren;
|
||||
USHORT NextSibling;
|
||||
USHORT FirstChild;
|
||||
UINT CollectionType : 8;
|
||||
UINT IsAlias : 1;
|
||||
UINT Reserved : 23;
|
||||
ULONG CollectionType : 8;
|
||||
ULONG IsAlias : 1;
|
||||
ULONG Reserved : 23;
|
||||
// Same as the public API structure HIDP_LINK_COLLECTION_NODE, but without PVOID UserContext at the end
|
||||
} hid_pp_link_collection_node, *phid_pp_link_collection_node;
|
||||
|
||||
@ -145,17 +146,17 @@ typedef struct hid_pp_cap_ {
|
||||
USAGE LinkUsage;
|
||||
|
||||
// Start of 8 Flags in one byte
|
||||
UINT IsMultipleItemsForArray:1;
|
||||
BOOLEAN IsMultipleItemsForArray:1;
|
||||
|
||||
UINT IsPadding:1;
|
||||
UINT IsButtonCap:1;
|
||||
UINT IsAbsolute:1;
|
||||
UINT IsRange:1;
|
||||
UINT IsAlias:1; // IsAlias is set to TRUE in the first n-1 capability structures added to the capability array. IsAlias set to FALSE in the nth capability structure.
|
||||
UINT IsStringRange:1;
|
||||
UINT IsDesignatorRange:1;
|
||||
BOOLEAN IsPadding:1;
|
||||
BOOLEAN IsButtonCap:1;
|
||||
BOOLEAN IsAbsolute:1;
|
||||
BOOLEAN IsRange:1;
|
||||
BOOLEAN IsAlias:1; // IsAlias is set to TRUE in the first n-1 capability structures added to the capability array. IsAlias set to FALSE in the nth capability structure.
|
||||
BOOLEAN IsStringRange:1;
|
||||
BOOLEAN IsDesignatorRange:1;
|
||||
// End of 8 Flags in one byte
|
||||
//BOOLEAN Reserved1[3];
|
||||
BOOLEAN Reserved1[3];
|
||||
|
||||
hidp_unknown_token UnknownTokens[4]; // 4 x 8 Byte
|
||||
|
||||
|
Reference in New Issue
Block a user