aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-14 18:10:26 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:01:46 -0400
commit59471438ccbebafb0d63baf8b818d0ca692f882a (patch)
treedf7f285d71108dc1b382b9d4a423e9588dc51135 /drivers/staging
parent4d64311468a90d4ab1e83c62d63b27da598b73ea (diff)
Staging: hv: remove UINT64 and INT64 and UCHAR typedefs
The UINT64 and INT64 and UCHAR 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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/hv/BlkVsc.c4
-rw-r--r--drivers/staging/hv/Channel.c48
-rw-r--r--drivers/staging/hv/Channel.h14
-rw-r--r--drivers/staging/hv/ChannelInterface.c10
-rw-r--r--drivers/staging/hv/Hv.c24
-rw-r--r--drivers/staging/hv/Hv.h12
-rw-r--r--drivers/staging/hv/NetVsc.c12
-rw-r--r--drivers/staging/hv/NetVsc.h2
-rw-r--r--drivers/staging/hv/RingBuffer.c16
-rw-r--r--drivers/staging/hv/RndisFilter.c2
-rw-r--r--drivers/staging/hv/StorVsc.c12
-rw-r--r--drivers/staging/hv/include/ChannelMessages.h12
-rw-r--r--drivers/staging/hv/include/HvHalApi.h4
-rw-r--r--drivers/staging/hv/include/HvHcApi.h2
-rw-r--r--drivers/staging/hv/include/HvPtApi.h22
-rw-r--r--drivers/staging/hv/include/HvSynicApi.h52
-rw-r--r--drivers/staging/hv/include/HvTypes.h2
-rw-r--r--drivers/staging/hv/include/List.h4
-rw-r--r--drivers/staging/hv/include/NetVscApi.h6
-rw-r--r--drivers/staging/hv/include/StorVscApi.h6
-rw-r--r--drivers/staging/hv/include/VmbusApi.h14
-rw-r--r--drivers/staging/hv/include/VmbusChannelInterface.h6
-rw-r--r--drivers/staging/hv/include/VmbusPacketFormat.h10
-rw-r--r--drivers/staging/hv/include/osd.h22
-rw-r--r--drivers/staging/hv/include/rndis.h8
-rw-r--r--drivers/staging/hv/include/vstorage.h32
26 files changed, 172 insertions, 186 deletions
diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c
index dc38232725b..fe5edaf6229 100644
--- a/drivers/staging/hv/BlkVsc.c
+++ b/drivers/staging/hv/BlkVsc.c
@@ -56,9 +56,9 @@ BlkVscInitialize(
56 56
57 storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION); 57 storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION);
58 // Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices) 58 // Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices)
59 // by the max request size (which is VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER + VSTOR_PACKET + UINT64) 59 // by the max request size (which is VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER + VSTOR_PACKET + u64)
60 storDriver->MaxOutstandingRequestsPerChannel = 60 storDriver->MaxOutstandingRequestsPerChannel =
61 ((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(VSTOR_PACKET) + sizeof(UINT64),sizeof(UINT64))); 61 ((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(VSTOR_PACKET) + sizeof(u64),sizeof(u64)));
62 62
63 DPRINT_INFO(BLKVSC, "max io outstd %u", storDriver->MaxOutstandingRequestsPerChannel); 63 DPRINT_INFO(BLKVSC, "max io outstd %u", storDriver->MaxOutstandingRequestsPerChannel);
64 64
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 3c375cedca7..fd063daaa83 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -335,7 +335,7 @@ static void DumpGpadlBody(
335 int i=0; 335 int i=0;
336 int pfnCount=0; 336 int pfnCount=0;
337 337
338 pfnCount = (Len - sizeof(VMBUS_CHANNEL_GPADL_BODY))/ sizeof(UINT64); 338 pfnCount = (Len - sizeof(VMBUS_CHANNEL_GPADL_BODY))/ sizeof(u64);
339 DPRINT_DBG(VMBUS, "gpadl body - len %d pfn count %d", Len, pfnCount); 339 DPRINT_DBG(VMBUS, "gpadl body - len %d pfn count %d", Len, pfnCount);
340 340
341 for (i=0; i< pfnCount; i++) 341 for (i=0; i< pfnCount; i++)
@@ -416,12 +416,12 @@ VmbusChannelCreateGpadlHeader(
416 416
417 // do we need a gpadl body msg 417 // do we need a gpadl body msg
418 pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(VMBUS_CHANNEL_GPADL_HEADER) - sizeof(GPA_RANGE); 418 pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(VMBUS_CHANNEL_GPADL_HEADER) - sizeof(GPA_RANGE);
419 pfnCount = pfnSize / sizeof(UINT64); 419 pfnCount = pfnSize / sizeof(u64);
420 420
421 if (pageCount > pfnCount) // we need a gpadl body 421 if (pageCount > pfnCount) // we need a gpadl body
422 { 422 {
423 // fill in the header 423 // fill in the header
424 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_HEADER) + sizeof(GPA_RANGE) + pfnCount*sizeof(UINT64); 424 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_HEADER) + sizeof(GPA_RANGE) + pfnCount*sizeof(u64);
425 msgHeader = MemAllocZeroed(msgSize); 425 msgHeader = MemAllocZeroed(msgSize);
426 426
427 INITIALIZE_LIST_HEAD(&msgHeader->SubMsgList); 427 INITIALIZE_LIST_HEAD(&msgHeader->SubMsgList);
@@ -429,7 +429,7 @@ VmbusChannelCreateGpadlHeader(
429 429
430 gpaHeader = (VMBUS_CHANNEL_GPADL_HEADER*)msgHeader->Msg; 430 gpaHeader = (VMBUS_CHANNEL_GPADL_HEADER*)msgHeader->Msg;
431 gpaHeader->RangeCount = 1; 431 gpaHeader->RangeCount = 1;
432 gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(UINT64); 432 gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(u64);
433 gpaHeader->Range[0].ByteOffset = 0; 433 gpaHeader->Range[0].ByteOffset = 0;
434 gpaHeader->Range[0].ByteCount = Size; 434 gpaHeader->Range[0].ByteCount = Size;
435 for (i=0; i<pfnCount; i++) 435 for (i=0; i<pfnCount; i++)
@@ -444,7 +444,7 @@ VmbusChannelCreateGpadlHeader(
444 444
445 // how many pfns can we fit 445 // how many pfns can we fit
446 pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(VMBUS_CHANNEL_GPADL_BODY); 446 pfnSize = MAX_SIZE_CHANNEL_MESSAGE - sizeof(VMBUS_CHANNEL_GPADL_BODY);
447 pfnCount = pfnSize / sizeof(UINT64); 447 pfnCount = pfnSize / sizeof(u64);
448 448
449 // fill in the body 449 // fill in the body
450 while (pfnLeft) 450 while (pfnLeft)
@@ -458,7 +458,7 @@ VmbusChannelCreateGpadlHeader(
458 pfnCurr = pfnLeft; 458 pfnCurr = pfnLeft;
459 } 459 }
460 460
461 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_BODY) + pfnCurr*sizeof(UINT64); 461 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_BODY) + pfnCurr*sizeof(u64);
462 msgBody = MemAllocZeroed(msgSize); 462 msgBody = MemAllocZeroed(msgSize);
463 ASSERT(msgBody); 463 ASSERT(msgBody);
464 msgBody->MessageSize = msgSize; 464 msgBody->MessageSize = msgSize;
@@ -481,13 +481,13 @@ VmbusChannelCreateGpadlHeader(
481 else 481 else
482 { 482 {
483 // everything fits in a header 483 // everything fits in a header
484 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_HEADER) + sizeof(GPA_RANGE) + pageCount*sizeof(UINT64); 484 msgSize = sizeof(VMBUS_CHANNEL_MSGINFO) + sizeof(VMBUS_CHANNEL_GPADL_HEADER) + sizeof(GPA_RANGE) + pageCount*sizeof(u64);
485 msgHeader = MemAllocZeroed(msgSize); 485 msgHeader = MemAllocZeroed(msgSize);
486 msgHeader->MessageSize=msgSize; 486 msgHeader->MessageSize=msgSize;
487 487
488 gpaHeader = (VMBUS_CHANNEL_GPADL_HEADER*)msgHeader->Msg; 488 gpaHeader = (VMBUS_CHANNEL_GPADL_HEADER*)msgHeader->Msg;
489 gpaHeader->RangeCount = 1; 489 gpaHeader->RangeCount = 1;
490 gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(UINT64); 490 gpaHeader->RangeBufLen = sizeof(GPA_RANGE) + pageCount*sizeof(u64);
491 gpaHeader->Range[0].ByteOffset = 0; 491 gpaHeader->Range[0].ByteOffset = 0;
492 gpaHeader->Range[0].ByteCount = Size; 492 gpaHeader->Range[0].ByteCount = Size;
493 for (i=0; i<pageCount; i++) 493 for (i=0; i<pageCount; i++)
@@ -754,7 +754,7 @@ VmbusChannelSendPacket(
754 VMBUS_CHANNEL *Channel, 754 VMBUS_CHANNEL *Channel,
755 const void * Buffer, 755 const void * Buffer,
756 u32 BufferLen, 756 u32 BufferLen,
757 UINT64 RequestId, 757 u64 RequestId,
758 VMBUS_PACKET_TYPE Type, 758 VMBUS_PACKET_TYPE Type,
759 u32 Flags 759 u32 Flags
760) 760)
@@ -762,16 +762,16 @@ VmbusChannelSendPacket(
762 int ret=0; 762 int ret=0;
763 VMPACKET_DESCRIPTOR desc; 763 VMPACKET_DESCRIPTOR desc;
764 u32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen; 764 u32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen;
765 u32 packetLenAligned = ALIGN_UP(packetLen, sizeof(UINT64)); 765 u32 packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
766 SG_BUFFER_LIST bufferList[3]; 766 SG_BUFFER_LIST bufferList[3];
767 UINT64 alignedData=0; 767 u64 alignedData=0;
768 768
769 DPRINT_ENTER(VMBUS); 769 DPRINT_ENTER(VMBUS);
770 DPRINT_DBG(VMBUS, "channel %p buffer %p len %d", Channel, Buffer, BufferLen); 770 DPRINT_DBG(VMBUS, "channel %p buffer %p len %d", Channel, Buffer, BufferLen);
771 771
772 DumpVmbusChannel(Channel); 772 DumpVmbusChannel(Channel);
773 773
774 ASSERT((packetLenAligned - packetLen) < sizeof(UINT64)); 774 ASSERT((packetLenAligned - packetLen) < sizeof(u64));
775 775
776 // Setup the descriptor 776 // Setup the descriptor
777 desc.Type = Type;//VmbusPacketTypeDataInBand; 777 desc.Type = Type;//VmbusPacketTypeDataInBand;
@@ -822,7 +822,7 @@ VmbusChannelSendPacketPageBuffer(
822 u32 PageCount, 822 u32 PageCount,
823 void * Buffer, 823 void * Buffer,
824 u32 BufferLen, 824 u32 BufferLen,
825 UINT64 RequestId 825 u64 RequestId
826) 826)
827{ 827{
828 int ret=0; 828 int ret=0;
@@ -832,7 +832,7 @@ VmbusChannelSendPacketPageBuffer(
832 u32 packetLen; 832 u32 packetLen;
833 u32 packetLenAligned; 833 u32 packetLenAligned;
834 SG_BUFFER_LIST bufferList[3]; 834 SG_BUFFER_LIST bufferList[3];
835 UINT64 alignedData=0; 835 u64 alignedData=0;
836 836
837 DPRINT_ENTER(VMBUS); 837 DPRINT_ENTER(VMBUS);
838 838
@@ -843,9 +843,9 @@ VmbusChannelSendPacketPageBuffer(
843 // Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support 843 // Adjust the size down since VMBUS_CHANNEL_PACKET_PAGE_BUFFER is the largest size we support
844 descSize = sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER)); 844 descSize = sizeof(VMBUS_CHANNEL_PACKET_PAGE_BUFFER) - ((MAX_PAGE_BUFFER_COUNT - PageCount)*sizeof(PAGE_BUFFER));
845 packetLen = descSize + BufferLen; 845 packetLen = descSize + BufferLen;
846 packetLenAligned = ALIGN_UP(packetLen, sizeof(UINT64)); 846 packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
847 847
848 ASSERT((packetLenAligned - packetLen) < sizeof(UINT64)); 848 ASSERT((packetLenAligned - packetLen) < sizeof(u64));
849 849
850 // Setup the descriptor 850 // Setup the descriptor
851 desc.Type = VmbusPacketTypeDataUsingGpaDirect; 851 desc.Type = VmbusPacketTypeDataUsingGpaDirect;
@@ -904,7 +904,7 @@ VmbusChannelSendPacketMultiPageBuffer(
904 MULTIPAGE_BUFFER *MultiPageBuffer, 904 MULTIPAGE_BUFFER *MultiPageBuffer,
905 void * Buffer, 905 void * Buffer,
906 u32 BufferLen, 906 u32 BufferLen,
907 UINT64 RequestId 907 u64 RequestId
908) 908)
909{ 909{
910 int ret=0; 910 int ret=0;
@@ -913,7 +913,7 @@ VmbusChannelSendPacketMultiPageBuffer(
913 u32 packetLen; 913 u32 packetLen;
914 u32 packetLenAligned; 914 u32 packetLenAligned;
915 SG_BUFFER_LIST bufferList[3]; 915 SG_BUFFER_LIST bufferList[3];
916 UINT64 alignedData=0; 916 u64 alignedData=0;
917 u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset, MultiPageBuffer->Length); 917 u32 PfnCount = NUM_PAGES_SPANNED(MultiPageBuffer->Offset, MultiPageBuffer->Length);
918 918
919 DPRINT_ENTER(VMBUS); 919 DPRINT_ENTER(VMBUS);
@@ -926,11 +926,11 @@ VmbusChannelSendPacketMultiPageBuffer(
926 ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT); 926 ASSERT(PfnCount <= MAX_MULTIPAGE_BUFFER_COUNT);
927 927
928 // Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support 928 // Adjust the size down since VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER is the largest size we support
929 descSize = sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(UINT64)); 929 descSize = sizeof(VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER) - ((MAX_MULTIPAGE_BUFFER_COUNT - PfnCount)*sizeof(u64));
930 packetLen = descSize + BufferLen; 930 packetLen = descSize + BufferLen;
931 packetLenAligned = ALIGN_UP(packetLen, sizeof(UINT64)); 931 packetLenAligned = ALIGN_UP(packetLen, sizeof(u64));
932 932
933 ASSERT((packetLenAligned - packetLen) < sizeof(UINT64)); 933 ASSERT((packetLenAligned - packetLen) < sizeof(u64));
934 934
935 // Setup the descriptor 935 // Setup the descriptor
936 desc.Type = VmbusPacketTypeDataUsingGpaDirect; 936 desc.Type = VmbusPacketTypeDataUsingGpaDirect;
@@ -943,7 +943,7 @@ VmbusChannelSendPacketMultiPageBuffer(
943 desc.Range.Length = MultiPageBuffer->Length; 943 desc.Range.Length = MultiPageBuffer->Length;
944 desc.Range.Offset = MultiPageBuffer->Offset; 944 desc.Range.Offset = MultiPageBuffer->Offset;
945 945
946 memcpy(desc.Range.PfnArray, MultiPageBuffer->PfnArray, PfnCount*sizeof(UINT64)); 946 memcpy(desc.Range.PfnArray, MultiPageBuffer->PfnArray, PfnCount*sizeof(u64));
947 947
948 bufferList[0].Data = &desc; 948 bufferList[0].Data = &desc;
949 bufferList[0].Length = descSize; 949 bufferList[0].Length = descSize;
@@ -987,7 +987,7 @@ VmbusChannelRecvPacket(
987 void * Buffer, 987 void * Buffer,
988 u32 BufferLen, 988 u32 BufferLen,
989 u32* BufferActualLen, 989 u32* BufferActualLen,
990 UINT64* RequestId 990 u64* RequestId
991 ) 991 )
992{ 992{
993 VMPACKET_DESCRIPTOR desc; 993 VMPACKET_DESCRIPTOR desc;
@@ -1064,7 +1064,7 @@ VmbusChannelRecvPacketRaw(
1064 void * Buffer, 1064 void * Buffer,
1065 u32 BufferLen, 1065 u32 BufferLen,
1066 u32* BufferActualLen, 1066 u32* BufferActualLen,
1067 UINT64* RequestId 1067 u64* RequestId
1068 ) 1068 )
1069{ 1069{
1070 VMPACKET_DESCRIPTOR desc; 1070 VMPACKET_DESCRIPTOR desc;
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index fb17d0c0a7a..dee444c3513 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -37,7 +37,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
37 u16 DataOffset8; 37 u16 DataOffset8;
38 u16 Length8; 38 u16 Length8;
39 u16 Flags; 39 u16 Flags;
40 UINT64 TransactionId; 40 u64 TransactionId;
41 u32 Reserved; 41 u32 Reserved;
42 u32 RangeCount; 42 u32 RangeCount;
43 PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT]; 43 PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT];
@@ -50,7 +50,7 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
50 u16 DataOffset8; 50 u16 DataOffset8;
51 u16 Length8; 51 u16 Length8;
52 u16 Flags; 52 u16 Flags;
53 UINT64 TransactionId; 53 u64 TransactionId;
54 u32 Reserved; 54 u32 Reserved;
55 u32 RangeCount; // Always 1 in this case 55 u32 RangeCount; // Always 1 in this case
56 MULTIPAGE_BUFFER Range; 56 MULTIPAGE_BUFFER Range;
@@ -83,7 +83,7 @@ VmbusChannelSendPacket(
83 VMBUS_CHANNEL *Channel, 83 VMBUS_CHANNEL *Channel,
84 const void * Buffer, 84 const void * Buffer,
85 u32 BufferLen, 85 u32 BufferLen,
86 UINT64 RequestId, 86 u64 RequestId,
87 VMBUS_PACKET_TYPE Type, 87 VMBUS_PACKET_TYPE Type,
88 u32 Flags 88 u32 Flags
89); 89);
@@ -95,7 +95,7 @@ VmbusChannelSendPacketPageBuffer(
95 u32 PageCount, 95 u32 PageCount,
96 void * Buffer, 96 void * Buffer,
97 u32 BufferLen, 97 u32 BufferLen,
98 UINT64 RequestId 98 u64 RequestId
99 ); 99 );
100 100
101static int 101static int
@@ -104,7 +104,7 @@ VmbusChannelSendPacketMultiPageBuffer(
104 MULTIPAGE_BUFFER *MultiPageBuffer, 104 MULTIPAGE_BUFFER *MultiPageBuffer,
105 void * Buffer, 105 void * Buffer,
106 u32 BufferLen, 106 u32 BufferLen,
107 UINT64 RequestId 107 u64 RequestId
108); 108);
109 109
110static int 110static int
@@ -127,7 +127,7 @@ VmbusChannelRecvPacket(
127 void * Buffer, 127 void * Buffer,
128 u32 BufferLen, 128 u32 BufferLen,
129 u32* BufferActualLen, 129 u32* BufferActualLen,
130 UINT64* RequestId 130 u64* RequestId
131 ); 131 );
132 132
133static int 133static int
@@ -136,7 +136,7 @@ VmbusChannelRecvPacketRaw(
136 void * Buffer, 136 void * Buffer,
137 u32 BufferLen, 137 u32 BufferLen,
138 u32* BufferActualLen, 138 u32* BufferActualLen,
139 UINT64* RequestId 139 u64* RequestId
140 ); 140 );
141 141
142static void 142static void
diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 57602f704e8..d3b4c14a5ea 100644
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -58,7 +58,7 @@ IVmbusChannelSendPacket(
58 PDEVICE_OBJECT Device, 58 PDEVICE_OBJECT Device,
59 const void * Buffer, 59 const void * Buffer,
60 u32 BufferLen, 60 u32 BufferLen,
61 UINT64 RequestId, 61 u64 RequestId,
62 u32 Type, 62 u32 Type,
63 u32 Flags 63 u32 Flags
64 ) 64 )
@@ -78,7 +78,7 @@ IVmbusChannelSendPacketPageBuffer(
78 u32 PageCount, 78 u32 PageCount,
79 void * Buffer, 79 void * Buffer,
80 u32 BufferLen, 80 u32 BufferLen,
81 UINT64 RequestId 81 u64 RequestId
82 ) 82 )
83{ 83{
84 return VmbusChannelSendPacketPageBuffer((VMBUS_CHANNEL*)Device->context, 84 return VmbusChannelSendPacketPageBuffer((VMBUS_CHANNEL*)Device->context,
@@ -95,7 +95,7 @@ IVmbusChannelSendPacketMultiPageBuffer(
95 MULTIPAGE_BUFFER *MultiPageBuffer, 95 MULTIPAGE_BUFFER *MultiPageBuffer,
96 void * Buffer, 96 void * Buffer,
97 u32 BufferLen, 97 u32 BufferLen,
98 UINT64 RequestId 98 u64 RequestId
99 ) 99 )
100{ 100{
101 return VmbusChannelSendPacketMultiPageBuffer((VMBUS_CHANNEL*)Device->context, 101 return VmbusChannelSendPacketMultiPageBuffer((VMBUS_CHANNEL*)Device->context,
@@ -111,7 +111,7 @@ IVmbusChannelRecvPacket (
111 void * Buffer, 111 void * Buffer,
112 u32 BufferLen, 112 u32 BufferLen,
113 u32* BufferActualLen, 113 u32* BufferActualLen,
114 UINT64* RequestId 114 u64* RequestId
115 ) 115 )
116{ 116{
117 return VmbusChannelRecvPacket((VMBUS_CHANNEL*)Device->context, 117 return VmbusChannelRecvPacket((VMBUS_CHANNEL*)Device->context,
@@ -127,7 +127,7 @@ IVmbusChannelRecvPacketRaw(
127 void * Buffer, 127 void * Buffer,
128 u32 BufferLen, 128 u32 BufferLen,
129 u32* BufferActualLen, 129 u32* BufferActualLen,
130 UINT64* RequestId 130 u64* RequestId
131 ) 131 )
132{ 132{
133 return VmbusChannelRecvPacketRaw((VMBUS_CHANNEL*)Device->context, 133 return VmbusChannelRecvPacketRaw((VMBUS_CHANNEL*)Device->context,
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index 20686d574a4..a8c7d73b1c1 100644
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -158,17 +158,17 @@ Description:
158 Invoke the specified hypercall 158 Invoke the specified hypercall
159 159
160--*/ 160--*/
161static UINT64 161static u64
162HvDoHypercall ( 162HvDoHypercall (
163 UINT64 Control, 163 u64 Control,
164 void* Input, 164 void* Input,
165 void* Output 165 void* Output
166 ) 166 )
167{ 167{
168#ifdef CONFIG_X86_64 168#ifdef CONFIG_X86_64
169 UINT64 hvStatus=0; 169 u64 hvStatus=0;
170 UINT64 inputAddress = (Input)? GetPhysicalAddress(Input) : 0; 170 u64 inputAddress = (Input)? GetPhysicalAddress(Input) : 0;
171 UINT64 outputAddress = (Output)? GetPhysicalAddress(Output) : 0; 171 u64 outputAddress = (Output)? GetPhysicalAddress(Output) : 0;
172 volatile void* hypercallPage = gHvContext.HypercallPage; 172 volatile void* hypercallPage = gHvContext.HypercallPage;
173 173
174 DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p output phys %llx virt %p hypercall %p>", 174 DPRINT_DBG(VMBUS, "Hypercall <control %llx input phys %llx virt %p output phys %llx virt %p hypercall %p>",
@@ -192,10 +192,10 @@ HvDoHypercall (
192 u32 controlLo = Control & 0xFFFFFFFF; 192 u32 controlLo = Control & 0xFFFFFFFF;
193 u32 hvStatusHi = 1; 193 u32 hvStatusHi = 1;
194 u32 hvStatusLo = 1; 194 u32 hvStatusLo = 1;
195 UINT64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0; 195 u64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0;
196 u32 inputAddressHi = inputAddress >> 32; 196 u32 inputAddressHi = inputAddress >> 32;
197 u32 inputAddressLo = inputAddress & 0xFFFFFFFF; 197 u32 inputAddressLo = inputAddress & 0xFFFFFFFF;
198 UINT64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0; 198 u64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0;
199 u32 outputAddressHi = outputAddress >> 32; 199 u32 outputAddressHi = outputAddress >> 32;
200 u32 outputAddressLo = outputAddress & 0xFFFFFFFF; 200 u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
201 volatile void* hypercallPage = gHvContext.HypercallPage; 201 volatile void* hypercallPage = gHvContext.HypercallPage;
@@ -208,9 +208,9 @@ HvDoHypercall (
208 __asm__ __volatile__ ("call *%8" : "=d"(hvStatusHi), "=a"(hvStatusLo) : "d" (controlHi), "a" (controlLo), "b" (inputAddressHi), "c" (inputAddressLo), "D"(outputAddressHi), "S"(outputAddressLo), "m" (hypercallPage)); 208 __asm__ __volatile__ ("call *%8" : "=d"(hvStatusHi), "=a"(hvStatusLo) : "d" (controlHi), "a" (controlLo), "b" (inputAddressHi), "c" (inputAddressLo), "D"(outputAddressHi), "S"(outputAddressLo), "m" (hypercallPage));
209 209
210 210
211 DPRINT_DBG(VMBUS, "Hypercall <return %llx>", hvStatusLo | ((UINT64)hvStatusHi << 32)); 211 DPRINT_DBG(VMBUS, "Hypercall <return %llx>", hvStatusLo | ((u64)hvStatusHi << 32));
212 212
213 return (hvStatusLo | ((UINT64)hvStatusHi << 32)); 213 return (hvStatusLo | ((u64)hvStatusHi << 32));
214#endif // x86_64 214#endif // x86_64
215} 215}
216 216
@@ -401,7 +401,7 @@ HvPostMessage(
401 ) 401 )
402{ 402{
403 struct alignedInput { 403 struct alignedInput {
404 UINT64 alignment8; 404 u64 alignment8;
405 HV_INPUT_POST_MESSAGE msg; 405 HV_INPUT_POST_MESSAGE msg;
406 }; 406 };
407 407
@@ -474,12 +474,12 @@ HvSynicInit (
474 u32 irqVector 474 u32 irqVector
475 ) 475 )
476{ 476{
477 UINT64 version; 477 u64 version;
478 HV_SYNIC_SIMP simp; 478 HV_SYNIC_SIMP simp;
479 HV_SYNIC_SIEFP siefp; 479 HV_SYNIC_SIEFP siefp;
480 HV_SYNIC_SINT sharedSint; 480 HV_SYNIC_SINT sharedSint;
481 HV_SYNIC_SCONTROL sctrl; 481 HV_SYNIC_SCONTROL sctrl;
482 UINT64 guestID; 482 u64 guestID;
483 int ret=0; 483 int ret=0;
484 484
485 DPRINT_ENTER(VMBUS); 485 DPRINT_ENTER(VMBUS);
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index f5cbad9f20b..a3c76e2d86d 100644
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -60,11 +60,11 @@ enum
60 60
61#define HV_XENLINUX_GUEST_ID_LO 0x00000000 61#define HV_XENLINUX_GUEST_ID_LO 0x00000000
62#define HV_XENLINUX_GUEST_ID_HI 0x0B00B135 62#define HV_XENLINUX_GUEST_ID_HI 0x0B00B135
63#define HV_XENLINUX_GUEST_ID (((UINT64)HV_XENLINUX_GUEST_ID_HI << 32) | HV_XENLINUX_GUEST_ID_LO) 63#define HV_XENLINUX_GUEST_ID (((u64)HV_XENLINUX_GUEST_ID_HI << 32) | HV_XENLINUX_GUEST_ID_LO)
64 64
65#define HV_LINUX_GUEST_ID_LO 0x00000000 65#define HV_LINUX_GUEST_ID_LO 0x00000000
66#define HV_LINUX_GUEST_ID_HI 0xB16B00B5 66#define HV_LINUX_GUEST_ID_HI 0xB16B00B5
67#define HV_LINUX_GUEST_ID (((UINT64)HV_LINUX_GUEST_ID_HI << 32) | HV_LINUX_GUEST_ID_LO) 67#define HV_LINUX_GUEST_ID (((u64)HV_LINUX_GUEST_ID_HI << 32) | HV_LINUX_GUEST_ID_LO)
68 68
69#define HV_CPU_POWER_MANAGEMENT (1 << 0) 69#define HV_CPU_POWER_MANAGEMENT (1 << 0)
70#define HV_RECOMMENDATIONS_MAX 4 70#define HV_RECOMMENDATIONS_MAX 4
@@ -73,7 +73,7 @@ enum
73#define HV_CAPS_MAX 8 73#define HV_CAPS_MAX 8
74 74
75 75
76#define HV_HYPERCALL_PARAM_ALIGN sizeof(UINT64) 76#define HV_HYPERCALL_PARAM_ALIGN sizeof(u64)
77 77
78// 78//
79// Service definitions 79// Service definitions
@@ -105,12 +105,12 @@ static const GUID VMBUS_SERVICE_ID = {.Data = {0xb8, 0x80, 0x81, 0x62, 0x8d, 0x3
105 105
106 106
107typedef struct { 107typedef struct {
108 UINT64 Align8; 108 u64 Align8;
109 HV_INPUT_SIGNAL_EVENT Event; 109 HV_INPUT_SIGNAL_EVENT Event;
110} HV_INPUT_SIGNAL_EVENT_BUFFER; 110} HV_INPUT_SIGNAL_EVENT_BUFFER;
111 111
112typedef struct { 112typedef struct {
113 UINT64 GuestId; // XenLinux or native Linux. If XenLinux, the hypercall and synic pages has already been initialized 113 u64 GuestId; // XenLinux or native Linux. If XenLinux, the hypercall and synic pages has already been initialized
114 void* HypercallPage; 114 void* HypercallPage;
115 115
116 BOOL SynICInitialized; 116 BOOL SynICInitialized;
@@ -138,7 +138,7 @@ static inline unsigned long long ReadMsr(int msr)
138 return val; 138 return val;
139} 139}
140 140
141static inline void WriteMsr(int msr, UINT64 val) 141static inline void WriteMsr(int msr, u64 val)
142{ 142{
143 WRMSR(msr, val); 143 WRMSR(msr, val);
144 144
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index 958ce603e65..99855637739 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -114,7 +114,7 @@ NetVscOnReceiveCompletion(
114static void 114static void
115NetVscSendReceiveCompletion( 115NetVscSendReceiveCompletion(
116 DEVICE_OBJECT *Device, 116 DEVICE_OBJECT *Device,
117 UINT64 TransactionId 117 u64 TransactionId
118 ); 118 );
119 119
120static inline NETVSC_DEVICE* AllocNetDevice(DEVICE_OBJECT *Device) 120static inline NETVSC_DEVICE* AllocNetDevice(DEVICE_OBJECT *Device)
@@ -1286,7 +1286,7 @@ NetVscOnReceive(
1286static void 1286static void
1287NetVscSendReceiveCompletion( 1287NetVscSendReceiveCompletion(
1288 DEVICE_OBJECT *Device, 1288 DEVICE_OBJECT *Device,
1289 UINT64 TransactionId 1289 u64 TransactionId
1290 ) 1290 )
1291{ 1291{
1292 NVSP_MESSAGE recvcompMessage; 1292 NVSP_MESSAGE recvcompMessage;
@@ -1343,7 +1343,7 @@ NetVscOnReceiveCompletion(
1343 NETVSC_PACKET *packet = (NETVSC_PACKET*)Context; 1343 NETVSC_PACKET *packet = (NETVSC_PACKET*)Context;
1344 DEVICE_OBJECT *device = (DEVICE_OBJECT*)packet->Device; 1344 DEVICE_OBJECT *device = (DEVICE_OBJECT*)packet->Device;
1345 NETVSC_DEVICE* netDevice; 1345 NETVSC_DEVICE* netDevice;
1346 UINT64 transactionId=0; 1346 u64 transactionId=0;
1347 BOOL fSendReceiveComp = FALSE; 1347 BOOL fSendReceiveComp = FALSE;
1348 1348
1349 DPRINT_ENTER(NETVSC); 1349 DPRINT_ENTER(NETVSC);
@@ -1403,10 +1403,10 @@ NetVscOnChannelCallback(
1403 NETVSC_DEVICE *netDevice; 1403 NETVSC_DEVICE *netDevice;
1404 1404
1405 u32 bytesRecvd; 1405 u32 bytesRecvd;
1406 UINT64 requestId; 1406 u64 requestId;
1407 UCHAR packet[netPacketSize]; 1407 unsigned char packet[netPacketSize];
1408 VMPACKET_DESCRIPTOR *desc; 1408 VMPACKET_DESCRIPTOR *desc;
1409 UCHAR *buffer=packet; 1409 unsigned char *buffer=packet;
1410 int bufferlen=netPacketSize; 1410 int bufferlen=netPacketSize;
1411 1411
1412 1412
diff --git a/drivers/staging/hv/NetVsc.h b/drivers/staging/hv/NetVsc.h
index f19497a3e1d..3a7999db851 100644
--- a/drivers/staging/hv/NetVsc.h
+++ b/drivers/staging/hv/NetVsc.h
@@ -82,7 +82,7 @@ typedef struct _NETVSC_DEVICE {
82 NVSP_MESSAGE ChannelInitPacket; 82 NVSP_MESSAGE ChannelInitPacket;
83 83
84 NVSP_MESSAGE RevokePacket; 84 NVSP_MESSAGE RevokePacket;
85 //UCHAR HwMacAddr[HW_MACADDR_LEN]; 85 //unsigned char HwMacAddr[HW_MACADDR_LEN];
86 86
87 // Holds rndis device info 87 // Holds rndis device info
88 void *Extension; 88 void *Extension;
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c
index 4a05f7d7d2d..34d4adaa19b 100644
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/RingBuffer.c
@@ -184,13 +184,13 @@ Name:
184 GetRingBufferIndices() 184 GetRingBufferIndices()
185 185
186Description: 186Description:
187 Get the read and write indices as UINT64 of the specified ring buffer 187 Get the read and write indices as u64 of the specified ring buffer
188 188
189--*/ 189--*/
190static inline UINT64 190static inline u64
191GetRingBufferIndices(RING_BUFFER_INFO* RingInfo) 191GetRingBufferIndices(RING_BUFFER_INFO* RingInfo)
192{ 192{
193 return ((UINT64)RingInfo->RingBuffer->WriteIndex << 32) || RingInfo->RingBuffer->ReadIndex; 193 return ((u64)RingInfo->RingBuffer->WriteIndex << 32) || RingInfo->RingBuffer->ReadIndex;
194} 194}
195 195
196 196
@@ -359,7 +359,7 @@ RingBufferWrite(
359 u32 totalBytesToWrite=0; 359 u32 totalBytesToWrite=0;
360 360
361 volatile u32 nextWriteLocation; 361 volatile u32 nextWriteLocation;
362 UINT64 prevIndices=0; 362 u64 prevIndices=0;
363 363
364 DPRINT_ENTER(VMBUS); 364 DPRINT_ENTER(VMBUS);
365 365
@@ -368,7 +368,7 @@ RingBufferWrite(
368 totalBytesToWrite += SgBuffers[i].Length; 368 totalBytesToWrite += SgBuffers[i].Length;
369 } 369 }
370 370
371 totalBytesToWrite += sizeof(UINT64); 371 totalBytesToWrite += sizeof(u64);
372 372
373 SpinlockAcquire(OutRingInfo->RingLock); 373 SpinlockAcquire(OutRingInfo->RingLock);
374 374
@@ -408,7 +408,7 @@ RingBufferWrite(
408 nextWriteLocation = CopyToRingBuffer(OutRingInfo, 408 nextWriteLocation = CopyToRingBuffer(OutRingInfo,
409 nextWriteLocation, 409 nextWriteLocation,
410 &prevIndices, 410 &prevIndices,
411 sizeof(UINT64)); 411 sizeof(u64));
412 412
413 // Make sure we flush all writes before updating the writeIndex 413 // Make sure we flush all writes before updating the writeIndex
414 MemoryFence(); 414 MemoryFence();
@@ -494,7 +494,7 @@ RingBufferRead(
494 u32 bytesAvailToWrite; 494 u32 bytesAvailToWrite;
495 u32 bytesAvailToRead; 495 u32 bytesAvailToRead;
496 u32 nextReadLocation=0; 496 u32 nextReadLocation=0;
497 UINT64 prevIndices=0; 497 u64 prevIndices=0;
498 498
499 ASSERT(BufferLen > 0); 499 ASSERT(BufferLen > 0);
500 500
@@ -525,7 +525,7 @@ RingBufferRead(
525 525
526 nextReadLocation = CopyFromRingBuffer(InRingInfo, 526 nextReadLocation = CopyFromRingBuffer(InRingInfo,
527 &prevIndices, 527 &prevIndices,
528 sizeof(UINT64), 528 sizeof(u64),
529 nextReadLocation); 529 nextReadLocation);
530 530
531 // Make sure all reads are done before we update the read index since 531 // Make sure all reads are done before we update the read index since
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index ee56e0a621b..12365820e6c 100644
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -56,7 +56,7 @@ typedef struct _RNDIS_DEVICE {
56 HANDLE RequestLock; 56 HANDLE RequestLock;
57 LIST_ENTRY RequestList; 57 LIST_ENTRY RequestList;
58 58
59 UCHAR HwMacAddr[HW_MACADDR_LEN]; 59 unsigned char HwMacAddr[HW_MACADDR_LEN];
60} RNDIS_DEVICE; 60} RNDIS_DEVICE;
61 61
62 62
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 2b388d1bc9f..9631ce261ba 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -63,8 +63,8 @@ typedef struct _STORVSC_DEVICE{
63 // Each unique Port/Path/Target represents 1 channel ie scsi controller. In reality, the pathid, targetid is always 0 63 // Each unique Port/Path/Target represents 1 channel ie scsi controller. In reality, the pathid, targetid is always 0
64 // and the port is set by us 64 // and the port is set by us
65 ULONG PortNumber; 65 ULONG PortNumber;
66 UCHAR PathId; 66 unsigned char PathId;
67 UCHAR TargetId; 67 unsigned char TargetId;
68 68
69 //LIST_ENTRY OutstandingRequestList; 69 //LIST_ENTRY OutstandingRequestList;
70 //HANDLE OutstandingRequestLock; 70 //HANDLE OutstandingRequestLock;
@@ -279,9 +279,9 @@ StorVscInitialize(
279 storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION); 279 storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION);
280 280
281 // Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices) 281 // Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices)
282 // by the max request size (which is VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER + VSTOR_PACKET + UINT64) 282 // by the max request size (which is VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER + VSTOR_PACKET + u64)
283 storDriver->MaxOutstandingRequestsPerChannel = 283 storDriver->MaxOutstandingRequestsPerChannel =
284 ((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(VSTOR_PACKET) + sizeof(UINT64),sizeof(UINT64))); 284 ((storDriver->RingBufferSize - PAGE_SIZE) / ALIGN_UP(MAX_MULTIPAGE_BUFFER_PACKET + sizeof(VSTOR_PACKET) + sizeof(u64),sizeof(u64)));
285 285
286 DPRINT_INFO(STORVSC, "max io %u, currently %u\n", storDriver->MaxOutstandingRequestsPerChannel, STORVSC_MAX_IO_REQUESTS); 286 DPRINT_INFO(STORVSC, "max io %u, currently %u\n", storDriver->MaxOutstandingRequestsPerChannel, STORVSC_MAX_IO_REQUESTS);
287 287
@@ -909,8 +909,8 @@ StorVscOnChannelCallback(
909 DEVICE_OBJECT *device = (DEVICE_OBJECT*)Context; 909 DEVICE_OBJECT *device = (DEVICE_OBJECT*)Context;
910 STORVSC_DEVICE *storDevice; 910 STORVSC_DEVICE *storDevice;
911 u32 bytesRecvd; 911 u32 bytesRecvd;
912 UINT64 requestId; 912 u64 requestId;
913 UCHAR packet[ALIGN_UP(sizeof(VSTOR_PACKET),8)]; 913 unsigned char packet[ALIGN_UP(sizeof(VSTOR_PACKET),8)];
914 STORVSC_REQUEST_EXTENSION *request; 914 STORVSC_REQUEST_EXTENSION *request;
915 915
916 DPRINT_ENTER(STORVSC); 916 DPRINT_ENTER(STORVSC);
diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h
index 5ec22f80bfb..87aaeb3e2a7 100644
--- a/drivers/staging/hv/include/ChannelMessages.h
+++ b/drivers/staging/hv/include/ChannelMessages.h
@@ -148,7 +148,7 @@ typedef struct _VMBUS_CHANNEL_OPEN_CHANNEL
148 // 148 //
149 // User-specific data to be passed along to the server endpoint. 149 // User-specific data to be passed along to the server endpoint.
150 // 150 //
151 UCHAR UserData[MAX_USER_DEFINED_BYTES]; 151 unsigned char UserData[MAX_USER_DEFINED_BYTES];
152 152
153} VMBUS_CHANNEL_OPEN_CHANNEL, *PVMBUS_CHANNEL_OPEN_CHANNEL; 153} VMBUS_CHANNEL_OPEN_CHANNEL, *PVMBUS_CHANNEL_OPEN_CHANNEL;
154 154
@@ -203,7 +203,7 @@ typedef struct _VMBUS_CHANNEL_GPADL_BODY
203 VMBUS_CHANNEL_MESSAGE_HEADER Header; 203 VMBUS_CHANNEL_MESSAGE_HEADER Header;
204 u32 MessageNumber; 204 u32 MessageNumber;
205 u32 Gpadl; 205 u32 Gpadl;
206 UINT64 Pfn[0]; 206 u64 Pfn[0];
207} VMBUS_CHANNEL_GPADL_BODY, *PVMBUS_CHANNEL_GPADL_BODY; 207} VMBUS_CHANNEL_GPADL_BODY, *PVMBUS_CHANNEL_GPADL_BODY;
208 208
209 209
@@ -233,7 +233,7 @@ typedef struct _VMBUS_CHANNEL_VIEW_RANGE_ADD
233{ 233{
234 VMBUS_CHANNEL_MESSAGE_HEADER Header; 234 VMBUS_CHANNEL_MESSAGE_HEADER Header;
235 PHYSICAL_ADDRESS ViewRangeBase; 235 PHYSICAL_ADDRESS ViewRangeBase;
236 UINT64 ViewRangeLength; 236 u64 ViewRangeLength;
237 u32 ChildRelId; 237 u32 ChildRelId;
238} VMBUS_CHANNEL_VIEW_RANGE_ADD, *PVMBUS_CHANNEL_VIEW_RANGE_ADD; 238} VMBUS_CHANNEL_VIEW_RANGE_ADD, *PVMBUS_CHANNEL_VIEW_RANGE_ADD;
239 239
@@ -256,9 +256,9 @@ typedef struct _VMBUS_CHANNEL_INITIATE_CONTACT
256 VMBUS_CHANNEL_MESSAGE_HEADER Header; 256 VMBUS_CHANNEL_MESSAGE_HEADER Header;
257 u32 VMBusVersionRequested; 257 u32 VMBusVersionRequested;
258 u32 Padding2; 258 u32 Padding2;
259 UINT64 InterruptPage; 259 u64 InterruptPage;
260 UINT64 MonitorPage1; 260 u64 MonitorPage1;
261 UINT64 MonitorPage2; 261 u64 MonitorPage2;
262} VMBUS_CHANNEL_INITIATE_CONTACT, *PVMBUS_CHANNEL_INITIATE_CONTACT; 262} VMBUS_CHANNEL_INITIATE_CONTACT, *PVMBUS_CHANNEL_INITIATE_CONTACT;
263 263
264typedef struct _VMBUS_CHANNEL_VERSION_RESPONSE 264typedef struct _VMBUS_CHANNEL_VERSION_RESPONSE
diff --git a/drivers/staging/hv/include/HvHalApi.h b/drivers/staging/hv/include/HvHalApi.h
index 89ddb7465bc..ad7ba4dafef 100644
--- a/drivers/staging/hv/include/HvHalApi.h
+++ b/drivers/staging/hv/include/HvHalApi.h
@@ -28,5 +28,5 @@
28// 28//
29// Time in the hypervisor is measured in 100 nanosecond units 29// Time in the hypervisor is measured in 100 nanosecond units
30// 30//
31typedef UINT64 HV_NANO100_TIME, *PHV_NANO100_TIME; 31typedef u64 HV_NANO100_TIME, *PHV_NANO100_TIME;
32typedef UINT64 HV_NANO100_DURATION, *PHV_NANO100_DURATION; 32typedef u64 HV_NANO100_DURATION, *PHV_NANO100_DURATION;
diff --git a/drivers/staging/hv/include/HvHcApi.h b/drivers/staging/hv/include/HvHcApi.h
index d88a93292e2..d304305fddf 100644
--- a/drivers/staging/hv/include/HvHcApi.h
+++ b/drivers/staging/hv/include/HvHcApi.h
@@ -44,7 +44,7 @@ typedef struct _HV_INPUT_POST_MESSAGE
44 u32 Reserved; 44 u32 Reserved;
45 HV_MESSAGE_TYPE MessageType; 45 HV_MESSAGE_TYPE MessageType;
46 u32 PayloadSize; 46 u32 PayloadSize;
47 UINT64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; 47 u64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
48} HV_INPUT_POST_MESSAGE, *PHV_INPUT_POST_MESSAGE; 48} HV_INPUT_POST_MESSAGE, *PHV_INPUT_POST_MESSAGE;
49 49
50 50
diff --git a/drivers/staging/hv/include/HvPtApi.h b/drivers/staging/hv/include/HvPtApi.h
index 7b59234879b..b79e543a0c6 100644
--- a/drivers/staging/hv/include/HvPtApi.h
+++ b/drivers/staging/hv/include/HvPtApi.h
@@ -57,15 +57,15 @@ typedef enum _HV_GUEST_OS_MICROSOFT_IDS
57 57
58typedef union _HV_X64_MSR_GUEST_OS_ID_CONTENTS 58typedef union _HV_X64_MSR_GUEST_OS_ID_CONTENTS
59{ 59{
60 UINT64 AsUINT64; 60 u64 AsUINT64;
61 struct 61 struct
62 { 62 {
63 UINT64 BuildNumber : 16; 63 u64 BuildNumber : 16;
64 UINT64 ServiceVersion : 8; // Service Pack, etc. 64 u64 ServiceVersion : 8; // Service Pack, etc.
65 UINT64 MinorVersion : 8; 65 u64 MinorVersion : 8;
66 UINT64 MajorVersion : 8; 66 u64 MajorVersion : 8;
67 UINT64 OsId : 8; // HV_GUEST_OS_MICROSOFT_IDS (If Vendor=MS) 67 u64 OsId : 8; // HV_GUEST_OS_MICROSOFT_IDS (If Vendor=MS)
68 UINT64 VendorId : 16; // HV_GUEST_OS_VENDOR 68 u64 VendorId : 16; // HV_GUEST_OS_VENDOR
69 }; 69 };
70} HV_X64_MSR_GUEST_OS_ID_CONTENTS, *PHV_X64_MSR_GUEST_OS_ID_CONTENTS; 70} HV_X64_MSR_GUEST_OS_ID_CONTENTS, *PHV_X64_MSR_GUEST_OS_ID_CONTENTS;
71 71
@@ -76,11 +76,11 @@ typedef union _HV_X64_MSR_GUEST_OS_ID_CONTENTS
76 76
77typedef union _HV_X64_MSR_HYPERCALL_CONTENTS 77typedef union _HV_X64_MSR_HYPERCALL_CONTENTS
78{ 78{
79 UINT64 AsUINT64; 79 u64 AsUINT64;
80 struct 80 struct
81 { 81 {
82 UINT64 Enable : 1; 82 u64 Enable : 1;
83 UINT64 Reserved : 11; 83 u64 Reserved : 11;
84 UINT64 GuestPhysicalAddress : 52; 84 u64 GuestPhysicalAddress : 52;
85 }; 85 };
86} HV_X64_MSR_HYPERCALL_CONTENTS, *PHV_X64_MSR_HYPERCALL_CONTENTS; 86} HV_X64_MSR_HYPERCALL_CONTENTS, *PHV_X64_MSR_HYPERCALL_CONTENTS;
diff --git a/drivers/staging/hv/include/HvSynicApi.h b/drivers/staging/hv/include/HvSynicApi.h
index 753b0272811..79084e51025 100644
--- a/drivers/staging/hv/include/HvSynicApi.h
+++ b/drivers/staging/hv/include/HvSynicApi.h
@@ -145,7 +145,7 @@ typedef u32 HV_SYNIC_SINT_INDEX, *PHV_SYNIC_SINT_INDEX;
145// Define partition identifier type. 145// Define partition identifier type.
146// 146//
147 147
148typedef UINT64 HV_PARTITION_ID, *PHV_PARTITION_ID; 148typedef u64 HV_PARTITION_ID, *PHV_PARTITION_ID;
149 149
150// 150//
151// Define invalid partition identifier. 151// Define invalid partition identifier.
@@ -210,7 +210,7 @@ typedef struct _HV_PORT_INFO
210 { 210 {
211 HV_SYNIC_SINT_INDEX TargetSint; 211 HV_SYNIC_SINT_INDEX TargetSint;
212 HV_VP_INDEX TargetVp; 212 HV_VP_INDEX TargetVp;
213 UINT64 RsvdZ; 213 u64 RsvdZ;
214 } MessagePortInfo; 214 } MessagePortInfo;
215 215
216 struct 216 struct
@@ -225,7 +225,7 @@ typedef struct _HV_PORT_INFO
225 struct 225 struct
226 { 226 {
227 HV_GPA MonitorAddress; 227 HV_GPA MonitorAddress;
228 UINT64 RsvdZ; 228 u64 RsvdZ;
229 } MonitorPortInfo; 229 } MonitorPortInfo;
230 }; 230 };
231} HV_PORT_INFO, *PHV_PORT_INFO; 231} HV_PORT_INFO, *PHV_PORT_INFO;
@@ -241,12 +241,12 @@ typedef struct _HV_CONNECTION_INFO
241 { 241 {
242 struct 242 struct
243 { 243 {
244 UINT64 RsvdZ; 244 u64 RsvdZ;
245 } MessageConnectionInfo; 245 } MessageConnectionInfo;
246 246
247 struct 247 struct
248 { 248 {
249 UINT64 RsvdZ; 249 u64 RsvdZ;
250 } EventConnectionInfo; 250 } EventConnectionInfo;
251 251
252 struct 252 struct
@@ -311,7 +311,7 @@ typedef struct _HV_MESSAGE
311 HV_MESSAGE_HEADER Header; 311 HV_MESSAGE_HEADER Header;
312 union 312 union
313 { 313 {
314 UINT64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; 314 u64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
315 } u ; 315 } u ;
316} HV_MESSAGE, *PHV_MESSAGE; 316} HV_MESSAGE, *PHV_MESSAGE;
317 317
@@ -357,11 +357,11 @@ typedef struct _HV_SYNIC_EVENT_FLAGS_PAGE
357// 357//
358typedef union _HV_SYNIC_SCONTROL 358typedef union _HV_SYNIC_SCONTROL
359{ 359{
360 UINT64 AsUINT64; 360 u64 AsUINT64;
361 struct 361 struct
362 { 362 {
363 UINT64 Enable:1; 363 u64 Enable:1;
364 UINT64 Reserved:63; 364 u64 Reserved:63;
365 }; 365 };
366} HV_SYNIC_SCONTROL, *PHV_SYNIC_SCONTROL; 366} HV_SYNIC_SCONTROL, *PHV_SYNIC_SCONTROL;
367 367
@@ -371,14 +371,14 @@ typedef union _HV_SYNIC_SCONTROL
371 371
372typedef union _HV_SYNIC_SINT 372typedef union _HV_SYNIC_SINT
373{ 373{
374 UINT64 AsUINT64; 374 u64 AsUINT64;
375 struct 375 struct
376 { 376 {
377 UINT64 Vector :8; 377 u64 Vector :8;
378 UINT64 Reserved1 :8; 378 u64 Reserved1 :8;
379 UINT64 Masked :1; 379 u64 Masked :1;
380 UINT64 AutoEoi :1; 380 u64 AutoEoi :1;
381 UINT64 Reserved2 :46; 381 u64 Reserved2 :46;
382 }; 382 };
383} HV_SYNIC_SINT, *PHV_SYNIC_SINT; 383} HV_SYNIC_SINT, *PHV_SYNIC_SINT;
384 384
@@ -388,12 +388,12 @@ typedef union _HV_SYNIC_SINT
388 388
389typedef union _HV_SYNIC_SIMP 389typedef union _HV_SYNIC_SIMP
390{ 390{
391 UINT64 AsUINT64; 391 u64 AsUINT64;
392 struct 392 struct
393 { 393 {
394 UINT64 SimpEnabled : 1; 394 u64 SimpEnabled : 1;
395 UINT64 Preserved : 11; 395 u64 Preserved : 11;
396 UINT64 BaseSimpGpa : 52; 396 u64 BaseSimpGpa : 52;
397 }; 397 };
398} HV_SYNIC_SIMP, *PHV_SYNIC_SIMP; 398} HV_SYNIC_SIMP, *PHV_SYNIC_SIMP;
399 399
@@ -403,12 +403,12 @@ typedef union _HV_SYNIC_SIMP
403 403
404typedef union _HV_SYNIC_SIEFP 404typedef union _HV_SYNIC_SIEFP
405{ 405{
406 UINT64 AsUINT64; 406 u64 AsUINT64;
407 struct 407 struct
408 { 408 {
409 UINT64 SiefpEnabled : 1; 409 u64 SiefpEnabled : 1;
410 UINT64 Preserved : 11; 410 u64 Preserved : 11;
411 UINT64 BaseSiefpGpa : 52; 411 u64 BaseSiefpGpa : 52;
412 }; 412 };
413} HV_SYNIC_SIEFP, *PHV_SYNIC_SIEFP; 413} HV_SYNIC_SIEFP, *PHV_SYNIC_SIEFP;
414 414
@@ -418,7 +418,7 @@ typedef union _HV_SYNIC_SIEFP
418 418
419typedef union _HV_MONITOR_TRIGGER_GROUP 419typedef union _HV_MONITOR_TRIGGER_GROUP
420{ 420{
421 UINT64 AsUINT64; 421 u64 AsUINT64;
422 422
423 struct 423 struct
424 { 424 {
@@ -474,12 +474,12 @@ typedef struct _HV_MONITOR_PAGE
474 u32 RsvdZ1; 474 u32 RsvdZ1;
475 475
476 HV_MONITOR_TRIGGER_GROUP TriggerGroup[4]; 476 HV_MONITOR_TRIGGER_GROUP TriggerGroup[4];
477 UINT64 RsvdZ2[3]; 477 u64 RsvdZ2[3];
478 478
479 s32 NextCheckTime[4][32]; 479 s32 NextCheckTime[4][32];
480 480
481 u16 Latency[4][32]; 481 u16 Latency[4][32];
482 UINT64 RsvdZ3[32]; 482 u64 RsvdZ3[32];
483 483
484 HV_MONITOR_PARAMETER Parameter[4][32]; 484 HV_MONITOR_PARAMETER Parameter[4][32];
485 485
diff --git a/drivers/staging/hv/include/HvTypes.h b/drivers/staging/hv/include/HvTypes.h
index bbf9891f942..5741c358b41 100644
--- a/drivers/staging/hv/include/HvTypes.h
+++ b/drivers/staging/hv/include/HvTypes.h
@@ -24,7 +24,7 @@
24 24
25#pragma once 25#pragma once
26 26
27typedef UINT64 HV_GPA, *PHV_GPA; 27typedef u64 HV_GPA, *PHV_GPA;
28 28
29#define HV_X64_PAGE_SIZE (4096) 29#define HV_X64_PAGE_SIZE (4096)
30#define HV_PAGE_SIZE HV_X64_PAGE_SIZE 30#define HV_PAGE_SIZE HV_X64_PAGE_SIZE
diff --git a/drivers/staging/hv/include/List.h b/drivers/staging/hv/include/List.h
index 6cfe7dfd66e..c2145b2ed04 100644
--- a/drivers/staging/hv/include/List.h
+++ b/drivers/staging/hv/include/List.h
@@ -260,8 +260,8 @@ typedef DLIST_ENTRY *PLIST_ENTRY;
260 260
261#ifndef CONTAINING_RECORD 261#ifndef CONTAINING_RECORD
262#define CONTAINING_RECORD(address, type, field) ((type *)( \ 262#define CONTAINING_RECORD(address, type, field) ((type *)( \
263 (PCHAR)(address) - \ 263 (char *)(address) - \
264 (PCHAR)(&((type *)0)->field))) 264 (char *)(&((type *)0)->field)))
265#endif /* CONTAINING_RECORD */ 265#endif /* CONTAINING_RECORD */
266 266
267#endif /* _LIST_H_ */ 267#endif /* _LIST_H_ */
diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h
index 5ae8a3c097b..06e734e4023 100644
--- a/drivers/staging/hv/include/NetVscApi.h
+++ b/drivers/staging/hv/include/NetVscApi.h
@@ -79,12 +79,12 @@ typedef struct _NETVSC_PACKET {
79 79
80 union { 80 union {
81 struct{ 81 struct{
82 UINT64 ReceiveCompletionTid; 82 u64 ReceiveCompletionTid;
83 void * ReceiveCompletionContext; 83 void * ReceiveCompletionContext;
84 PFN_ON_SENDRECVCOMPLETION OnReceiveCompletion; 84 PFN_ON_SENDRECVCOMPLETION OnReceiveCompletion;
85 } Recv; 85 } Recv;
86 struct{ 86 struct{
87 UINT64 SendCompletionTid; 87 u64 SendCompletionTid;
88 void * SendCompletionContext; 88 void * SendCompletionContext;
89 PFN_ON_SENDRECVCOMPLETION OnSendCompletion; 89 PFN_ON_SENDRECVCOMPLETION OnSendCompletion;
90 } Send; 90 } Send;
@@ -130,7 +130,7 @@ typedef struct _NETVSC_DRIVER_OBJECT {
130 130
131 131
132typedef struct _NETVSC_DEVICE_INFO { 132typedef struct _NETVSC_DEVICE_INFO {
133 UCHAR MacAddr[6]; 133 unsigned char MacAddr[6];
134 BOOL LinkState; // 0 - link up, 1 - link down 134 BOOL LinkState; // 0 - link up, 1 - link down
135} NETVSC_DEVICE_INFO; 135} NETVSC_DEVICE_INFO;
136 136
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h
index bd6823e5122..4df77dafdde 100644
--- a/drivers/staging/hv/include/StorVscApi.h
+++ b/drivers/staging/hv/include/StorVscApi.h
@@ -80,7 +80,7 @@ typedef struct _STORVSC_REQUEST {
80 u32 Status; 80 u32 Status;
81 u32 BytesXfer; 81 u32 BytesXfer;
82 82
83 UCHAR* SenseBuffer; 83 unsigned char* SenseBuffer;
84 u32 SenseBufferSize; 84 u32 SenseBufferSize;
85 85
86 void * Context; 86 void * Context;
@@ -118,8 +118,8 @@ typedef struct _STORVSC_DRIVER_OBJECT {
118 118
119typedef struct _STORVSC_DEVICE_INFO { 119typedef struct _STORVSC_DEVICE_INFO {
120 ULONG PortNumber; 120 ULONG PortNumber;
121 UCHAR PathId; 121 unsigned char PathId;
122 UCHAR TargetId; 122 unsigned char TargetId;
123} STORVSC_DEVICE_INFO; 123} STORVSC_DEVICE_INFO;
124 124
125// 125//
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index ea7e36d9736..40b8f1e43e0 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -51,7 +51,7 @@ typedef struct _DEVICE_OBJECT *PDEVICE_OBJECT;
51typedef struct _PAGE_BUFFER { 51typedef struct _PAGE_BUFFER {
52 u32 Length; 52 u32 Length;
53 u32 Offset; 53 u32 Offset;
54 UINT64 Pfn; 54 u64 Pfn;
55} PAGE_BUFFER; 55} PAGE_BUFFER;
56 56
57// Multiple-page buffer 57// Multiple-page buffer
@@ -59,7 +59,7 @@ typedef struct _MULTIPAGE_BUFFER {
59 // Length and Offset determines the # of pfns in the array 59 // Length and Offset determines the # of pfns in the array
60 u32 Length; 60 u32 Length;
61 u32 Offset; 61 u32 Offset;
62 UINT64 PfnArray[MAX_MULTIPAGE_BUFFER_COUNT]; 62 u64 PfnArray[MAX_MULTIPAGE_BUFFER_COUNT];
63}MULTIPAGE_BUFFER; 63}MULTIPAGE_BUFFER;
64 64
65//0x18 includes the proprietary packet header 65//0x18 includes the proprietary packet header
@@ -108,7 +108,7 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET)(
108 PDEVICE_OBJECT Device, 108 PDEVICE_OBJECT Device,
109 const void * Buffer, 109 const void * Buffer,
110 u32 BufferLen, 110 u32 BufferLen,
111 UINT64 RequestId, 111 u64 RequestId,
112 u32 Type, 112 u32 Type,
113 u32 Flags 113 u32 Flags
114); 114);
@@ -119,7 +119,7 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER)(
119 u32 PageCount, 119 u32 PageCount,
120 void * Buffer, 120 void * Buffer,
121 u32 BufferLen, 121 u32 BufferLen,
122 UINT64 RequestId 122 u64 RequestId
123 ); 123 );
124 124
125typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER)( 125typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER)(
@@ -127,7 +127,7 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER)(
127 MULTIPAGE_BUFFER *MultiPageBuffer, 127 MULTIPAGE_BUFFER *MultiPageBuffer,
128 void * Buffer, 128 void * Buffer,
129 u32 BufferLen, 129 u32 BufferLen,
130 UINT64 RequestId 130 u64 RequestId
131); 131);
132 132
133typedef int (*VMBUS_CHANNEL_RECV_PACKET)( 133typedef int (*VMBUS_CHANNEL_RECV_PACKET)(
@@ -135,7 +135,7 @@ typedef int (*VMBUS_CHANNEL_RECV_PACKET)(
135 void * Buffer, 135 void * Buffer,
136 u32 BufferLen, 136 u32 BufferLen,
137 u32* BufferActualLen, 137 u32* BufferActualLen,
138 UINT64* RequestId 138 u64* RequestId
139 ); 139 );
140 140
141typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)( 141typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)(
@@ -143,7 +143,7 @@ typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)(
143 void * Buffer, 143 void * Buffer,
144 u32 BufferLen, 144 u32 BufferLen,
145 u32* BufferActualLen, 145 u32* BufferActualLen,
146 UINT64* RequestId 146 u64* RequestId
147 ); 147 );
148 148
149typedef int (*VMBUS_CHANNEL_ESTABLISH_GPADL)( 149typedef int (*VMBUS_CHANNEL_ESTABLISH_GPADL)(
diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h
index 900e1fc2fb8..c334b88c915 100644
--- a/drivers/staging/hv/include/VmbusChannelInterface.h
+++ b/drivers/staging/hv/include/VmbusChannelInterface.h
@@ -66,7 +66,7 @@ typedef struct
66 66
67 GUID InterfaceType; 67 GUID InterfaceType;
68 GUID InterfaceInstance; 68 GUID InterfaceInstance;
69 UINT64 InterruptLatencyIn100nsUnits; 69 u64 InterruptLatencyIn100nsUnits;
70 u32 InterfaceRevision; 70 u32 InterfaceRevision;
71 u32 ServerContextAreaSize; // in bytes 71 u32 ServerContextAreaSize; // in bytes
72 u16 ChannelFlags; 72 u16 ChannelFlags;
@@ -79,7 +79,7 @@ typedef struct
79 // 79 //
80 struct 80 struct
81 { 81 {
82 UCHAR UserDefined[MAX_USER_DEFINED_BYTES]; 82 unsigned char UserDefined[MAX_USER_DEFINED_BYTES];
83 } Standard; 83 } Standard;
84 84
85 // 85 //
@@ -90,7 +90,7 @@ typedef struct
90 struct 90 struct
91 { 91 {
92 u32 PipeMode; 92 u32 PipeMode;
93 UCHAR UserDefined[MAX_PIPE_USER_DEFINED_BYTES]; 93 unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
94 } Pipe; 94 } Pipe;
95 } u; 95 } u;
96 u32 Padding; 96 u32 Padding;
diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h
index 7dd489a722e..78c4ca02a97 100644
--- a/drivers/staging/hv/include/VmbusPacketFormat.h
+++ b/drivers/staging/hv/include/VmbusPacketFormat.h
@@ -83,7 +83,7 @@ typedef struct
83 u16 DataOffset8; 83 u16 DataOffset8;
84 u16 Length8; 84 u16 Length8;
85 u16 Flags; 85 u16 Flags;
86 UINT64 TransactionId; 86 u64 TransactionId;
87} VMPACKET_DESCRIPTOR, *PVMPACKET_DESCRIPTOR; 87} VMPACKET_DESCRIPTOR, *PVMPACKET_DESCRIPTOR;
88 88
89typedef u32 PREVIOUS_PACKET_OFFSET, *PPREVIOUS_PACKET_OFFSET; 89typedef u32 PREVIOUS_PACKET_OFFSET, *PPREVIOUS_PACKET_OFFSET;
@@ -168,7 +168,7 @@ typedef struct _GPA_RANGE {
168 168
169 u32 ByteCount; 169 u32 ByteCount;
170 u32 ByteOffset; 170 u32 ByteOffset;
171 UINT64 PfnArray[0]; 171 u64 PfnArray[0];
172 172
173} GPA_RANGE, *PGPA_RANGE; 173} GPA_RANGE, *PGPA_RANGE;
174 174
@@ -266,10 +266,10 @@ typedef struct _VMADDITIONAL_DATA {
266 266
267#endif 267#endif
268 268
269 UINT64 TotalBytes; 269 u64 TotalBytes;
270 u32 ByteOffset; 270 u32 ByteOffset;
271 u32 ByteCount; 271 u32 ByteCount;
272 UCHAR Data[1]; 272 unsigned char Data[1];
273 273
274} VMADDITIONAL_DATA, *PVMADDITIONAL_DATA; 274} VMADDITIONAL_DATA, *PVMADDITIONAL_DATA;
275 275
@@ -287,7 +287,7 @@ typedef union {
287} VMPACKET_LARGEST_POSSIBLE_HEADER, *PVMPACKET_LARGEST_POSSIBLE_HEADER; 287} VMPACKET_LARGEST_POSSIBLE_HEADER, *PVMPACKET_LARGEST_POSSIBLE_HEADER;
288 288
289#define VMPACKET_DATA_START_ADDRESS(__packet) \ 289#define VMPACKET_DATA_START_ADDRESS(__packet) \
290 (void *)(((PUCHAR)__packet) + ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8 * 8) 290 (void *)(((unsigned char *)__packet) + ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8 * 8)
291 291
292#define VMPACKET_DATA_LENGTH(__packet) \ 292#define VMPACKET_DATA_LENGTH(__packet) \
293 ((((PVMPACKET_DESCRIPTOR)__packet)->Length8 - ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8) * 8) 293 ((((PVMPACKET_DESCRIPTOR)__packet)->Length8 - ((PVMPACKET_DESCRIPTOR)__packet)->DataOffset8) * 8)
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index eaba978920d..4e54f669e84 100644
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -97,28 +97,15 @@ typedef struct _DLIST_ENTRY {
97// 97//
98// unsigned types 98// unsigned types
99// 99//
100#ifdef __x86_64__
101typedef unsigned long UINT64;
102#else
103typedef unsigned long long UINT64;
104#endif
105 100
106typedef unsigned long long ULONGLONG; 101typedef unsigned long long ULONGLONG;
107typedef unsigned int ULONG; 102typedef unsigned int ULONG;
108typedef unsigned short USHORT; 103typedef unsigned short USHORT;
109typedef unsigned char UCHAR;
110 104
111// 105//
112// signed types 106// signed types
113// 107//
114#ifdef __x86_64__
115typedef long INT64;
116#else
117typedef long long INT64;
118#endif
119
120typedef int LONG; 108typedef int LONG;
121typedef char CHAR;
122typedef long long LONGLONG; 109typedef long long LONGLONG;
123 110
124// 111//
@@ -130,7 +117,6 @@ typedef unsigned char BOOL;
130typedef unsigned char BOOLEAN; 117typedef unsigned char BOOLEAN;
131typedef void* HANDLE; 118typedef void* HANDLE;
132typedef u32 DWORD; 119typedef u32 DWORD;
133typedef char* PCHAR;
134typedef unsigned char BYTE; 120typedef unsigned char BYTE;
135 121
136typedef unsigned long ULONG_PTR; 122typedef unsigned long ULONG_PTR;
@@ -150,13 +136,13 @@ typedef void (*PFN_TIMER_CALLBACK)(void* context);
150 __asm__ __volatile__("rdmsr" \ 136 __asm__ __volatile__("rdmsr" \
151 : "=a" (l), "=d" (h) \ 137 : "=a" (l), "=d" (h) \
152 : "c" (reg)); \ 138 : "c" (reg)); \
153 v = (((UINT64)h) << 32) | l; \ 139 v = (((u64)h) << 32) | l; \
154} 140}
155 141
156#define WRMSR(reg, v) { \ 142#define WRMSR(reg, v) { \
157 u32 h, l; \ 143 u32 h, l; \
158 l = (u32)(((UINT64)(v)) & 0xFFFFFFFF); \ 144 l = (u32)(((u64)(v)) & 0xFFFFFFFF); \
159 h = (u32)((((UINT64)(v)) >> 32) & 0xFFFFFFFF); \ 145 h = (u32)((((u64)(v)) >> 32) & 0xFFFFFFFF); \
160 __asm__ __volatile__("wrmsr" \ 146 __asm__ __volatile__("wrmsr" \
161 : /* no outputs */ \ 147 : /* no outputs */ \
162 : "c" (reg), "a" (l), "d" (h)); \ 148 : "c" (reg), "a" (l), "d" (h)); \
@@ -172,7 +158,7 @@ typedef void (*PFN_TIMER_CALLBACK)(void* context);
172#define WRMSR(reg, v) \ 158#define WRMSR(reg, v) \
173 __asm__ __volatile__("wrmsr" \ 159 __asm__ __volatile__("wrmsr" \
174 : /* no outputs */ \ 160 : /* no outputs */ \
175 : "c" (reg), "A" ((UINT64)v)) 161 : "c" (reg), "A" ((u64)v))
176 162
177#endif 163#endif
178 164
diff --git a/drivers/staging/hv/include/rndis.h b/drivers/staging/hv/include/rndis.h
index 58d9a79e34a..baabd0ad8ec 100644
--- a/drivers/staging/hv/include/rndis.h
+++ b/drivers/staging/hv/include/rndis.h
@@ -811,19 +811,19 @@ typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE
811 811
812// get pointer to info buffer with message pointer 812// get pointer to info buffer with message pointer
813#define MESSAGE_TO_INFO_BUFFER(Message) \ 813#define MESSAGE_TO_INFO_BUFFER(Message) \
814 (((PUCHAR)(Message)) + Message->InformationBufferOffset) 814 (((unsigned char *)(Message)) + Message->InformationBufferOffset)
815 815
816// get pointer to status buffer with message pointer 816// get pointer to status buffer with message pointer
817#define MESSAGE_TO_STATUS_BUFFER(Message) \ 817#define MESSAGE_TO_STATUS_BUFFER(Message) \
818 (((PUCHAR)(Message)) + Message->StatusBufferOffset) 818 (((unsigned char *)(Message)) + Message->StatusBufferOffset)
819 819
820// get pointer to OOBD buffer with message pointer 820// get pointer to OOBD buffer with message pointer
821#define MESSAGE_TO_OOBD_BUFFER(Message) \ 821#define MESSAGE_TO_OOBD_BUFFER(Message) \
822 (((PUCHAR)(Message)) + Message->OOBDataOffset) 822 (((unsigned char *)(Message)) + Message->OOBDataOffset)
823 823
824// get pointer to data buffer with message pointer 824// get pointer to data buffer with message pointer
825#define MESSAGE_TO_DATA_BUFFER(Message) \ 825#define MESSAGE_TO_DATA_BUFFER(Message) \
826 (((PUCHAR)(Message)) + Message->PerPacketInfoOffset) 826 (((unsigned char *)(Message)) + Message->PerPacketInfoOffset)
827 827
828// get pointer to contained message from NDIS_MESSAGE pointer 828// get pointer to contained message from NDIS_MESSAGE pointer
829#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(RndisMessage) \ 829#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(RndisMessage) \
diff --git a/drivers/staging/hv/include/vstorage.h b/drivers/staging/hv/include/vstorage.h
index 3ab98616723..442c8c37d37 100644
--- a/drivers/staging/hv/include/vstorage.h
+++ b/drivers/staging/hv/include/vstorage.h
@@ -94,7 +94,7 @@
94#define MAX_TRANSFER_LENGTH 0x40000 94#define MAX_TRANSFER_LENGTH 0x40000
95#define DEFAULT_PACKET_SIZE (sizeof(VMDATA_GPA_DIRECT) + \ 95#define DEFAULT_PACKET_SIZE (sizeof(VMDATA_GPA_DIRECT) + \
96 sizeof(VSTOR_PACKET) + \ 96 sizeof(VSTOR_PACKET) + \
97 (sizeof(UINT64) * (MAX_TRANSFER_LENGTH / PAGE_SIZE))) 97 (sizeof(u64) * (MAX_TRANSFER_LENGTH / PAGE_SIZE)))
98 98
99 99
100 100
@@ -142,28 +142,28 @@ C_ASSERT(SENSE_BUFFER_SIZE == 0x12);
142typedef struct 142typedef struct
143{ 143{
144 USHORT Length; 144 USHORT Length;
145 UCHAR SrbStatus; 145 unsigned char SrbStatus;
146 UCHAR ScsiStatus; 146 unsigned char ScsiStatus;
147 147
148 UCHAR PortNumber; 148 unsigned char PortNumber;
149 UCHAR PathId; 149 unsigned char PathId;
150 UCHAR TargetId; 150 unsigned char TargetId;
151 UCHAR Lun; 151 unsigned char Lun;
152 152
153 UCHAR CdbLength; 153 unsigned char CdbLength;
154 UCHAR SenseInfoLength; 154 unsigned char SenseInfoLength;
155 UCHAR DataIn; 155 unsigned char DataIn;
156 UCHAR Reserved; 156 unsigned char Reserved;
157 157
158 ULONG DataTransferLength; 158 ULONG DataTransferLength;
159 159
160 union 160 union
161 { 161 {
162 UCHAR Cdb[CDB16GENERIC_LENGTH]; 162 unsigned char Cdb[CDB16GENERIC_LENGTH];
163 163
164 UCHAR SenseData[SENSE_BUFFER_SIZE]; 164 unsigned char SenseData[SENSE_BUFFER_SIZE];
165 165
166 UCHAR ReservedArray[MAX_DATA_BUFFER_LENGTH_WITH_PADDING]; 166 unsigned char ReservedArray[MAX_DATA_BUFFER_LENGTH_WITH_PADDING];
167 }; 167 };
168 168
169} VMSCSI_REQUEST, *PVMSCSI_REQUEST; 169} VMSCSI_REQUEST, *PVMSCSI_REQUEST;
@@ -179,8 +179,8 @@ C_ASSERT((sizeof(VMSCSI_REQUEST) % 4) == 0);
179typedef struct 179typedef struct
180{ 180{
181 USHORT ProtocolVersion; 181 USHORT ProtocolVersion;
182 UCHAR PathId; 182 unsigned char PathId;
183 UCHAR TargetId; 183 unsigned char TargetId;
184 184
185 // 185 //
186 // Note: port number is only really known on the client side 186 // Note: port number is only really known on the client side
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 17:41:12 -0400