Staging: hv: remove UINT16 and INT16 typedefs

The UINT16 and INT16 typedefs are now removed from the Hyper-V driver
code.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-07-14 15:09:10 -07:00
parent 5654e93226
commit 5cd508bc3a
10 changed files with 34 additions and 36 deletions

View file

@ -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;

View file

@ -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

View file

@ -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;

View file

@ -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;

View file

@ -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

View file

@ -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];

View file

@ -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
{

View file

@ -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;

View file

@ -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;
//

View file

@ -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;