diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 04268b8309d6915cff4bcbca1f85278e4375aa06..17c505de6f608a078a9ff238cbfceaa2492f0251 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c @@ -777,7 +777,7 @@ VmbusChannelSendPacket( desc.Type = Type;//VmbusPacketTypeDataInBand; desc.Flags = Flags;//VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; desc.DataOffset8 = sizeof(VMPACKET_DESCRIPTOR) >> 3; // in 8-bytes granularity - desc.Length8 = (UINT16)(packetLenAligned >> 3); + desc.Length8 = (u16)(packetLenAligned >> 3); desc.TransactionId = RequestId; bufferList[0].Data = &desc; @@ -851,7 +851,7 @@ VmbusChannelSendPacketPageBuffer( desc.Type = VmbusPacketTypeDataUsingGpaDirect; desc.Flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; desc.DataOffset8 = descSize >> 3; // in 8-bytes grandularity - desc.Length8 = (UINT16)(packetLenAligned >> 3); + desc.Length8 = (u16)(packetLenAligned >> 3); desc.TransactionId = RequestId; desc.RangeCount = PageCount; @@ -936,7 +936,7 @@ VmbusChannelSendPacketMultiPageBuffer( desc.Type = VmbusPacketTypeDataUsingGpaDirect; desc.Flags = VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED; desc.DataOffset8 = descSize >> 3; // in 8-bytes grandularity - desc.Length8 = (UINT16)(packetLenAligned >> 3); + desc.Length8 = (u16)(packetLenAligned >> 3); desc.TransactionId = RequestId; desc.RangeCount = 1; diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index f511ca820ada52ab2437da2af2940bb2f70adc33..1461f49162cf901d56911a736c35b06fe14bb948 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h @@ -33,10 +33,10 @@ // The format must be the same as VMDATA_GPA_DIRECT typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER { - UINT16 Type; - UINT16 DataOffset8; - UINT16 Length8; - UINT16 Flags; + u16 Type; + u16 DataOffset8; + u16 Length8; + u16 Flags; UINT64 TransactionId; UINT32 Reserved; UINT32 RangeCount; @@ -46,10 +46,10 @@ typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER { // The format must be the same as VMDATA_GPA_DIRECT typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER { - UINT16 Type; - UINT16 DataOffset8; - UINT16 Length8; - UINT16 Flags; + u16 Type; + u16 DataOffset8; + u16 Length8; + u16 Flags; UINT64 TransactionId; UINT32 Reserved; UINT32 RangeCount; // Always 1 in this case diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h index 95d3601d21471c1dc1ceb860ce631ba58994da5b..0f52e7116992f1f4d7d0e1f07c52cf53ff22369c 100644 --- a/drivers/staging/hv/include/ChannelMessages.h +++ b/drivers/staging/hv/include/ChannelMessages.h @@ -188,8 +188,8 @@ typedef struct _VMBUS_CHANNEL_GPADL_HEADER VMBUS_CHANNEL_MESSAGE_HEADER Header; UINT32 ChildRelId; UINT32 Gpadl; - UINT16 RangeBufLen; - UINT16 RangeCount; + u16 RangeBufLen; + u16 RangeCount; GPA_RANGE Range[0]; } VMBUS_CHANNEL_GPADL_HEADER, *PVMBUS_CHANNEL_GPADL_HEADER; diff --git a/drivers/staging/hv/include/HvHcApi.h b/drivers/staging/hv/include/HvHcApi.h index 774bf3562758013e29eba1cf15c7566c5e3929d2..170cefaeeb72097a1653bb21ed93c7c07ef7b96d 100644 --- a/drivers/staging/hv/include/HvHcApi.h +++ b/drivers/staging/hv/include/HvHcApi.h @@ -55,6 +55,6 @@ typedef struct _HV_INPUT_POST_MESSAGE typedef struct _HV_INPUT_SIGNAL_EVENT { HV_CONNECTION_ID ConnectionId; - UINT16 FlagNumber; - UINT16 RsvdZ; + u16 FlagNumber; + u16 RsvdZ; } HV_INPUT_SIGNAL_EVENT, *PHV_INPUT_SIGNAL_EVENT; diff --git a/drivers/staging/hv/include/HvStatus.h b/drivers/staging/hv/include/HvStatus.h index 4a2692fdf514e794e5767fe6a931deed8cf9e937..3db3dbda135c2a839c1b880ea618d2495eb3a6da 100644 --- a/drivers/staging/hv/include/HvStatus.h +++ b/drivers/staging/hv/include/HvStatus.h @@ -26,7 +26,7 @@ // // Status codes for hypervisor operations. // -typedef UINT16 HV_STATUS, *PHV_STATUS; +typedef u16 HV_STATUS, *PHV_STATUS; // // MessageId: HV_STATUS_SUCCESS diff --git a/drivers/staging/hv/include/HvSynicApi.h b/drivers/staging/hv/include/HvSynicApi.h index 0c3700bb0ed853b89f74b4b85e522fc4cf76ae9e..f0682a391dae27f1e367e7c9339e14ce8a755504 100644 --- a/drivers/staging/hv/include/HvSynicApi.h +++ b/drivers/staging/hv/include/HvSynicApi.h @@ -217,8 +217,8 @@ typedef struct _HV_PORT_INFO { HV_SYNIC_SINT_INDEX TargetSint; HV_VP_INDEX TargetVp; - UINT16 BaseFlagNumber; - UINT16 FlagCount; + u16 BaseFlagNumber; + u16 FlagCount; UINT32 RsvdZ; } EventPortInfo; @@ -431,8 +431,8 @@ typedef union _HV_MONITOR_TRIGGER_GROUP typedef struct _HV_MONITOR_PARAMETER { HV_CONNECTION_ID ConnectionId; - UINT16 FlagNumber; - UINT16 RsvdZ; + u16 FlagNumber; + u16 RsvdZ; } HV_MONITOR_PARAMETER, *PHV_MONITOR_PARAMETER; typedef union _HV_MONITOR_TRIGGER_STATE @@ -478,7 +478,7 @@ typedef struct _HV_MONITOR_PAGE INT32 NextCheckTime[4][32]; - UINT16 Latency[4][32]; + u16 Latency[4][32]; UINT64 RsvdZ3[32]; HV_MONITOR_PARAMETER Parameter[4][32]; diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h index dcafbe6738397d0e964bc5af292b94fdd5e490a0..87b57d285bdc0cab2139da7dec760ee945fa352a 100644 --- a/drivers/staging/hv/include/VmbusChannelInterface.h +++ b/drivers/staging/hv/include/VmbusChannelInterface.h @@ -69,8 +69,8 @@ typedef struct UINT64 InterruptLatencyIn100nsUnits; UINT32 InterfaceRevision; UINT32 ServerContextAreaSize; // in bytes - UINT16 ChannelFlags; - UINT16 MmioMegabytes; // in bytes * 1024 * 1024 + u16 ChannelFlags; + u16 MmioMegabytes; // in bytes * 1024 * 1024 union { diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h index ff8dd2084e275f1e7a2cf39ecc78fc8d37e5e91e..1e8b9ceba000a9f27010511cadce12e91711e7a9 100644 --- a/drivers/staging/hv/include/VmbusPacketFormat.h +++ b/drivers/staging/hv/include/VmbusPacketFormat.h @@ -79,10 +79,10 @@ typedef struct typedef struct { - UINT16 Type; - UINT16 DataOffset8; - UINT16 Length8; - UINT16 Flags; + u16 Type; + u16 DataOffset8; + u16 Length8; + u16 Flags; UINT64 TransactionId; } VMPACKET_DESCRIPTOR, *PVMPACKET_DESCRIPTOR; @@ -112,7 +112,7 @@ typedef struct VMTRANSFER_PAGE_PACKET_HEADER { #endif - UINT16 TransferPageSetId; + u16 TransferPageSetId; BOOLEAN SenderOwnsSet; u8 Reserved; UINT32 RangeCount; @@ -152,8 +152,8 @@ typedef struct _VMADD_REMOVE_TRANSFER_PAGE_SET { #endif UINT32 Gpadl; - UINT16 TransferPageSetId; - UINT16 Reserved; + u16 TransferPageSetId; + u16 Reserved; } VMADD_REMOVE_TRANSFER_PAGE_SET, *PVMADD_REMOVE_TRANSFER_PAGE_SET; diff --git a/drivers/staging/hv/include/nvspprotocol.h b/drivers/staging/hv/include/nvspprotocol.h index 60091a4da45f3e2e90373c31cdbab74d26629f09..e1dd4676d978acad6ee635bee23364929defabd0 100644 --- a/drivers/staging/hv/include/nvspprotocol.h +++ b/drivers/staging/hv/include/nvspprotocol.h @@ -144,7 +144,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_NDIS_VERSION typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER { GPADL_HANDLE GpadlHandle; - UINT16 Id; + u16 Id; } NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER, *PNVSP_1_MESSAGE_SEND_RECEIVE_BUFFER; typedef struct _NVSP_1_RECEIVE_BUFFER_SECTION @@ -192,7 +192,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER_COMPLETE // typedef struct _NVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER { - UINT16 Id; + u16 Id; } NVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER, *PNVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER; // @@ -203,7 +203,7 @@ typedef struct _NVSP_1_MESSAGE_REVOKE_RECEIVE_BUFFER typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER { GPADL_HANDLE GpadlHandle; - UINT16 Id; + u16 Id; } NVSP_1_MESSAGE_SEND_SEND_BUFFER, *PNVSP_1_MESSAGE_SEND_SEND_BUFFER; // @@ -231,7 +231,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE // typedef struct _NVSP_1_MESSAGE_REVOKE_SEND_BUFFER { - UINT16 Id; + u16 Id; } NVSP_1_MESSAGE_REVOKE_SEND_BUFFER, *PNVSP_1_MESSAGE_REVOKE_SEND_BUFFER; // diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index d5f2a91cd57493a0123480ef3abebb3c3a24d727..2036c6f56fb545848a8a04a941947858e9e0e7a4 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -97,7 +97,6 @@ typedef struct _DLIST_ENTRY { // // unsigned types // -typedef unsigned short UINT16; typedef unsigned int UINT32; #ifdef __x86_64__ typedef unsigned long UINT64; @@ -113,7 +112,6 @@ typedef unsigned char UCHAR; // // signed types // -typedef short INT16; typedef int INT32; #ifdef __x86_64__ typedef long INT64;