https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb9d8e52392f102ff7f941a18f901a8a456c6985
commit fb9d8e52392f102ff7f941a18f901a8a456c6985 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Dec 13 18:07:45 2020 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Dec 27 00:51:57 2020 +0100 [PSDK][XDK] Add newer FILE_DEVICE_xxx DEVICE_TYPE defines. --- sdk/include/psdk/winioctl.h | 31 ++++++++++++++++++++++++++++++- sdk/include/xdk/iotypes.h | 35 ++++++++++++++++++++++++++--------- 2 files changed, 56 insertions(+), 10 deletions(-) diff --git a/sdk/include/psdk/winioctl.h b/sdk/include/psdk/winioctl.h index f10c4b41678..b0061baf42e 100644 --- a/sdk/include/psdk/winioctl.h +++ b/sdk/include/psdk/winioctl.h @@ -103,6 +103,7 @@ extern "C" { #define _DEVIOCTL_ #define DEVICE_TYPE DWORD + #define FILE_DEVICE_BEEP 1 #define FILE_DEVICE_CD_ROM 2 #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 3 @@ -142,7 +143,7 @@ extern "C" { #define FILE_DEVICE_WAVE_IN 37 #define FILE_DEVICE_WAVE_OUT 38 #define FILE_DEVICE_8042_PORT 39 -#define FILE_DEVICE_NETWORK_REDIRECTOR 40 +#define FILE_DEVICE_NETWORK_REDIRECTOR 40 #define FILE_DEVICE_BATTERY 41 #define FILE_DEVICE_BUS_EXTENDER 42 #define FILE_DEVICE_MODEM 43 @@ -160,6 +161,34 @@ extern "C" { #define FILE_DEVICE_SERENUM 55 #define FILE_DEVICE_TERMSRV 56 #define FILE_DEVICE_KSEC 57 +#define FILE_DEVICE_FIPS 58 +#define FILE_DEVICE_INFINIBAND 59 +#define FILE_DEVICE_VMBUS 62 +#define FILE_DEVICE_CRYPT_PROVIDER 63 +#define FILE_DEVICE_WPD 64 +#define FILE_DEVICE_BLUETOOTH 65 +#define FILE_DEVICE_MT_COMPOSITE 66 +#define FILE_DEVICE_MT_TRANSPORT 67 +#define FILE_DEVICE_BIOMETRIC 68 +#define FILE_DEVICE_PMI 69 +#define FILE_DEVICE_EHSTOR 70 +#define FILE_DEVICE_DEVAPI 71 +#define FILE_DEVICE_GPIO 72 +#define FILE_DEVICE_USBEX 73 +#define FILE_DEVICE_CONSOLE 80 +#define FILE_DEVICE_NFP 81 +#define FILE_DEVICE_SYSENV 82 +#define FILE_DEVICE_VIRTUAL_BLOCK 83 +#define FILE_DEVICE_POINT_OF_SERVICE 84 +#define FILE_DEVICE_STORAGE_REPLICATION 85 +#define FILE_DEVICE_TRUST_ENV 86 +#define FILE_DEVICE_UCM 87 +#define FILE_DEVICE_UCMTCPCI 88 +#define FILE_DEVICE_PERSISTENT_MEMORY 89 +#define FILE_DEVICE_NVDIMM 90 +#define FILE_DEVICE_HOLOGRAPHIC 91 +#define FILE_DEVICE_SDFXHCI 92 +#define FILE_DEVICE_UCMUCSI 93 /* Also in ddk/winddk.h */ #define FILE_ANY_ACCESS 0x00000000 diff --git a/sdk/include/xdk/iotypes.h b/sdk/include/xdk/iotypes.h index d1392e0857a..db056814088 100644 --- a/sdk/include/xdk/iotypes.h +++ b/sdk/include/xdk/iotypes.h @@ -45,6 +45,9 @@ $if (_WDMDDK_) $endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) +/* DEVICE_OBJECT.DeviceType */ +#define DEVICE_TYPE ULONG + #define FILE_DEVICE_BEEP 0x00000001 #define FILE_DEVICE_CD_ROM 0x00000002 #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 @@ -102,16 +105,34 @@ $if (_WDMDDK_ || _DEVIOCTL_) #define FILE_DEVICE_SERENUM 0x00000037 #define FILE_DEVICE_TERMSRV 0x00000038 #define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003A -#define FILE_DEVICE_INFINIBAND 0x0000003B -#define FILE_DEVICE_VMBUS 0x0000003E -#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003F +#define FILE_DEVICE_FIPS 0x0000003a +#define FILE_DEVICE_INFINIBAND 0x0000003b +#define FILE_DEVICE_VMBUS 0x0000003e +#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003f #define FILE_DEVICE_WPD 0x00000040 #define FILE_DEVICE_BLUETOOTH 0x00000041 #define FILE_DEVICE_MT_COMPOSITE 0x00000042 #define FILE_DEVICE_MT_TRANSPORT 0x00000043 #define FILE_DEVICE_BIOMETRIC 0x00000044 #define FILE_DEVICE_PMI 0x00000045 +#define FILE_DEVICE_EHSTOR 0x00000046 +#define FILE_DEVICE_DEVAPI 0x00000047 +#define FILE_DEVICE_GPIO 0x00000048 +#define FILE_DEVICE_USBEX 0x00000049 +#define FILE_DEVICE_CONSOLE 0x00000050 +#define FILE_DEVICE_NFP 0x00000051 +#define FILE_DEVICE_SYSENV 0x00000052 +#define FILE_DEVICE_VIRTUAL_BLOCK 0x00000053 +#define FILE_DEVICE_POINT_OF_SERVICE 0x00000054 +#define FILE_DEVICE_STORAGE_REPLICATION 0x00000055 +#define FILE_DEVICE_TRUST_ENV 0x00000056 +#define FILE_DEVICE_UCM 0x00000057 +#define FILE_DEVICE_UCMTCPCI 0x00000058 +#define FILE_DEVICE_PERSISTENT_MEMORY 0x00000059 +#define FILE_DEVICE_NVDIMM 0x0000005a +#define FILE_DEVICE_HOLOGRAPHIC 0x0000005b +#define FILE_DEVICE_SDFXHCI 0x0000005c +#define FILE_DEVICE_UCMUCSI 0x0000005d $endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) @@ -261,12 +282,8 @@ $if (_WDMDDK_) #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff -$endif (_NTDDK_) -$if (_WDMDDK_ || _DEVIOCTL_) -/* DEVICE_OBJECT.DeviceType */ -#define DEVICE_TYPE ULONG +$endif (_WDMDDK_) -$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) typedef struct DECLSPEC_ALIGN(MEMORY_ALLOCATION_ALIGNMENT) _DEVICE_OBJECT { CSHORT Type;
