aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/hv')
-rw-r--r--drivers/staging/hv/Channel.c90
-rw-r--r--drivers/staging/hv/Channel.h38
-rw-r--r--drivers/staging/hv/ChannelInterface.c32
-rw-r--r--drivers/staging/hv/ChannelMgmt.h22
-rw-r--r--drivers/staging/hv/Connection.c14
-rw-r--r--drivers/staging/hv/Hv.c20
-rw-r--r--drivers/staging/hv/Hv.h2
-rw-r--r--drivers/staging/hv/NetVsc.c2
-rw-r--r--drivers/staging/hv/NetVsc.h12
-rw-r--r--drivers/staging/hv/RingBuffer.c96
-rw-r--r--drivers/staging/hv/RingBuffer.h38
-rw-r--r--drivers/staging/hv/RndisFilter.c40
-rw-r--r--drivers/staging/hv/StorVsc.c2
-rw-r--r--drivers/staging/hv/Vmbus.c2
-rw-r--r--drivers/staging/hv/VmbusPrivate.h6
-rw-r--r--drivers/staging/hv/include/ChannelMessages.h52
-rw-r--r--drivers/staging/hv/include/HvHcApi.h4
-rw-r--r--drivers/staging/hv/include/HvSynicApi.h42
-rw-r--r--drivers/staging/hv/include/HvVpApi.h2
-rw-r--r--drivers/staging/hv/include/NetVscApi.h14
-rw-r--r--drivers/staging/hv/include/StorVscApi.h22
-rw-r--r--drivers/staging/hv/include/VmbusApi.h68
-rw-r--r--drivers/staging/hv/include/VmbusChannelInterface.h10
-rw-r--r--drivers/staging/hv/include/VmbusPacketFormat.h40
-rw-r--r--drivers/staging/hv/include/nvspprotocol.h42
-rw-r--r--drivers/staging/hv/include/osd.h16
-rw-r--r--drivers/staging/hv/include/rndis.h170
-rw-r--r--drivers/staging/hv/osd.c4
28 files changed, 450 insertions, 452 deletions
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 17c505de6f6..3c375cedca7 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -33,9 +33,9 @@
33static int 33static int
34VmbusChannelCreateGpadlHeader( 34VmbusChannelCreateGpadlHeader(
35 void * Kbuffer, // must be phys and virt contiguous 35 void * Kbuffer, // must be phys and virt contiguous
36 UINT32 Size, // page-size multiple 36 u32 Size, // page-size multiple
37 VMBUS_CHANNEL_MSGINFO **msgInfo, 37 VMBUS_CHANNEL_MSGINFO **msgInfo,
38 UINT32 *MessageCount 38 u32 *MessageCount
39 ); 39 );
40 40
41static void 41static void
@@ -77,7 +77,7 @@ DumpMonitorPage(
77 { 77 {
78 for (j=0; j<32; j++) 78 for (j=0; j<32; j++)
79 { 79 {
80 DPRINT_DBG(VMBUS, "param-conn id (%d)(%d) - %d", i, j, MonitorPage->Parameter[i][j].ConnectionId.AsUINT32); 80 DPRINT_DBG(VMBUS, "param-conn id (%d)(%d) - %d", i, j, MonitorPage->Parameter[i][j].ConnectionId.Asu32);
81 DPRINT_DBG(VMBUS, "param-flag (%d)(%d) - %d", i, j, MonitorPage->Parameter[i][j].FlagNumber); 81 DPRINT_DBG(VMBUS, "param-flag (%d)(%d) - %d", i, j, MonitorPage->Parameter[i][j].FlagNumber);
82 82
83 } 83 }
@@ -105,13 +105,13 @@ VmbusChannelSetEvent(
105 105
106 if (Channel->OfferMsg.MonitorAllocated) 106 if (Channel->OfferMsg.MonitorAllocated)
107 { 107 {
108 // Each UINT32 represents 32 channels 108 // Each u32 represents 32 channels
109 BitSet((UINT32*)gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5), Channel->OfferMsg.ChildRelId & 31); 109 BitSet((u32*)gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5), Channel->OfferMsg.ChildRelId & 31);
110 110
111 monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages; 111 monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
112 monitorPage++; // Get the child to parent monitor page 112 monitorPage++; // Get the child to parent monitor page
113 113
114 BitSet((UINT32*) &monitorPage->TriggerGroup[Channel->MonitorGroup].Pending, Channel->MonitorBit); 114 BitSet((u32*) &monitorPage->TriggerGroup[Channel->MonitorGroup].Pending, Channel->MonitorBit);
115 } 115 }
116 else 116 else
117 { 117 {
@@ -133,13 +133,13 @@ VmbusChannelClearEvent(
133 133
134 if (Channel->OfferMsg.MonitorAllocated) 134 if (Channel->OfferMsg.MonitorAllocated)
135 { 135 {
136 // Each UINT32 represents 32 channels 136 // Each u32 represents 32 channels
137 BitClear((UINT32*)gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5), Channel->OfferMsg.ChildRelId & 31); 137 BitClear((u32*)gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5), Channel->OfferMsg.ChildRelId & 31);
138 138
139 monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages; 139 monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
140 monitorPage++; // Get the child to parent monitor page 140 monitorPage++; // Get the child to parent monitor page
141 141
142 BitClear((UINT32*) &monitorPage->TriggerGroup[Channel->MonitorGroup].Pending, Channel->MonitorBit); 142 BitClear((u32*) &monitorPage->TriggerGroup[Channel->MonitorGroup].Pending, Channel->MonitorBit);
143 } 143 }
144 144
145 DPRINT_EXIT(VMBUS); 145 DPRINT_EXIT(VMBUS);
@@ -164,7 +164,7 @@ VmbusChannelGetDebugInfo(
164 HV_MONITOR_PAGE *monitorPage; 164 HV_MONITOR_PAGE *monitorPage;
165 u8 monitorGroup = (u8)Channel->OfferMsg.MonitorId / 32; 165 u8 monitorGroup = (u8)Channel->OfferMsg.MonitorId / 32;
166 u8 monitorOffset = (u8)Channel->OfferMsg.MonitorId % 32; 166 u8 monitorOffset = (u8)Channel->OfferMsg.MonitorId % 32;
167 //UINT32 monitorBit = 1 << monitorOffset; 167 //u32 monitorBit = 1 << monitorOffset;
168 168
169 DebugInfo->RelId = Channel->OfferMsg.ChildRelId; 169 DebugInfo->RelId = Channel->OfferMsg.ChildRelId;
170 DebugInfo->State = Channel->State; 170 DebugInfo->State = Channel->State;
@@ -202,10 +202,10 @@ Description:
202int 202int
203VmbusChannelOpen( 203VmbusChannelOpen(
204 VMBUS_CHANNEL *NewChannel, 204 VMBUS_CHANNEL *NewChannel,
205 UINT32 SendRingBufferSize, 205 u32 SendRingBufferSize,
206 UINT32 RecvRingBufferSize, 206 u32 RecvRingBufferSize,
207 void * UserData, 207 void * UserData,
208 UINT32 UserDataLen, 208 u32 UserDataLen,
209 PFN_CHANNEL_CALLBACK pfnOnChannelCallback, 209 PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
210 void * Context 210 void * Context
211 ) 211 )
@@ -330,7 +330,7 @@ Description:
330--*/ 330--*/
331static void DumpGpadlBody( 331static void DumpGpadlBody(
332 VMBUS_CHANNEL_GPADL_BODY *Gpadl, 332 VMBUS_CHANNEL_GPADL_BODY *Gpadl,
333 UINT32 Len) 333 u32 Len)
334{ 334{
335 int i=0; 335 int i=0;
336 int pfnCount=0; 336 int pfnCount=0;
@@ -393,9 +393,9 @@ Description:
393static int 393static int
394VmbusChannelCreateGpadlHeader( 394VmbusChannelCreateGpadlHeader(
395 void * Kbuffer, // from kmalloc() 395 void * Kbuffer, // from kmalloc()
396 UINT32 Size, // page-size multiple 396 u32 Size, // page-size multiple
397 VMBUS_CHANNEL_MSGINFO **MsgInfo, 397 VMBUS_CHANNEL_MSGINFO **MsgInfo,
398 UINT32 *MessageCount) 398 u32 *MessageCount)
399{ 399{
400 int i; 400 int i;
401 int pageCount; 401 int pageCount;
@@ -404,7 +404,7 @@ VmbusChannelCreateGpadlHeader(
404 VMBUS_CHANNEL_GPADL_BODY* gpadlBody; 404 VMBUS_CHANNEL_GPADL_BODY* gpadlBody;
405 VMBUS_CHANNEL_MSGINFO* msgHeader; 405 VMBUS_CHANNEL_MSGINFO* msgHeader;
406 VMBUS_CHANNEL_MSGINFO* msgBody; 406 VMBUS_CHANNEL_MSGINFO* msgBody;
407 UINT32 msgSize; 407 u32 msgSize;
408 408
409 int pfnSum, pfnCount, pfnLeft, pfnCurr, pfnSize; 409 int pfnSum, pfnCount, pfnLeft, pfnCurr, pfnSize;
410 410
@@ -465,7 +465,7 @@ VmbusChannelCreateGpadlHeader(
465 (*MessageCount)++; 465 (*MessageCount)++;
466 gpadlBody = (VMBUS_CHANNEL_GPADL_BODY*)msgBody->Msg; 466 gpadlBody = (VMBUS_CHANNEL_GPADL_BODY*)msgBody->Msg;
467 467
468 // FIXME: Gpadl is UINT32 and we are using a pointer which could be 64-bit 468 // FIXME: Gpadl is u32 and we are using a pointer which could be 64-bit
469 //gpadlBody->Gpadl = kbuffer; 469 //gpadlBody->Gpadl = kbuffer;
470 for (i=0; i<pfnCurr; i++) 470 for (i=0; i<pfnCurr; i++)
471 { 471 {
@@ -516,8 +516,8 @@ int
516VmbusChannelEstablishGpadl( 516VmbusChannelEstablishGpadl(
517 VMBUS_CHANNEL *Channel, 517 VMBUS_CHANNEL *Channel,
518 void * Kbuffer, // from kmalloc() 518 void * Kbuffer, // from kmalloc()
519 UINT32 Size, // page-size multiple 519 u32 Size, // page-size multiple
520 UINT32 *GpadlHandle 520 u32 *GpadlHandle
521 ) 521 )
522{ 522{
523 int ret=0; 523 int ret=0;
@@ -528,10 +528,10 @@ VmbusChannelEstablishGpadl(
528 VMBUS_CHANNEL_MSGINFO *msgInfo; 528 VMBUS_CHANNEL_MSGINFO *msgInfo;
529 VMBUS_CHANNEL_MSGINFO *subMsgInfo; 529 VMBUS_CHANNEL_MSGINFO *subMsgInfo;
530 530
531 UINT32 msgCount; 531 u32 msgCount;
532 LIST_ENTRY* anchor; 532 LIST_ENTRY* anchor;
533 LIST_ENTRY* curr; 533 LIST_ENTRY* curr;
534 UINT32 nextGpadlHandle; 534 u32 nextGpadlHandle;
535 535
536 DPRINT_ENTER(VMBUS); 536 DPRINT_ENTER(VMBUS);
537 537
@@ -619,7 +619,7 @@ Description:
619int 619int
620VmbusChannelTeardownGpadl( 620VmbusChannelTeardownGpadl(
621 VMBUS_CHANNEL *Channel, 621 VMBUS_CHANNEL *Channel,
622 UINT32 GpadlHandle 622 u32 GpadlHandle
623 ) 623 )
624{ 624{
625 int ret=0; 625 int ret=0;
@@ -753,16 +753,16 @@ int
753VmbusChannelSendPacket( 753VmbusChannelSendPacket(
754 VMBUS_CHANNEL *Channel, 754 VMBUS_CHANNEL *Channel,
755 const void * Buffer, 755 const void * Buffer,
756 UINT32 BufferLen, 756 u32 BufferLen,
757 UINT64 RequestId, 757 UINT64 RequestId,
758 VMBUS_PACKET_TYPE Type, 758 VMBUS_PACKET_TYPE Type,
759 UINT32 Flags 759 u32 Flags
760) 760)
761{ 761{
762 int ret=0; 762 int ret=0;
763 VMPACKET_DESCRIPTOR desc; 763 VMPACKET_DESCRIPTOR desc;
764 UINT32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen; 764 u32 packetLen = sizeof(VMPACKET_DESCRIPTOR) + BufferLen;
765 UINT32 packetLenAligned = ALIGN_UP(packetLen, sizeof(UINT64)); 765 u32 packetLenAligned = ALIGN_UP(packetLen, sizeof(UINT64));
766 SG_BUFFER_LIST bufferList[3]; 766 SG_BUFFER_LIST bufferList[3];
767 UINT64 alignedData=0; 767 UINT64 alignedData=0;
768 768
@@ -819,18 +819,18 @@ int
819VmbusChannelSendPacketPageBuffer( 819VmbusChannelSendPacketPageBuffer(
820 VMBUS_CHANNEL *Channel, 820 VMBUS_CHANNEL *Channel,
821 PAGE_BUFFER PageBuffers[], 821 PAGE_BUFFER PageBuffers[],
822 UINT32 PageCount, 822 u32 PageCount,
823 void * Buffer, 823 void * Buffer,
824 UINT32 BufferLen, 824 u32 BufferLen,
825 UINT64 RequestId 825 UINT64 RequestId
826) 826)
827{ 827{
828 int ret=0; 828 int ret=0;
829 int i=0; 829 int i=0;
830 VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc; 830 VMBUS_CHANNEL_PACKET_PAGE_BUFFER desc;
831 UINT32 descSize; 831 u32 descSize;
832 UINT32 packetLen; 832 u32 packetLen;
833 UINT32 packetLenAligned; 833 u32 packetLenAligned;
834 SG_BUFFER_LIST bufferList[3]; 834 SG_BUFFER_LIST bufferList[3];
835 UINT64 alignedData=0; 835 UINT64 alignedData=0;
836 836
@@ -903,18 +903,18 @@ VmbusChannelSendPacketMultiPageBuffer(
903 VMBUS_CHANNEL *Channel, 903 VMBUS_CHANNEL *Channel,
904 MULTIPAGE_BUFFER *MultiPageBuffer, 904 MULTIPAGE_BUFFER *MultiPageBuffer,
905 void * Buffer, 905 void * Buffer,
906 UINT32 BufferLen, 906 u32 BufferLen,
907 UINT64 RequestId 907 UINT64 RequestId
908) 908)
909{ 909{
910 int ret=0; 910 int ret=0;
911 VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc; 911 VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER desc;
912 UINT32 descSize; 912 u32 descSize;
913 UINT32 packetLen; 913 u32 packetLen;
914 UINT32 packetLenAligned; 914 u32 packetLenAligned;
915 SG_BUFFER_LIST bufferList[3]; 915 SG_BUFFER_LIST bufferList[3];
916 UINT64 alignedData=0; 916 UINT64 alignedData=0;
917 UINT32 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);
920 920
@@ -985,14 +985,14 @@ int
985VmbusChannelRecvPacket( 985VmbusChannelRecvPacket(
986 VMBUS_CHANNEL *Channel, 986 VMBUS_CHANNEL *Channel,
987 void * Buffer, 987 void * Buffer,
988 UINT32 BufferLen, 988 u32 BufferLen,
989 UINT32* BufferActualLen, 989 u32* BufferActualLen,
990 UINT64* RequestId 990 UINT64* RequestId
991 ) 991 )
992{ 992{
993 VMPACKET_DESCRIPTOR desc; 993 VMPACKET_DESCRIPTOR desc;
994 UINT32 packetLen; 994 u32 packetLen;
995 UINT32 userLen; 995 u32 userLen;
996 int ret; 996 int ret;
997 997
998 DPRINT_ENTER(VMBUS); 998 DPRINT_ENTER(VMBUS);
@@ -1062,14 +1062,14 @@ int
1062VmbusChannelRecvPacketRaw( 1062VmbusChannelRecvPacketRaw(
1063 VMBUS_CHANNEL *Channel, 1063 VMBUS_CHANNEL *Channel,
1064 void * Buffer, 1064 void * Buffer,
1065 UINT32 BufferLen, 1065 u32 BufferLen,
1066 UINT32* BufferActualLen, 1066 u32* BufferActualLen,
1067 UINT64* RequestId 1067 UINT64* RequestId
1068 ) 1068 )
1069{ 1069{
1070 VMPACKET_DESCRIPTOR desc; 1070 VMPACKET_DESCRIPTOR desc;
1071 UINT32 packetLen; 1071 u32 packetLen;
1072 UINT32 userLen; 1072 u32 userLen;
1073 int ret; 1073 int ret;
1074 1074
1075 DPRINT_ENTER(VMBUS); 1075 DPRINT_ENTER(VMBUS);
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 1461f49162c..fb17d0c0a7a 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -38,8 +38,8 @@ typedef struct _VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
38 u16 Length8; 38 u16 Length8;
39 u16 Flags; 39 u16 Flags;
40 UINT64 TransactionId; 40 UINT64 TransactionId;
41 UINT32 Reserved; 41 u32 Reserved;
42 UINT32 RangeCount; 42 u32 RangeCount;
43 PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT]; 43 PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT];
44} VMBUS_CHANNEL_PACKET_PAGE_BUFFER; 44} VMBUS_CHANNEL_PACKET_PAGE_BUFFER;
45 45
@@ -51,8 +51,8 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
51 u16 Length8; 51 u16 Length8;
52 u16 Flags; 52 u16 Flags;
53 UINT64 TransactionId; 53 UINT64 TransactionId;
54 UINT32 Reserved; 54 u32 Reserved;
55 UINT32 RangeCount; // Always 1 in this case 55 u32 RangeCount; // Always 1 in this case
56 MULTIPAGE_BUFFER Range; 56 MULTIPAGE_BUFFER Range;
57} VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER; 57} VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER;
58 58
@@ -65,10 +65,10 @@ typedef struct _VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
65static int 65static int
66VmbusChannelOpen( 66VmbusChannelOpen(
67 VMBUS_CHANNEL *Channel, 67 VMBUS_CHANNEL *Channel,
68 UINT32 SendRingBufferSize, 68 u32 SendRingBufferSize,
69 UINT32 RecvRingBufferSize, 69 u32 RecvRingBufferSize,
70 void * UserData, 70 void * UserData,
71 UINT32 UserDataLen, 71 u32 UserDataLen,
72 PFN_CHANNEL_CALLBACK pfnOnChannelCallback, 72 PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
73 void * Context 73 void * Context
74 ); 74 );
@@ -82,19 +82,19 @@ static int
82VmbusChannelSendPacket( 82VmbusChannelSendPacket(
83 VMBUS_CHANNEL *Channel, 83 VMBUS_CHANNEL *Channel,
84 const void * Buffer, 84 const void * Buffer,
85 UINT32 BufferLen, 85 u32 BufferLen,
86 UINT64 RequestId, 86 UINT64 RequestId,
87 VMBUS_PACKET_TYPE Type, 87 VMBUS_PACKET_TYPE Type,
88 UINT32 Flags 88 u32 Flags
89); 89);
90 90
91static int 91static int
92VmbusChannelSendPacketPageBuffer( 92VmbusChannelSendPacketPageBuffer(
93 VMBUS_CHANNEL *Channel, 93 VMBUS_CHANNEL *Channel,
94 PAGE_BUFFER PageBuffers[], 94 PAGE_BUFFER PageBuffers[],
95 UINT32 PageCount, 95 u32 PageCount,
96 void * Buffer, 96 void * Buffer,
97 UINT32 BufferLen, 97 u32 BufferLen,
98 UINT64 RequestId 98 UINT64 RequestId
99 ); 99 );
100 100
@@ -103,7 +103,7 @@ VmbusChannelSendPacketMultiPageBuffer(
103 VMBUS_CHANNEL *Channel, 103 VMBUS_CHANNEL *Channel,
104 MULTIPAGE_BUFFER *MultiPageBuffer, 104 MULTIPAGE_BUFFER *MultiPageBuffer,
105 void * Buffer, 105 void * Buffer,
106 UINT32 BufferLen, 106 u32 BufferLen,
107 UINT64 RequestId 107 UINT64 RequestId
108); 108);
109 109
@@ -111,22 +111,22 @@ static int
111VmbusChannelEstablishGpadl( 111VmbusChannelEstablishGpadl(
112 VMBUS_CHANNEL *Channel, 112 VMBUS_CHANNEL *Channel,
113 void * Kbuffer, // from kmalloc() 113 void * Kbuffer, // from kmalloc()
114 UINT32 Size, // page-size multiple 114 u32 Size, // page-size multiple
115 UINT32 *GpadlHandle 115 u32 *GpadlHandle
116 ); 116 );
117 117
118static int 118static int
119VmbusChannelTeardownGpadl( 119VmbusChannelTeardownGpadl(
120 VMBUS_CHANNEL *Channel, 120 VMBUS_CHANNEL *Channel,
121 UINT32 GpadlHandle 121 u32 GpadlHandle
122 ); 122 );
123 123
124static int 124static int
125VmbusChannelRecvPacket( 125VmbusChannelRecvPacket(
126 VMBUS_CHANNEL *Channel, 126 VMBUS_CHANNEL *Channel,
127 void * Buffer, 127 void * Buffer,
128 UINT32 BufferLen, 128 u32 BufferLen,
129 UINT32* BufferActualLen, 129 u32* BufferActualLen,
130 UINT64* RequestId 130 UINT64* RequestId
131 ); 131 );
132 132
@@ -134,8 +134,8 @@ static int
134VmbusChannelRecvPacketRaw( 134VmbusChannelRecvPacketRaw(
135 VMBUS_CHANNEL *Channel, 135 VMBUS_CHANNEL *Channel,
136 void * Buffer, 136 void * Buffer,
137 UINT32 BufferLen, 137 u32 BufferLen,
138 UINT32* BufferActualLen, 138 u32* BufferActualLen,
139 UINT64* RequestId 139 UINT64* RequestId
140 ); 140 );
141 141
diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c
index 61f83340635..57602f704e8 100644
--- a/drivers/staging/hv/ChannelInterface.c
+++ b/drivers/staging/hv/ChannelInterface.c
@@ -26,10 +26,10 @@
26static int 26static int
27IVmbusChannelOpen( 27IVmbusChannelOpen(
28 PDEVICE_OBJECT Device, 28 PDEVICE_OBJECT Device,
29 UINT32 SendBufferSize, 29 u32 SendBufferSize,
30 UINT32 RecvRingBufferSize, 30 u32 RecvRingBufferSize,
31 void * UserData, 31 void * UserData,
32 UINT32 UserDataLen, 32 u32 UserDataLen,
33 VMBUS_CHANNEL_CALLBACK ChannelCallback, 33 VMBUS_CHANNEL_CALLBACK ChannelCallback,
34 void * Context 34 void * Context
35 ) 35 )
@@ -57,10 +57,10 @@ static int
57IVmbusChannelSendPacket( 57IVmbusChannelSendPacket(
58 PDEVICE_OBJECT Device, 58 PDEVICE_OBJECT Device,
59 const void * Buffer, 59 const void * Buffer,
60 UINT32 BufferLen, 60 u32 BufferLen,
61 UINT64 RequestId, 61 UINT64 RequestId,
62 UINT32 Type, 62 u32 Type,
63 UINT32 Flags 63 u32 Flags
64 ) 64 )
65{ 65{
66 return VmbusChannelSendPacket((VMBUS_CHANNEL*)Device->context, 66 return VmbusChannelSendPacket((VMBUS_CHANNEL*)Device->context,
@@ -75,9 +75,9 @@ static int
75IVmbusChannelSendPacketPageBuffer( 75IVmbusChannelSendPacketPageBuffer(
76 PDEVICE_OBJECT Device, 76 PDEVICE_OBJECT Device,
77 PAGE_BUFFER PageBuffers[], 77 PAGE_BUFFER PageBuffers[],
78 UINT32 PageCount, 78 u32 PageCount,
79 void * Buffer, 79 void * Buffer,
80 UINT32 BufferLen, 80 u32 BufferLen,
81 UINT64 RequestId 81 UINT64 RequestId
82 ) 82 )
83{ 83{
@@ -94,7 +94,7 @@ IVmbusChannelSendPacketMultiPageBuffer(
94 PDEVICE_OBJECT Device, 94 PDEVICE_OBJECT Device,
95 MULTIPAGE_BUFFER *MultiPageBuffer, 95 MULTIPAGE_BUFFER *MultiPageBuffer,
96 void * Buffer, 96 void * Buffer,
97 UINT32 BufferLen, 97 u32 BufferLen,
98 UINT64 RequestId 98 UINT64 RequestId
99 ) 99 )
100{ 100{
@@ -109,8 +109,8 @@ static int
109IVmbusChannelRecvPacket ( 109IVmbusChannelRecvPacket (
110 PDEVICE_OBJECT Device, 110 PDEVICE_OBJECT Device,
111 void * Buffer, 111 void * Buffer,
112 UINT32 BufferLen, 112 u32 BufferLen,
113 UINT32* BufferActualLen, 113 u32* BufferActualLen,
114 UINT64* RequestId 114 UINT64* RequestId
115 ) 115 )
116{ 116{
@@ -125,8 +125,8 @@ static int
125IVmbusChannelRecvPacketRaw( 125IVmbusChannelRecvPacketRaw(
126 PDEVICE_OBJECT Device, 126 PDEVICE_OBJECT Device,
127 void * Buffer, 127 void * Buffer,
128 UINT32 BufferLen, 128 u32 BufferLen,
129 UINT32* BufferActualLen, 129 u32* BufferActualLen,
130 UINT64* RequestId 130 UINT64* RequestId
131 ) 131 )
132{ 132{
@@ -141,8 +141,8 @@ static int
141IVmbusChannelEstablishGpadl( 141IVmbusChannelEstablishGpadl(
142 PDEVICE_OBJECT Device, 142 PDEVICE_OBJECT Device,
143 void * Buffer, 143 void * Buffer,
144 UINT32 BufferLen, 144 u32 BufferLen,
145 UINT32* GpadlHandle 145 u32* GpadlHandle
146 ) 146 )
147{ 147{
148 return VmbusChannelEstablishGpadl((VMBUS_CHANNEL*)Device->context, 148 return VmbusChannelEstablishGpadl((VMBUS_CHANNEL*)Device->context,
@@ -154,7 +154,7 @@ IVmbusChannelEstablishGpadl(
154static int 154static int
155IVmbusChannelTeardownGpadl( 155IVmbusChannelTeardownGpadl(
156 PDEVICE_OBJECT Device, 156 PDEVICE_OBJECT Device,
157 UINT32 GpadlHandle 157 u32 GpadlHandle
158 ) 158 )
159{ 159{
160 return VmbusChannelTeardownGpadl((VMBUS_CHANNEL*)Device->context, 160 return VmbusChannelTeardownGpadl((VMBUS_CHANNEL*)Device->context,
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h
index 06308a45dd7..b1ea2fc280c 100644
--- a/drivers/staging/hv/ChannelMgmt.h
+++ b/drivers/staging/hv/ChannelMgmt.h
@@ -56,11 +56,11 @@ typedef struct _VMBUS_CHANNEL {
56 u8 MonitorGroup; 56 u8 MonitorGroup;
57 u8 MonitorBit; 57 u8 MonitorBit;
58 58
59 UINT32 RingBufferGpadlHandle; 59 u32 RingBufferGpadlHandle;
60 60
61 // Allocated memory for ring buffer 61 // Allocated memory for ring buffer
62 void * RingBufferPages; 62 void * RingBufferPages;
63 UINT32 RingBufferPageCount; 63 u32 RingBufferPageCount;
64 RING_BUFFER_INFO Outbound; // send to parent 64 RING_BUFFER_INFO Outbound; // send to parent
65 RING_BUFFER_INFO Inbound; // receive from parent 65 RING_BUFFER_INFO Inbound; // receive from parent
66 HANDLE InboundLock; 66 HANDLE InboundLock;
@@ -76,17 +76,17 @@ typedef struct _VMBUS_CHANNEL {
76 76
77 77
78typedef struct _VMBUS_CHANNEL_DEBUG_INFO { 78typedef struct _VMBUS_CHANNEL_DEBUG_INFO {
79 UINT32 RelId; 79 u32 RelId;
80 VMBUS_CHANNEL_STATE State; 80 VMBUS_CHANNEL_STATE State;
81 GUID InterfaceType; 81 GUID InterfaceType;
82 GUID InterfaceInstance; 82 GUID InterfaceInstance;
83 UINT32 MonitorId; 83 u32 MonitorId;
84 UINT32 ServerMonitorPending; 84 u32 ServerMonitorPending;
85 UINT32 ServerMonitorLatency; 85 u32 ServerMonitorLatency;
86 UINT32 ServerMonitorConnectionId; 86 u32 ServerMonitorConnectionId;
87 UINT32 ClientMonitorPending; 87 u32 ClientMonitorPending;
88 UINT32 ClientMonitorLatency; 88 u32 ClientMonitorLatency;
89 UINT32 ClientMonitorConnectionId; 89 u32 ClientMonitorConnectionId;
90 90
91 RING_BUFFER_DEBUG_INFO Inbound; 91 RING_BUFFER_DEBUG_INFO Inbound;
92 RING_BUFFER_DEBUG_INFO Outbound; 92 RING_BUFFER_DEBUG_INFO Outbound;
@@ -117,7 +117,7 @@ typedef struct _VMBUS_CHANNEL_MSGINFO {
117 117
118 VMBUS_CHANNEL_MESSAGE_RESPONSE Response; 118 VMBUS_CHANNEL_MESSAGE_RESPONSE Response;
119 119
120 UINT32 MessageSize; 120 u32 MessageSize;
121 // The channel message that goes out on the "wire". 121 // The channel message that goes out on the "wire".
122 // It will contain at minimum the VMBUS_CHANNEL_MESSAGE_HEADER header 122 // It will contain at minimum the VMBUS_CHANNEL_MESSAGE_HEADER header
123 unsigned char Msg[0]; 123 unsigned char Msg[0];
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c
index f3e1360564b..0e9f0d71925 100644
--- a/drivers/staging/hv/Connection.c
+++ b/drivers/staging/hv/Connection.c
@@ -253,7 +253,7 @@ Description:
253--*/ 253--*/
254VMBUS_CHANNEL* 254VMBUS_CHANNEL*
255GetChannelFromRelId( 255GetChannelFromRelId(
256 UINT32 relId 256 u32 relId
257 ) 257 )
258{ 258{
259 VMBUS_CHANNEL* channel; 259 VMBUS_CHANNEL* channel;
@@ -294,7 +294,7 @@ VmbusProcessChannelEvent(
294 ) 294 )
295{ 295{
296 VMBUS_CHANNEL* channel; 296 VMBUS_CHANNEL* channel;
297 UINT32 relId = (UINT32)(ULONG_PTR)context; 297 u32 relId = (u32)(ULONG_PTR)context;
298 298
299 ASSERT(relId > 0); 299 ASSERT(relId > 0);
300 300
@@ -333,7 +333,7 @@ VmbusOnEvents(
333 int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5; 333 int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5;
334 int bit; 334 int bit;
335 int relid; 335 int relid;
336 UINT32* recvInterruptPage = gVmbusConnection.RecvInterruptPage; 336 u32* recvInterruptPage = gVmbusConnection.RecvInterruptPage;
337 //VMBUS_CHANNEL_MESSAGE* receiveMsg; 337 //VMBUS_CHANNEL_MESSAGE* receiveMsg;
338 338
339 DPRINT_ENTER(VMBUS); 339 DPRINT_ENTER(VMBUS);
@@ -393,7 +393,7 @@ VmbusPostMessage(
393 HV_CONNECTION_ID connId; 393 HV_CONNECTION_ID connId;
394 394
395 395
396 connId.AsUINT32 =0; 396 connId.Asu32 =0;
397 connId.u.Id = VMBUS_MESSAGE_CONNECTION_ID; 397 connId.u.Id = VMBUS_MESSAGE_CONNECTION_ID;
398 ret = HvPostMessage( 398 ret = HvPostMessage(
399 connId, 399 connId,
@@ -414,14 +414,14 @@ Description:
414 414
415--*/ 415--*/
416int 416int
417VmbusSetEvent(UINT32 childRelId) 417VmbusSetEvent(u32 childRelId)
418{ 418{
419 int ret=0; 419 int ret=0;
420 420
421 DPRINT_ENTER(VMBUS); 421 DPRINT_ENTER(VMBUS);
422 422
423 // Each UINT32 represents 32 channels 423 // Each u32 represents 32 channels
424 BitSet((UINT32*)gVmbusConnection.SendInterruptPage + (childRelId >> 5), childRelId & 31); 424 BitSet((u32*)gVmbusConnection.SendInterruptPage + (childRelId >> 5), childRelId & 31);
425 ret = HvSignalEvent(); 425 ret = HvSignalEvent();
426 426
427 DPRINT_EXIT(VMBUS); 427 DPRINT_EXIT(VMBUS);
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c
index 3a37c12a59a..20686d574a4 100644
--- a/drivers/staging/hv/Hv.c
+++ b/drivers/staging/hv/Hv.c
@@ -188,16 +188,16 @@ HvDoHypercall (
188 188
189#else 189#else
190 190
191 UINT32 controlHi = Control >> 32; 191 u32 controlHi = Control >> 32;
192 UINT32 controlLo = Control & 0xFFFFFFFF; 192 u32 controlLo = Control & 0xFFFFFFFF;
193 UINT32 hvStatusHi = 1; 193 u32 hvStatusHi = 1;
194 UINT32 hvStatusLo = 1; 194 u32 hvStatusLo = 1;
195 UINT64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0; 195 UINT64 inputAddress = (Input) ? GetPhysicalAddress(Input) : 0;
196 UINT32 inputAddressHi = inputAddress >> 32; 196 u32 inputAddressHi = inputAddress >> 32;
197 UINT32 inputAddressLo = inputAddress & 0xFFFFFFFF; 197 u32 inputAddressLo = inputAddress & 0xFFFFFFFF;
198 UINT64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0; 198 UINT64 outputAddress = (Output) ?GetPhysicalAddress(Output) : 0;
199 UINT32 outputAddressHi = outputAddress >> 32; 199 u32 outputAddressHi = outputAddress >> 32;
200 UINT32 outputAddressLo = outputAddress & 0xFFFFFFFF; 200 u32 outputAddressLo = outputAddress & 0xFFFFFFFF;
201 volatile void* hypercallPage = gHvContext.HypercallPage; 201 volatile void* hypercallPage = gHvContext.HypercallPage;
202 202
203 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>", 203 DPRINT_DBG(VMBUS, "Hypercall <control %llx input %p output %p>",
@@ -312,7 +312,7 @@ HvInit (
312 } 312 }
313 313
314 gHvContext.SignalEventParam = (PHV_INPUT_SIGNAL_EVENT)(ALIGN_UP((ULONG_PTR)gHvContext.SignalEventBuffer, HV_HYPERCALL_PARAM_ALIGN)); 314 gHvContext.SignalEventParam = (PHV_INPUT_SIGNAL_EVENT)(ALIGN_UP((ULONG_PTR)gHvContext.SignalEventBuffer, HV_HYPERCALL_PARAM_ALIGN));
315 gHvContext.SignalEventParam->ConnectionId.AsUINT32 = 0; 315 gHvContext.SignalEventParam->ConnectionId.Asu32 = 0;
316 gHvContext.SignalEventParam->ConnectionId.u.Id = VMBUS_EVENT_CONNECTION_ID; 316 gHvContext.SignalEventParam->ConnectionId.u.Id = VMBUS_EVENT_CONNECTION_ID;
317 gHvContext.SignalEventParam->FlagNumber = 0; 317 gHvContext.SignalEventParam->FlagNumber = 0;
318 gHvContext.SignalEventParam->RsvdZ = 0; 318 gHvContext.SignalEventParam->RsvdZ = 0;
@@ -471,7 +471,7 @@ Description:
471--*/ 471--*/
472int 472int
473HvSynicInit ( 473HvSynicInit (
474 UINT32 irqVector 474 u32 irqVector
475 ) 475 )
476{ 476{
477 UINT64 version; 477 UINT64 version;
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index b75ad5df23f..f5cbad9f20b 100644
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -173,7 +173,7 @@ HvSignalEvent(
173 173
174static int 174static int
175HvSynicInit( 175HvSynicInit(
176 UINT32 irqVector 176 u32 irqVector
177 ); 177 );
178 178
179static void 179static void
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c
index 11b78f4cf75..958ce603e65 100644
--- a/drivers/staging/hv/NetVsc.c
+++ b/drivers/staging/hv/NetVsc.c
@@ -1402,7 +1402,7 @@ NetVscOnChannelCallback(
1402 DEVICE_OBJECT *device=(DEVICE_OBJECT*)Context; 1402 DEVICE_OBJECT *device=(DEVICE_OBJECT*)Context;
1403 NETVSC_DEVICE *netDevice; 1403 NETVSC_DEVICE *netDevice;
1404 1404
1405 UINT32 bytesRecvd; 1405 u32 bytesRecvd;
1406 UINT64 requestId; 1406 UINT64 requestId;
1407 UCHAR packet[netPacketSize]; 1407 UCHAR packet[netPacketSize];
1408 VMPACKET_DESCRIPTOR *desc; 1408 VMPACKET_DESCRIPTOR *desc;
diff --git a/drivers/staging/hv/NetVsc.h b/drivers/staging/hv/NetVsc.h
index 2371b85c268..f19497a3e1d 100644
--- a/drivers/staging/hv/NetVsc.h
+++ b/drivers/staging/hv/NetVsc.h
@@ -66,15 +66,15 @@ typedef struct _NETVSC_DEVICE {
66 66
67 // Send buffer allocated by us but manages by NetVSP 67 // Send buffer allocated by us but manages by NetVSP
68 void * SendBuffer; 68 void * SendBuffer;
69 UINT32 SendBufferSize; 69 u32 SendBufferSize;
70 UINT32 SendBufferGpadlHandle; 70 u32 SendBufferGpadlHandle;
71 UINT32 SendSectionSize; 71 u32 SendSectionSize;
72 72
73 // Receive buffer allocated by us but manages by NetVSP 73 // Receive buffer allocated by us but manages by NetVSP
74 void * ReceiveBuffer; 74 void * ReceiveBuffer;
75 UINT32 ReceiveBufferSize; 75 u32 ReceiveBufferSize;
76 UINT32 ReceiveBufferGpadlHandle; 76 u32 ReceiveBufferGpadlHandle;
77 UINT32 ReceiveSectionCount; 77 u32 ReceiveSectionCount;
78 PNVSP_1_RECEIVE_BUFFER_SECTION ReceiveSections; 78 PNVSP_1_RECEIVE_BUFFER_SECTION ReceiveSections;
79 79
80 // Used for NetVSP initialization protocol 80 // Used for NetVSP initialization protocol
diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c
index a8df47e13eb..4a05f7d7d2d 100644
--- a/drivers/staging/hv/RingBuffer.c
+++ b/drivers/staging/hv/RingBuffer.c
@@ -44,9 +44,9 @@ Description:
44 44
45--*/ 45--*/
46static inline void 46static inline void
47GetRingBufferAvailBytes(RING_BUFFER_INFO *rbi, UINT32 *read, UINT32 *write) 47GetRingBufferAvailBytes(RING_BUFFER_INFO *rbi, u32 *read, u32 *write)
48{ 48{
49 UINT32 read_loc,write_loc; 49 u32 read_loc,write_loc;
50 50
51 // Capture the read/write indices before they changed 51 // Capture the read/write indices before they changed
52 read_loc = rbi->RingBuffer->ReadIndex; 52 read_loc = rbi->RingBuffer->ReadIndex;
@@ -65,10 +65,10 @@ Description:
65 Get the next write location for the specified ring buffer 65 Get the next write location for the specified ring buffer
66 66
67--*/ 67--*/
68static inline UINT32 68static inline u32
69GetNextWriteLocation(RING_BUFFER_INFO* RingInfo) 69GetNextWriteLocation(RING_BUFFER_INFO* RingInfo)
70{ 70{
71 UINT32 next = RingInfo->RingBuffer->WriteIndex; 71 u32 next = RingInfo->RingBuffer->WriteIndex;
72 72
73 ASSERT(next < RingInfo->RingDataSize); 73 ASSERT(next < RingInfo->RingDataSize);
74 74
@@ -85,7 +85,7 @@ Description:
85 85
86--*/ 86--*/
87static inline void 87static inline void
88SetNextWriteLocation(RING_BUFFER_INFO* RingInfo, UINT32 NextWriteLocation) 88SetNextWriteLocation(RING_BUFFER_INFO* RingInfo, u32 NextWriteLocation)
89{ 89{
90 RingInfo->RingBuffer->WriteIndex = NextWriteLocation; 90 RingInfo->RingBuffer->WriteIndex = NextWriteLocation;
91} 91}
@@ -99,10 +99,10 @@ Description:
99 Get the next read location for the specified ring buffer 99 Get the next read location for the specified ring buffer
100 100
101--*/ 101--*/
102static inline UINT32 102static inline u32
103GetNextReadLocation(RING_BUFFER_INFO* RingInfo) 103GetNextReadLocation(RING_BUFFER_INFO* RingInfo)
104{ 104{
105 UINT32 next = RingInfo->RingBuffer->ReadIndex; 105 u32 next = RingInfo->RingBuffer->ReadIndex;
106 106
107 ASSERT(next < RingInfo->RingDataSize); 107 ASSERT(next < RingInfo->RingDataSize);
108 108
@@ -119,10 +119,10 @@ Description:
119 This allows the caller to skip 119 This allows the caller to skip
120 120
121--*/ 121--*/
122static inline UINT32 122static inline u32
123GetNextReadLocationWithOffset(RING_BUFFER_INFO* RingInfo, UINT32 Offset) 123GetNextReadLocationWithOffset(RING_BUFFER_INFO* RingInfo, u32 Offset)
124{ 124{
125 UINT32 next = RingInfo->RingBuffer->ReadIndex; 125 u32 next = RingInfo->RingBuffer->ReadIndex;
126 126
127 ASSERT(next < RingInfo->RingDataSize); 127 ASSERT(next < RingInfo->RingDataSize);
128 next += Offset; 128 next += Offset;
@@ -141,7 +141,7 @@ Description:
141 141
142--*/ 142--*/
143static inline void 143static inline void
144SetNextReadLocation(RING_BUFFER_INFO* RingInfo, UINT32 NextReadLocation) 144SetNextReadLocation(RING_BUFFER_INFO* RingInfo, u32 NextReadLocation)
145{ 145{
146 RingInfo->RingBuffer->ReadIndex = NextReadLocation; 146 RingInfo->RingBuffer->ReadIndex = NextReadLocation;
147} 147}
@@ -172,7 +172,7 @@ Description:
172 Get the size of the ring buffer 172 Get the size of the ring buffer
173 173
174--*/ 174--*/
175static inline UINT32 175static inline u32
176GetRingBufferSize(RING_BUFFER_INFO* RingInfo) 176GetRingBufferSize(RING_BUFFER_INFO* RingInfo)
177{ 177{
178 return RingInfo->RingDataSize; 178 return RingInfo->RingDataSize;
@@ -206,8 +206,8 @@ Description:
206void 206void
207DumpRingInfo(RING_BUFFER_INFO* RingInfo, char *Prefix) 207DumpRingInfo(RING_BUFFER_INFO* RingInfo, char *Prefix)
208{ 208{
209 UINT32 bytesAvailToWrite; 209 u32 bytesAvailToWrite;
210 UINT32 bytesAvailToRead; 210 u32 bytesAvailToRead;
211 211
212 GetRingBufferAvailBytes(RingInfo, &bytesAvailToRead, &bytesAvailToWrite); 212 GetRingBufferAvailBytes(RingInfo, &bytesAvailToRead, &bytesAvailToWrite);
213 213
@@ -224,19 +224,19 @@ DumpRingInfo(RING_BUFFER_INFO* RingInfo, char *Prefix)
224// 224//
225// Internal routines 225// Internal routines
226// 226//
227static UINT32 227static u32
228CopyToRingBuffer( 228CopyToRingBuffer(
229 RING_BUFFER_INFO *RingInfo, 229 RING_BUFFER_INFO *RingInfo,
230 UINT32 StartWriteOffset, 230 u32 StartWriteOffset,
231 void * Src, 231 void * Src,
232 UINT32 SrcLen); 232 u32 SrcLen);
233 233
234static UINT32 234static u32
235CopyFromRingBuffer( 235CopyFromRingBuffer(
236 RING_BUFFER_INFO *RingInfo, 236 RING_BUFFER_INFO *RingInfo,
237 void * Dest, 237 void * Dest,
238 UINT32 DestLen, 238 u32 DestLen,
239 UINT32 StartReadOffset); 239 u32 StartReadOffset);
240 240
241 241
242 242
@@ -255,8 +255,8 @@ RingBufferGetDebugInfo(
255 RING_BUFFER_DEBUG_INFO *DebugInfo 255 RING_BUFFER_DEBUG_INFO *DebugInfo
256 ) 256 )
257{ 257{
258 UINT32 bytesAvailToWrite; 258 u32 bytesAvailToWrite;
259 UINT32 bytesAvailToRead; 259 u32 bytesAvailToRead;
260 260
261 if (RingInfo->RingBuffer) 261 if (RingInfo->RingBuffer)
262 { 262 {
@@ -281,7 +281,7 @@ Description:
281 Get the interrupt mask for the specified ring buffer 281 Get the interrupt mask for the specified ring buffer
282 282
283--*/ 283--*/
284UINT32 284u32
285GetRingBufferInterruptMask( 285GetRingBufferInterruptMask(
286 RING_BUFFER_INFO *rbi 286 RING_BUFFER_INFO *rbi
287 ) 287 )
@@ -302,7 +302,7 @@ int
302RingBufferInit( 302RingBufferInit(
303 RING_BUFFER_INFO *RingInfo, 303 RING_BUFFER_INFO *RingInfo,
304 void *Buffer, 304 void *Buffer,
305 UINT32 BufferLen 305 u32 BufferLen
306 ) 306 )
307{ 307{
308 ASSERT(sizeof(RING_BUFFER) == PAGE_SIZE); 308 ASSERT(sizeof(RING_BUFFER) == PAGE_SIZE);
@@ -350,15 +350,15 @@ int
350RingBufferWrite( 350RingBufferWrite(
351 RING_BUFFER_INFO* OutRingInfo, 351 RING_BUFFER_INFO* OutRingInfo,
352 SG_BUFFER_LIST SgBuffers[], 352 SG_BUFFER_LIST SgBuffers[],
353 UINT32 SgBufferCount 353 u32 SgBufferCount
354 ) 354 )
355{ 355{
356 int i=0; 356 int i=0;
357 UINT32 byteAvailToWrite; 357 u32 byteAvailToWrite;
358 UINT32 byteAvailToRead; 358 u32 byteAvailToRead;
359 UINT32 totalBytesToWrite=0; 359 u32 totalBytesToWrite=0;
360 360
361 volatile UINT32 nextWriteLocation; 361 volatile u32 nextWriteLocation;
362 UINT64 prevIndices=0; 362 UINT64 prevIndices=0;
363 363
364 DPRINT_ENTER(VMBUS); 364 DPRINT_ENTER(VMBUS);
@@ -439,12 +439,12 @@ int
439RingBufferPeek( 439RingBufferPeek(
440 RING_BUFFER_INFO* InRingInfo, 440 RING_BUFFER_INFO* InRingInfo,
441 void* Buffer, 441 void* Buffer,
442 UINT32 BufferLen 442 u32 BufferLen
443 ) 443 )
444{ 444{
445 UINT32 bytesAvailToWrite; 445 u32 bytesAvailToWrite;
446 UINT32 bytesAvailToRead; 446 u32 bytesAvailToRead;
447 UINT32 nextReadLocation=0; 447 u32 nextReadLocation=0;
448 448
449 SpinlockAcquire(InRingInfo->RingLock); 449 SpinlockAcquire(InRingInfo->RingLock);
450 450
@@ -487,13 +487,13 @@ int
487RingBufferRead( 487RingBufferRead(
488 RING_BUFFER_INFO* InRingInfo, 488 RING_BUFFER_INFO* InRingInfo,
489 void * Buffer, 489 void * Buffer,
490 UINT32 BufferLen, 490 u32 BufferLen,
491 UINT32 Offset 491 u32 Offset
492 ) 492 )
493{ 493{
494 UINT32 bytesAvailToWrite; 494 u32 bytesAvailToWrite;
495 UINT32 bytesAvailToRead; 495 u32 bytesAvailToRead;
496 UINT32 nextReadLocation=0; 496 u32 nextReadLocation=0;
497 UINT64 prevIndices=0; 497 UINT64 prevIndices=0;
498 498
499 ASSERT(BufferLen > 0); 499 ASSERT(BufferLen > 0);
@@ -553,16 +553,16 @@ Description:
553 Assume there is enough room. Handles wrap-around in dest case only!! 553 Assume there is enough room. Handles wrap-around in dest case only!!
554 554
555--*/ 555--*/
556UINT32 556u32
557CopyToRingBuffer( 557CopyToRingBuffer(
558 RING_BUFFER_INFO *RingInfo, 558 RING_BUFFER_INFO *RingInfo,
559 UINT32 StartWriteOffset, 559 u32 StartWriteOffset,
560 void * Src, 560 void * Src,
561 UINT32 SrcLen) 561 u32 SrcLen)
562{ 562{
563 void * ringBuffer=GetRingBuffer(RingInfo); 563 void * ringBuffer=GetRingBuffer(RingInfo);
564 UINT32 ringBufferSize=GetRingBufferSize(RingInfo); 564 u32 ringBufferSize=GetRingBufferSize(RingInfo);
565 UINT32 fragLen; 565 u32 fragLen;
566 566
567 if (SrcLen > ringBufferSize - StartWriteOffset) // wrap-around detected! 567 if (SrcLen > ringBufferSize - StartWriteOffset) // wrap-around detected!
568 { 568 {
@@ -594,17 +594,17 @@ Description:
594 Assume there is enough room. Handles wrap-around in src case only!! 594 Assume there is enough room. Handles wrap-around in src case only!!
595 595
596--*/ 596--*/
597UINT32 597u32
598CopyFromRingBuffer( 598CopyFromRingBuffer(
599 RING_BUFFER_INFO *RingInfo, 599 RING_BUFFER_INFO *RingInfo,
600 void * Dest, 600 void * Dest,
601 UINT32 DestLen, 601 u32 DestLen,
602 UINT32 StartReadOffset) 602 u32 StartReadOffset)
603{ 603{
604 void * ringBuffer=GetRingBuffer(RingInfo); 604 void * ringBuffer=GetRingBuffer(RingInfo);
605 UINT32 ringBufferSize=GetRingBufferSize(RingInfo); 605 u32 ringBufferSize=GetRingBufferSize(RingInfo);
606 606
607 UINT32 fragLen; 607 u32 fragLen;
608 608
609 if (DestLen > ringBufferSize - StartReadOffset) // wrap-around detected at the src 609 if (DestLen > ringBufferSize - StartReadOffset) // wrap-around detected at the src
610 { 610 {
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h
index a190b3a6d30..c5ecf41a00e 100644
--- a/drivers/staging/hv/RingBuffer.h
+++ b/drivers/staging/hv/RingBuffer.h
@@ -29,39 +29,39 @@
29 29
30typedef struct _SG_BUFFER_LIST { 30typedef struct _SG_BUFFER_LIST {
31 void * Data; 31 void * Data;
32 UINT32 Length; 32 u32 Length;
33} SG_BUFFER_LIST; 33} SG_BUFFER_LIST;
34 34
35typedef struct _RING_BUFFER { 35typedef struct _RING_BUFFER {
36 volatile UINT32 WriteIndex; // Offset in bytes from the start of ring data below 36 volatile u32 WriteIndex; // Offset in bytes from the start of ring data below
37 volatile UINT32 ReadIndex; // Offset in bytes from the start of ring data below 37 volatile u32 ReadIndex; // Offset in bytes from the start of ring data below
38 38
39 volatile UINT32 InterruptMask; 39 volatile u32 InterruptMask;
40 u8 Reserved[4084]; // Pad it to PAGE_SIZE so that data starts on page boundary 40 u8 Reserved[4084]; // Pad it to PAGE_SIZE so that data starts on page boundary
41 // NOTE: The InterruptMask field is used only for channels but since our vmbus connection 41 // NOTE: The InterruptMask field is used only for channels but since our vmbus connection
42 // also uses this data structure and its data starts here, we commented out this field. 42 // also uses this data structure and its data starts here, we commented out this field.
43 // volatile UINT32 InterruptMask; 43 // volatile u32 InterruptMask;
44 // Ring data starts here + RingDataStartOffset !!! DO NOT place any fields below this !!! 44 // Ring data starts here + RingDataStartOffset !!! DO NOT place any fields below this !!!
45 u8 Buffer[0]; 45 u8 Buffer[0];
46} STRUCT_PACKED RING_BUFFER; 46} STRUCT_PACKED RING_BUFFER;
47 47
48typedef struct _RING_BUFFER_INFO { 48typedef struct _RING_BUFFER_INFO {
49 RING_BUFFER* RingBuffer; 49 RING_BUFFER* RingBuffer;
50 UINT32 RingSize; // Include the shared header 50 u32 RingSize; // Include the shared header
51 HANDLE RingLock; 51 HANDLE RingLock;
52 52
53 UINT32 RingDataSize; // < ringSize 53 u32 RingDataSize; // < ringSize
54 UINT32 RingDataStartOffset; 54 u32 RingDataStartOffset;
55 55
56} RING_BUFFER_INFO; 56} RING_BUFFER_INFO;
57 57
58 58
59typedef struct _RING_BUFFER_DEBUG_INFO { 59typedef struct _RING_BUFFER_DEBUG_INFO {
60 UINT32 CurrentInterruptMask; 60 u32 CurrentInterruptMask;
61 UINT32 CurrentReadIndex; 61 u32 CurrentReadIndex;
62 UINT32 CurrentWriteIndex; 62 u32 CurrentWriteIndex;
63 UINT32 BytesAvailToRead; 63 u32 BytesAvailToRead;
64 UINT32 BytesAvailToWrite; 64 u32 BytesAvailToWrite;
65}RING_BUFFER_DEBUG_INFO; 65}RING_BUFFER_DEBUG_INFO;
66 66
67 67
@@ -73,7 +73,7 @@ static int
73RingBufferInit( 73RingBufferInit(
74 RING_BUFFER_INFO *RingInfo, 74 RING_BUFFER_INFO *RingInfo,
75 void * Buffer, 75 void * Buffer,
76 UINT32 BufferLen 76 u32 BufferLen
77 ); 77 );
78 78
79static void 79static void
@@ -85,25 +85,25 @@ static int
85RingBufferWrite( 85RingBufferWrite(
86 RING_BUFFER_INFO *RingInfo, 86 RING_BUFFER_INFO *RingInfo,
87 SG_BUFFER_LIST SgBuffers[], 87 SG_BUFFER_LIST SgBuffers[],
88 UINT32 SgBufferCount 88 u32 SgBufferCount
89 ); 89 );
90 90
91static int 91static int
92RingBufferPeek( 92RingBufferPeek(
93 RING_BUFFER_INFO *RingInfo, 93 RING_BUFFER_INFO *RingInfo,
94 void * Buffer, 94 void * Buffer,
95 UINT32 BufferLen 95 u32 BufferLen
96 ); 96 );
97 97
98static int 98static int
99RingBufferRead( 99RingBufferRead(
100 RING_BUFFER_INFO *RingInfo, 100 RING_BUFFER_INFO *RingInfo,
101 void * Buffer, 101 void * Buffer,
102 UINT32 BufferLen, 102 u32 BufferLen,
103 UINT32 Offset 103 u32 Offset
104 ); 104 );
105 105
106static UINT32 106static u32
107GetRingBufferInterruptMask( 107GetRingBufferInterruptMask(
108 RING_BUFFER_INFO *RingInfo 108 RING_BUFFER_INFO *RingInfo
109 ); 109 );
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c
index 6d9ca8d46e5..ee56e0a621b 100644
--- a/drivers/staging/hv/RndisFilter.c
+++ b/drivers/staging/hv/RndisFilter.c
@@ -50,8 +50,8 @@ typedef struct _RNDIS_DEVICE {
50 NETVSC_DEVICE *NetDevice; 50 NETVSC_DEVICE *NetDevice;
51 51
52 RNDIS_DEVICE_STATE State; 52 RNDIS_DEVICE_STATE State;
53 UINT32 LinkStatus; 53 u32 LinkStatus;
54 UINT32 NewRequestId; 54 u32 NewRequestId;
55 55
56 HANDLE RequestLock; 56 HANDLE RequestLock;
57 LIST_ENTRY RequestList; 57 LIST_ENTRY RequestList;
@@ -120,9 +120,9 @@ RndisFilterOnReceive(
120static int 120static int
121RndisFilterQueryDevice( 121RndisFilterQueryDevice(
122 RNDIS_DEVICE *Device, 122 RNDIS_DEVICE *Device,
123 UINT32 Oid, 123 u32 Oid,
124 void *Result, 124 void *Result,
125 UINT32 *ResultSize 125 u32 *ResultSize
126 ); 126 );
127 127
128static inline int 128static inline int
@@ -138,7 +138,7 @@ RndisFilterQueryDeviceLinkStatus(
138static int 138static int
139RndisFilterSetPacketFilter( 139RndisFilterSetPacketFilter(
140 RNDIS_DEVICE *Device, 140 RNDIS_DEVICE *Device,
141 UINT32 NewFilter 141 u32 NewFilter
142 ); 142 );
143 143
144static int 144static int
@@ -235,7 +235,7 @@ static inline void PutRndisDevice(RNDIS_DEVICE *Device)
235 MemFree(Device); 235 MemFree(Device);
236} 236}
237 237
238static inline RNDIS_REQUEST* GetRndisRequest(RNDIS_DEVICE *Device, UINT32 MessageType, UINT32 MessageLength) 238static inline RNDIS_REQUEST* GetRndisRequest(RNDIS_DEVICE *Device, u32 MessageType, u32 MessageLength)
239{ 239{
240 RNDIS_REQUEST *request; 240 RNDIS_REQUEST *request;
241 RNDIS_MESSAGE *rndisMessage; 241 RNDIS_MESSAGE *rndisMessage;
@@ -465,7 +465,7 @@ RndisFilterReceiveData(
465 ) 465 )
466{ 466{
467 RNDIS_PACKET *rndisPacket; 467 RNDIS_PACKET *rndisPacket;
468 UINT32 dataOffset; 468 u32 dataOffset;
469 469
470 DPRINT_ENTER(NETVSC); 470 DPRINT_ENTER(NETVSC);
471 471
@@ -585,13 +585,13 @@ RndisFilterOnReceive(
585static int 585static int
586RndisFilterQueryDevice( 586RndisFilterQueryDevice(
587 RNDIS_DEVICE *Device, 587 RNDIS_DEVICE *Device,
588 UINT32 Oid, 588 u32 Oid,
589 void *Result, 589 void *Result,
590 UINT32 *ResultSize 590 u32 *ResultSize
591 ) 591 )
592{ 592{
593 RNDIS_REQUEST *request; 593 RNDIS_REQUEST *request;
594 UINT32 inresultSize = *ResultSize; 594 u32 inresultSize = *ResultSize;
595 RNDIS_QUERY_REQUEST *query; 595 RNDIS_QUERY_REQUEST *query;
596 RNDIS_QUERY_COMPLETE *queryComplete; 596 RNDIS_QUERY_COMPLETE *queryComplete;
597 int ret=0; 597 int ret=0;
@@ -653,7 +653,7 @@ RndisFilterQueryDeviceMac(
653 RNDIS_DEVICE *Device 653 RNDIS_DEVICE *Device
654 ) 654 )
655{ 655{
656 UINT32 size=HW_MACADDR_LEN; 656 u32 size=HW_MACADDR_LEN;
657 657
658 return RndisFilterQueryDevice(Device, 658 return RndisFilterQueryDevice(Device,
659 RNDIS_OID_802_3_PERMANENT_ADDRESS, 659 RNDIS_OID_802_3_PERMANENT_ADDRESS,
@@ -666,7 +666,7 @@ RndisFilterQueryDeviceLinkStatus(
666 RNDIS_DEVICE *Device 666 RNDIS_DEVICE *Device
667 ) 667 )
668{ 668{
669 UINT32 size=sizeof(UINT32); 669 u32 size=sizeof(u32);
670 670
671 return RndisFilterQueryDevice(Device, 671 return RndisFilterQueryDevice(Device,
672 RNDIS_OID_GEN_MEDIA_CONNECT_STATUS, 672 RNDIS_OID_GEN_MEDIA_CONNECT_STATUS,
@@ -677,20 +677,20 @@ RndisFilterQueryDeviceLinkStatus(
677static int 677static int
678RndisFilterSetPacketFilter( 678RndisFilterSetPacketFilter(
679 RNDIS_DEVICE *Device, 679 RNDIS_DEVICE *Device,
680 UINT32 NewFilter 680 u32 NewFilter
681 ) 681 )
682{ 682{
683 RNDIS_REQUEST *request; 683 RNDIS_REQUEST *request;
684 RNDIS_SET_REQUEST *set; 684 RNDIS_SET_REQUEST *set;
685 RNDIS_SET_COMPLETE *setComplete; 685 RNDIS_SET_COMPLETE *setComplete;
686 UINT32 status; 686 u32 status;
687 int ret; 687 int ret;
688 688
689 DPRINT_ENTER(NETVSC); 689 DPRINT_ENTER(NETVSC);
690 690
691 ASSERT(RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(UINT32) <= sizeof(RNDIS_MESSAGE)); 691 ASSERT(RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(u32) <= sizeof(RNDIS_MESSAGE));
692 692
693 request = GetRndisRequest(Device, REMOTE_NDIS_SET_MSG, RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(UINT32)); 693 request = GetRndisRequest(Device, REMOTE_NDIS_SET_MSG, RNDIS_MESSAGE_SIZE(RNDIS_SET_REQUEST) + sizeof(u32));
694 if (!request) 694 if (!request)
695 { 695 {
696 ret = -1; 696 ret = -1;
@@ -700,10 +700,10 @@ RndisFilterSetPacketFilter(
700 // Setup the rndis set 700 // Setup the rndis set
701 set = &request->RequestMessage.Message.SetRequest; 701 set = &request->RequestMessage.Message.SetRequest;
702 set->Oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER; 702 set->Oid = RNDIS_OID_GEN_CURRENT_PACKET_FILTER;
703 set->InformationBufferLength = sizeof(UINT32); 703 set->InformationBufferLength = sizeof(u32);
704 set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST); 704 set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST);
705 705
706 memcpy((void*)(ULONG_PTR)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(UINT32)); 706 memcpy((void*)(ULONG_PTR)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(u32));
707 707
708 ret = RndisFilterSendRequest(Device, request); 708 ret = RndisFilterSendRequest(Device, request);
709 if (ret != 0) 709 if (ret != 0)
@@ -795,7 +795,7 @@ RndisFilterInitDevice(
795 RNDIS_REQUEST *request; 795 RNDIS_REQUEST *request;
796 RNDIS_INITIALIZE_REQUEST *init; 796 RNDIS_INITIALIZE_REQUEST *init;
797 RNDIS_INITIALIZE_COMPLETE *initComplete; 797 RNDIS_INITIALIZE_COMPLETE *initComplete;
798 UINT32 status; 798 u32 status;
799 int ret; 799 int ret;
800 800
801 DPRINT_ENTER(NETVSC); 801 DPRINT_ENTER(NETVSC);
@@ -1091,7 +1091,7 @@ RndisFilterOnSend(
1091 RNDIS_FILTER_PACKET *filterPacket; 1091 RNDIS_FILTER_PACKET *filterPacket;
1092 RNDIS_MESSAGE *rndisMessage; 1092 RNDIS_MESSAGE *rndisMessage;
1093 RNDIS_PACKET *rndisPacket; 1093 RNDIS_PACKET *rndisPacket;
1094 UINT32 rndisMessageSize; 1094 u32 rndisMessageSize;
1095 1095
1096 DPRINT_ENTER(NETVSC); 1096 DPRINT_ENTER(NETVSC);
1097 1097
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c
index 7750d3224e7..2b388d1bc9f 100644
--- a/drivers/staging/hv/StorVsc.c
+++ b/drivers/staging/hv/StorVsc.c
@@ -908,7 +908,7 @@ StorVscOnChannelCallback(
908 int ret=0; 908 int ret=0;
909 DEVICE_OBJECT *device = (DEVICE_OBJECT*)Context; 909 DEVICE_OBJECT *device = (DEVICE_OBJECT*)Context;
910 STORVSC_DEVICE *storDevice; 910 STORVSC_DEVICE *storDevice;
911 UINT32 bytesRecvd; 911 u32 bytesRecvd;
912 UINT64 requestId; 912 UINT64 requestId;
913 UCHAR packet[ALIGN_UP(sizeof(VSTOR_PACKET),8)]; 913 UCHAR packet[ALIGN_UP(sizeof(VSTOR_PACKET),8)];
914 STORVSC_REQUEST_EXTENSION *request; 914 STORVSC_REQUEST_EXTENSION *request;
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c
index 8bfec126e0a..3803915622b 100644
--- a/drivers/staging/hv/Vmbus.c
+++ b/drivers/staging/hv/Vmbus.c
@@ -307,7 +307,7 @@ VmbusOnDeviceAdd(
307 void *AdditionalInfo 307 void *AdditionalInfo
308 ) 308 )
309{ 309{
310 UINT32 *irqvector = (UINT32*) AdditionalInfo; 310 u32 *irqvector = (u32*) AdditionalInfo;
311 int ret=0; 311 int ret=0;
312 312
313 DPRINT_ENTER(VMBUS); 313 DPRINT_ENTER(VMBUS);
diff --git a/drivers/staging/hv/VmbusPrivate.h b/drivers/staging/hv/VmbusPrivate.h
index 1e54b2463f9..383ab320608 100644
--- a/drivers/staging/hv/VmbusPrivate.h
+++ b/drivers/staging/hv/VmbusPrivate.h
@@ -64,7 +64,7 @@ typedef struct _VMBUS_CONNECTION {
64 64
65 VMBUS_CONNECT_STATE ConnectState; 65 VMBUS_CONNECT_STATE ConnectState;
66 66
67 UINT32 NextGpadlHandle; 67 u32 NextGpadlHandle;
68 68
69 // Represents channel interrupts. Each bit position 69 // Represents channel interrupts. Each bit position
70 // represents a channel. 70 // represents a channel.
@@ -130,7 +130,7 @@ VmbusChildDeviceRemove(
130 130
131static VMBUS_CHANNEL* 131static VMBUS_CHANNEL*
132GetChannelFromRelId( 132GetChannelFromRelId(
133 UINT32 relId 133 u32 relId
134 ); 134 );
135 135
136// 136//
@@ -154,7 +154,7 @@ VmbusPostMessage(
154 154
155static int 155static int
156VmbusSetEvent( 156VmbusSetEvent(
157 UINT32 childRelId 157 u32 childRelId
158 ); 158 );
159 159
160static void 160static void
diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h
index 0f52e711699..5ec22f80bfb 100644
--- a/drivers/staging/hv/include/ChannelMessages.h
+++ b/drivers/staging/hv/include/ChannelMessages.h
@@ -27,7 +27,7 @@
27#include "VmbusPacketFormat.h" 27#include "VmbusPacketFormat.h"
28 28
29#define C_ASSERT(x) 29#define C_ASSERT(x)
30typedef UINT32 NTSTATUS; 30typedef u32 NTSTATUS;
31 31
32#pragma pack(push,1) 32#pragma pack(push,1)
33 33
@@ -68,14 +68,14 @@ typedef enum _VMBUS_CHANNEL_MESSAGE_TYPE
68typedef struct _VMBUS_CHANNEL_MESSAGE_HEADER 68typedef struct _VMBUS_CHANNEL_MESSAGE_HEADER
69{ 69{
70 VMBUS_CHANNEL_MESSAGE_TYPE MessageType; 70 VMBUS_CHANNEL_MESSAGE_TYPE MessageType;
71 UINT32 Padding; 71 u32 Padding;
72} VMBUS_CHANNEL_MESSAGE_HEADER, *PVMBUS_CHANNEL_MESSAGE_HEADER; 72} VMBUS_CHANNEL_MESSAGE_HEADER, *PVMBUS_CHANNEL_MESSAGE_HEADER;
73 73
74// Query VMBus Version parameters 74// Query VMBus Version parameters
75typedef struct _VMBUS_CHANNEL_QUERY_VMBUS_VERSION 75typedef struct _VMBUS_CHANNEL_QUERY_VMBUS_VERSION
76{ 76{
77 VMBUS_CHANNEL_MESSAGE_HEADER Header; 77 VMBUS_CHANNEL_MESSAGE_HEADER Header;
78 UINT32 Version; 78 u32 Version;
79} VMBUS_CHANNEL_QUERY_VMBUS_VERSION, *PVMBUS_CHANNEL_QUERY_VMBUS_VERSION; 79} VMBUS_CHANNEL_QUERY_VMBUS_VERSION, *PVMBUS_CHANNEL_QUERY_VMBUS_VERSION;
80 80
81// VMBus Version Supported parameters 81// VMBus Version Supported parameters
@@ -90,7 +90,7 @@ typedef struct _VMBUS_CHANNEL_OFFER_CHANNEL
90{ 90{
91 VMBUS_CHANNEL_MESSAGE_HEADER Header; 91 VMBUS_CHANNEL_MESSAGE_HEADER Header;
92 VMBUS_CHANNEL_OFFER Offer; 92 VMBUS_CHANNEL_OFFER Offer;
93 UINT32 ChildRelId; 93 u32 ChildRelId;
94 u8 MonitorId; 94 u8 MonitorId;
95 BOOLEAN MonitorAllocated; 95 BOOLEAN MonitorAllocated;
96} VMBUS_CHANNEL_OFFER_CHANNEL, *PVMBUS_CHANNEL_OFFER_CHANNEL; 96} VMBUS_CHANNEL_OFFER_CHANNEL, *PVMBUS_CHANNEL_OFFER_CHANNEL;
@@ -104,7 +104,7 @@ C_ASSERT(sizeof(VMBUS_CHANNEL_OFFER_CHANNEL) <= MAXIMUM_SYNIC_MESSAGE_BYTES);
104typedef struct _VMBUS_CHANNEL_RESCIND_OFFER 104typedef struct _VMBUS_CHANNEL_RESCIND_OFFER
105{ 105{
106 VMBUS_CHANNEL_MESSAGE_HEADER Header; 106 VMBUS_CHANNEL_MESSAGE_HEADER Header;
107 UINT32 ChildRelId; 107 u32 ChildRelId;
108} VMBUS_CHANNEL_RESCIND_OFFER, *PVMBUS_CHANNEL_RESCIND_OFFER; 108} VMBUS_CHANNEL_RESCIND_OFFER, *PVMBUS_CHANNEL_RESCIND_OFFER;
109 109
110// Request Offer -- no parameters, SynIC message contains the partition ID 110// Request Offer -- no parameters, SynIC message contains the partition ID
@@ -121,12 +121,12 @@ typedef struct _VMBUS_CHANNEL_OPEN_CHANNEL
121 // 121 //
122 // Identifies the specific VMBus channel that is being opened. 122 // Identifies the specific VMBus channel that is being opened.
123 // 123 //
124 UINT32 ChildRelId; 124 u32 ChildRelId;
125 125
126 // 126 //
127 // ID making a particular open request at a channel offer unique. 127 // ID making a particular open request at a channel offer unique.
128 // 128 //
129 UINT32 OpenId; 129 u32 OpenId;
130 130
131 // 131 //
132 // GPADL for the channel's ring buffer. 132 // GPADL for the channel's ring buffer.
@@ -143,7 +143,7 @@ typedef struct _VMBUS_CHANNEL_OPEN_CHANNEL
143 // by RingBufferGpadlHandle. The downstream ring buffer follows it at this 143 // by RingBufferGpadlHandle. The downstream ring buffer follows it at this
144 // offset (in pages). 144 // offset (in pages).
145 // 145 //
146 UINT32 DownstreamRingBufferPageOffset; 146 u32 DownstreamRingBufferPageOffset;
147 147
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.
@@ -159,8 +159,8 @@ typedef VMBUS_CHANNEL_OPEN_CHANNEL VMBUS_CHANNEL_REOPEN_CHANNEL, *PVMBUS_CHANNEL
159typedef struct _VMBUS_CHANNEL_OPEN_RESULT 159typedef struct _VMBUS_CHANNEL_OPEN_RESULT
160{ 160{
161 VMBUS_CHANNEL_MESSAGE_HEADER Header; 161 VMBUS_CHANNEL_MESSAGE_HEADER Header;
162 UINT32 ChildRelId; 162 u32 ChildRelId;
163 UINT32 OpenId; 163 u32 OpenId;
164 NTSTATUS Status; 164 NTSTATUS Status;
165} VMBUS_CHANNEL_OPEN_RESULT, *PVMBUS_CHANNEL_OPEN_RESULT; 165} VMBUS_CHANNEL_OPEN_RESULT, *PVMBUS_CHANNEL_OPEN_RESULT;
166 166
@@ -168,7 +168,7 @@ typedef struct _VMBUS_CHANNEL_OPEN_RESULT
168typedef struct _VMBUS_CHANNEL_CLOSE_CHANNEL 168typedef struct _VMBUS_CHANNEL_CLOSE_CHANNEL
169{ 169{
170 VMBUS_CHANNEL_MESSAGE_HEADER Header; 170 VMBUS_CHANNEL_MESSAGE_HEADER Header;
171 UINT32 ChildRelId; 171 u32 ChildRelId;
172} VMBUS_CHANNEL_CLOSE_CHANNEL, *PVMBUS_CHANNEL_CLOSE_CHANNEL; 172} VMBUS_CHANNEL_CLOSE_CHANNEL, *PVMBUS_CHANNEL_CLOSE_CHANNEL;
173 173
174// Channel Message GPADL 174// Channel Message GPADL
@@ -186,8 +186,8 @@ typedef struct _VMBUS_CHANNEL_CLOSE_CHANNEL
186typedef struct _VMBUS_CHANNEL_GPADL_HEADER 186typedef struct _VMBUS_CHANNEL_GPADL_HEADER
187{ 187{
188 VMBUS_CHANNEL_MESSAGE_HEADER Header; 188 VMBUS_CHANNEL_MESSAGE_HEADER Header;
189 UINT32 ChildRelId; 189 u32 ChildRelId;
190 UINT32 Gpadl; 190 u32 Gpadl;
191 u16 RangeBufLen; 191 u16 RangeBufLen;
192 u16 RangeCount; 192 u16 RangeCount;
193 GPA_RANGE Range[0]; 193 GPA_RANGE Range[0];
@@ -201,8 +201,8 @@ typedef struct _VMBUS_CHANNEL_GPADL_HEADER
201typedef struct _VMBUS_CHANNEL_GPADL_BODY 201typedef struct _VMBUS_CHANNEL_GPADL_BODY
202{ 202{
203 VMBUS_CHANNEL_MESSAGE_HEADER Header; 203 VMBUS_CHANNEL_MESSAGE_HEADER Header;
204 UINT32 MessageNumber; 204 u32 MessageNumber;
205 UINT32 Gpadl; 205 u32 Gpadl;
206 UINT64 Pfn[0]; 206 UINT64 Pfn[0];
207} VMBUS_CHANNEL_GPADL_BODY, *PVMBUS_CHANNEL_GPADL_BODY; 207} VMBUS_CHANNEL_GPADL_BODY, *PVMBUS_CHANNEL_GPADL_BODY;
208 208
@@ -210,22 +210,22 @@ typedef struct _VMBUS_CHANNEL_GPADL_BODY
210typedef struct _VMBUS_CHANNEL_GPADL_CREATED 210typedef struct _VMBUS_CHANNEL_GPADL_CREATED
211{ 211{
212 VMBUS_CHANNEL_MESSAGE_HEADER Header; 212 VMBUS_CHANNEL_MESSAGE_HEADER Header;
213 UINT32 ChildRelId; 213 u32 ChildRelId;
214 UINT32 Gpadl; 214 u32 Gpadl;
215 UINT32 CreationStatus; 215 u32 CreationStatus;
216} VMBUS_CHANNEL_GPADL_CREATED, *PVMBUS_CHANNEL_GPADL_CREATED; 216} VMBUS_CHANNEL_GPADL_CREATED, *PVMBUS_CHANNEL_GPADL_CREATED;
217 217
218typedef struct _VMBUS_CHANNEL_GPADL_TEARDOWN 218typedef struct _VMBUS_CHANNEL_GPADL_TEARDOWN
219{ 219{
220 VMBUS_CHANNEL_MESSAGE_HEADER Header; 220 VMBUS_CHANNEL_MESSAGE_HEADER Header;
221 UINT32 ChildRelId; 221 u32 ChildRelId;
222 UINT32 Gpadl; 222 u32 Gpadl;
223} VMBUS_CHANNEL_GPADL_TEARDOWN, *PVMBUS_CHANNEL_GPADL_TEARDOWN; 223} VMBUS_CHANNEL_GPADL_TEARDOWN, *PVMBUS_CHANNEL_GPADL_TEARDOWN;
224 224
225typedef struct _VMBUS_CHANNEL_GPADL_TORNDOWN 225typedef struct _VMBUS_CHANNEL_GPADL_TORNDOWN
226{ 226{
227 VMBUS_CHANNEL_MESSAGE_HEADER Header; 227 VMBUS_CHANNEL_MESSAGE_HEADER Header;
228 UINT32 Gpadl; 228 u32 Gpadl;
229} VMBUS_CHANNEL_GPADL_TORNDOWN, *PVMBUS_CHANNEL_GPADL_TORNDOWN; 229} VMBUS_CHANNEL_GPADL_TORNDOWN, *PVMBUS_CHANNEL_GPADL_TORNDOWN;
230 230
231#ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD 231#ifdef VMBUS_FEATURE_PARENT_OR_PEER_MEMORY_MAPPED_INTO_A_CHILD
@@ -234,28 +234,28 @@ typedef struct _VMBUS_CHANNEL_VIEW_RANGE_ADD
234 VMBUS_CHANNEL_MESSAGE_HEADER Header; 234 VMBUS_CHANNEL_MESSAGE_HEADER Header;
235 PHYSICAL_ADDRESS ViewRangeBase; 235 PHYSICAL_ADDRESS ViewRangeBase;
236 UINT64 ViewRangeLength; 236 UINT64 ViewRangeLength;
237 UINT32 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
240typedef struct _VMBUS_CHANNEL_VIEW_RANGE_REMOVE 240typedef struct _VMBUS_CHANNEL_VIEW_RANGE_REMOVE
241{ 241{
242 VMBUS_CHANNEL_MESSAGE_HEADER Header; 242 VMBUS_CHANNEL_MESSAGE_HEADER Header;
243 PHYSICAL_ADDRESS ViewRangeBase; 243 PHYSICAL_ADDRESS ViewRangeBase;
244 UINT32 ChildRelId; 244 u32 ChildRelId;
245} VMBUS_CHANNEL_VIEW_RANGE_REMOVE, *PVMBUS_CHANNEL_VIEW_RANGE_REMOVE; 245} VMBUS_CHANNEL_VIEW_RANGE_REMOVE, *PVMBUS_CHANNEL_VIEW_RANGE_REMOVE;
246#endif 246#endif
247 247
248typedef struct _VMBUS_CHANNEL_RELID_RELEASED 248typedef struct _VMBUS_CHANNEL_RELID_RELEASED
249{ 249{
250 VMBUS_CHANNEL_MESSAGE_HEADER Header; 250 VMBUS_CHANNEL_MESSAGE_HEADER Header;
251 UINT32 ChildRelId; 251 u32 ChildRelId;
252} VMBUS_CHANNEL_RELID_RELEASED, *PVMBUS_CHANNEL_RELID_RELEASED; 252} VMBUS_CHANNEL_RELID_RELEASED, *PVMBUS_CHANNEL_RELID_RELEASED;
253 253
254typedef struct _VMBUS_CHANNEL_INITIATE_CONTACT 254typedef struct _VMBUS_CHANNEL_INITIATE_CONTACT
255{ 255{
256 VMBUS_CHANNEL_MESSAGE_HEADER Header; 256 VMBUS_CHANNEL_MESSAGE_HEADER Header;
257 UINT32 VMBusVersionRequested; 257 u32 VMBusVersionRequested;
258 UINT32 Padding2; 258 u32 Padding2;
259 UINT64 InterruptPage; 259 UINT64 InterruptPage;
260 UINT64 MonitorPage1; 260 UINT64 MonitorPage1;
261 UINT64 MonitorPage2; 261 UINT64 MonitorPage2;
diff --git a/drivers/staging/hv/include/HvHcApi.h b/drivers/staging/hv/include/HvHcApi.h
index 170cefaeeb7..d88a93292e2 100644
--- a/drivers/staging/hv/include/HvHcApi.h
+++ b/drivers/staging/hv/include/HvHcApi.h
@@ -41,9 +41,9 @@ typedef enum _HV_CALL_CODE
41typedef struct _HV_INPUT_POST_MESSAGE 41typedef struct _HV_INPUT_POST_MESSAGE
42{ 42{
43 HV_CONNECTION_ID ConnectionId; 43 HV_CONNECTION_ID ConnectionId;
44 UINT32 Reserved; 44 u32 Reserved;
45 HV_MESSAGE_TYPE MessageType; 45 HV_MESSAGE_TYPE MessageType;
46 UINT32 PayloadSize; 46 u32 PayloadSize;
47 UINT64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT]; 47 UINT64 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
diff --git a/drivers/staging/hv/include/HvSynicApi.h b/drivers/staging/hv/include/HvSynicApi.h
index f0682a391da..753b0272811 100644
--- a/drivers/staging/hv/include/HvSynicApi.h
+++ b/drivers/staging/hv/include/HvSynicApi.h
@@ -84,7 +84,7 @@
84 84
85#define HV_EVENT_FLAGS_COUNT (256 * 8) 85#define HV_EVENT_FLAGS_COUNT (256 * 8)
86#define HV_EVENT_FLAGS_BYTE_COUNT (256) 86#define HV_EVENT_FLAGS_BYTE_COUNT (256)
87#define HV_EVENT_FLAGS_DWORD_COUNT (256 / sizeof(UINT32)) 87#define HV_EVENT_FLAGS_DWORD_COUNT (256 / sizeof(u32))
88 88
89// 89//
90// Define hypervisor message types. 90// Define hypervisor message types.
@@ -139,7 +139,7 @@ typedef enum _HV_MESSAGE_TYPE
139// Define the synthetic interrupt source index type. 139// Define the synthetic interrupt source index type.
140// 140//
141 141
142typedef UINT32 HV_SYNIC_SINT_INDEX, *PHV_SYNIC_SINT_INDEX; 142typedef u32 HV_SYNIC_SINT_INDEX, *PHV_SYNIC_SINT_INDEX;
143 143
144// 144//
145// Define partition identifier type. 145// Define partition identifier type.
@@ -158,12 +158,12 @@ typedef UINT64 HV_PARTITION_ID, *PHV_PARTITION_ID;
158 158
159typedef union _HV_CONNECTION_ID 159typedef union _HV_CONNECTION_ID
160{ 160{
161 UINT32 AsUINT32; 161 u32 Asu32;
162 162
163 struct 163 struct
164 { 164 {
165 UINT32 Id:24; 165 u32 Id:24;
166 UINT32 Reserved:8; 166 u32 Reserved:8;
167 } u; 167 } u;
168 168
169} HV_CONNECTION_ID, *PHV_CONNECTION_ID; 169} HV_CONNECTION_ID, *PHV_CONNECTION_ID;
@@ -174,12 +174,12 @@ typedef union _HV_CONNECTION_ID
174 174
175typedef union _HV_PORT_ID 175typedef union _HV_PORT_ID
176{ 176{
177 UINT32 AsUINT32; 177 u32 Asu32;
178 178
179 struct 179 struct
180 { 180 {
181 UINT32 Id:24; 181 u32 Id:24;
182 UINT32 Reserved:8; 182 u32 Reserved:8;
183 } u ; 183 } u ;
184 184
185} HV_PORT_ID, *PHV_PORT_ID; 185} HV_PORT_ID, *PHV_PORT_ID;
@@ -202,7 +202,7 @@ typedef enum _HV_PORT_TYPE
202typedef struct _HV_PORT_INFO 202typedef struct _HV_PORT_INFO
203{ 203{
204 HV_PORT_TYPE PortType; 204 HV_PORT_TYPE PortType;
205 UINT32 Padding; 205 u32 Padding;
206 206
207 union 207 union
208 { 208 {
@@ -219,7 +219,7 @@ typedef struct _HV_PORT_INFO
219 HV_VP_INDEX TargetVp; 219 HV_VP_INDEX TargetVp;
220 u16 BaseFlagNumber; 220 u16 BaseFlagNumber;
221 u16 FlagCount; 221 u16 FlagCount;
222 UINT32 RsvdZ; 222 u32 RsvdZ;
223 } EventPortInfo; 223 } EventPortInfo;
224 224
225 struct 225 struct
@@ -235,7 +235,7 @@ typedef const HV_PORT_INFO *PCHV_PORT_INFO;
235typedef struct _HV_CONNECTION_INFO 235typedef struct _HV_CONNECTION_INFO
236{ 236{
237 HV_PORT_TYPE PortType; 237 HV_PORT_TYPE PortType;
238 UINT32 Padding; 238 u32 Padding;
239 239
240 union 240 union
241 { 241 {
@@ -296,8 +296,8 @@ typedef struct _HV_MESSAGE_HEADER
296// 296//
297typedef struct _HV_TIMER_MESSAGE_PAYLOAD 297typedef struct _HV_TIMER_MESSAGE_PAYLOAD
298{ 298{
299 UINT32 TimerIndex; 299 u32 TimerIndex;
300 UINT32 Reserved; 300 u32 Reserved;
301 HV_NANO100_TIME ExpirationTime; // When the timer expired 301 HV_NANO100_TIME ExpirationTime; // When the timer expired
302 HV_NANO100_TIME DeliveryTime; // When the message was delivered 302 HV_NANO100_TIME DeliveryTime; // When the message was delivered
303} HV_TIMER_MESSAGE_PAYLOAD, *PHV_TIMER_MESSAGE_PAYLOAD; 303} HV_TIMER_MESSAGE_PAYLOAD, *PHV_TIMER_MESSAGE_PAYLOAD;
@@ -338,7 +338,7 @@ typedef struct _HV_MESSAGE_PAGE
338typedef union _HV_SYNIC_EVENT_FLAGS 338typedef union _HV_SYNIC_EVENT_FLAGS
339{ 339{
340 u8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT]; 340 u8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT];
341 UINT32 Flags32[HV_EVENT_FLAGS_DWORD_COUNT]; 341 u32 Flags32[HV_EVENT_FLAGS_DWORD_COUNT];
342} HV_SYNIC_EVENT_FLAGS, *PHV_SYNIC_EVENT_FLAGS; 342} HV_SYNIC_EVENT_FLAGS, *PHV_SYNIC_EVENT_FLAGS;
343 343
344 344
@@ -422,8 +422,8 @@ typedef union _HV_MONITOR_TRIGGER_GROUP
422 422
423 struct 423 struct
424 { 424 {
425 UINT32 Pending; 425 u32 Pending;
426 UINT32 Armed; 426 u32 Armed;
427 }; 427 };
428 428
429} HV_MONITOR_TRIGGER_GROUP, *PHV_MONITOR_TRIGGER_GROUP; 429} HV_MONITOR_TRIGGER_GROUP, *PHV_MONITOR_TRIGGER_GROUP;
@@ -437,12 +437,12 @@ typedef struct _HV_MONITOR_PARAMETER
437 437
438typedef union _HV_MONITOR_TRIGGER_STATE 438typedef union _HV_MONITOR_TRIGGER_STATE
439{ 439{
440 UINT32 AsUINT32; 440 u32 Asu32;
441 441
442 struct 442 struct
443 { 443 {
444 UINT32 GroupEnable : 4; 444 u32 GroupEnable : 4;
445 UINT32 RsvdZ : 28; 445 u32 RsvdZ : 28;
446 }; 446 };
447 447
448} HV_MONITOR_TRIGGER_STATE, *PHV_MONITOR_TRIGGER_STATE; 448} HV_MONITOR_TRIGGER_STATE, *PHV_MONITOR_TRIGGER_STATE;
@@ -471,12 +471,12 @@ typedef union _HV_MONITOR_TRIGGER_STATE
471typedef struct _HV_MONITOR_PAGE 471typedef struct _HV_MONITOR_PAGE
472{ 472{
473 HV_MONITOR_TRIGGER_STATE TriggerState; 473 HV_MONITOR_TRIGGER_STATE TriggerState;
474 UINT32 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 UINT64 RsvdZ2[3];
478 478
479 INT32 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 UINT64 RsvdZ3[32];
diff --git a/drivers/staging/hv/include/HvVpApi.h b/drivers/staging/hv/include/HvVpApi.h
index 7e5128a0b2f..910a9e5983e 100644
--- a/drivers/staging/hv/include/HvVpApi.h
+++ b/drivers/staging/hv/include/HvVpApi.h
@@ -26,7 +26,7 @@
26// 26//
27// Virtual Processor Indices 27// Virtual Processor Indices
28// 28//
29typedef UINT32 HV_VP_INDEX, *PHV_VP_INDEX; 29typedef u32 HV_VP_INDEX, *PHV_VP_INDEX;
30 30
31// 31//
32// The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent 32// The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent
diff --git a/drivers/staging/hv/include/NetVscApi.h b/drivers/staging/hv/include/NetVscApi.h
index 8d7bddfdc9d..5ae8a3c097b 100644
--- a/drivers/staging/hv/include/NetVscApi.h
+++ b/drivers/staging/hv/include/NetVscApi.h
@@ -52,14 +52,14 @@ typedef int (*PFN_ON_SEND)(DEVICE_OBJECT *dev, PNETVSC_PACKET packet);
52typedef void (*PFN_ON_SENDRECVCOMPLETION)(void * Context); 52typedef void (*PFN_ON_SENDRECVCOMPLETION)(void * Context);
53 53
54typedef int (*PFN_ON_RECVCALLBACK)(DEVICE_OBJECT *dev, PNETVSC_PACKET packet); 54typedef int (*PFN_ON_RECVCALLBACK)(DEVICE_OBJECT *dev, PNETVSC_PACKET packet);
55typedef void (*PFN_ON_LINKSTATUS_CHANGED)(DEVICE_OBJECT *dev, UINT32 Status); 55typedef void (*PFN_ON_LINKSTATUS_CHANGED)(DEVICE_OBJECT *dev, u32 Status);
56 56
57// Represent the xfer page packet which contains 1 or more netvsc packet 57// Represent the xfer page packet which contains 1 or more netvsc packet
58typedef struct _XFERPAGE_PACKET { 58typedef struct _XFERPAGE_PACKET {
59 DLIST_ENTRY ListEntry; 59 DLIST_ENTRY ListEntry;
60 60
61 // # of netvsc packets this xfer packet contains 61 // # of netvsc packets this xfer packet contains
62 UINT32 Count; 62 u32 Count;
63} XFERPAGE_PACKET; 63} XFERPAGE_PACKET;
64 64
65 65
@@ -93,9 +93,9 @@ typedef struct _NETVSC_PACKET {
93 // This points to the memory after PageBuffers 93 // This points to the memory after PageBuffers
94 void * Extension; 94 void * Extension;
95 95
96 UINT32 TotalDataBufferLength; 96 u32 TotalDataBufferLength;
97 // Points to the send/receive buffer where the ethernet frame is 97 // Points to the send/receive buffer where the ethernet frame is
98 UINT32 PageBufferCount; 98 u32 PageBufferCount;
99 PAGE_BUFFER PageBuffers[NETVSC_PACKET_MAXPAGE]; 99 PAGE_BUFFER PageBuffers[NETVSC_PACKET_MAXPAGE];
100 100
101} NETVSC_PACKET; 101} NETVSC_PACKET;
@@ -105,11 +105,11 @@ typedef struct _NETVSC_PACKET {
105typedef struct _NETVSC_DRIVER_OBJECT { 105typedef struct _NETVSC_DRIVER_OBJECT {
106 DRIVER_OBJECT Base; // Must be the first field 106 DRIVER_OBJECT Base; // Must be the first field
107 107
108 UINT32 RingBufferSize; 108 u32 RingBufferSize;
109 UINT32 RequestExtSize; 109 u32 RequestExtSize;
110 110
111 // Additional num of page buffers to allocate 111 // Additional num of page buffers to allocate
112 UINT32 AdditionalRequestPageBufferCount; 112 u32 AdditionalRequestPageBufferCount;
113 113
114 // This is set by the caller to allow us to callback when we receive a packet 114 // This is set by the caller to allow us to callback when we receive a packet
115 // from the "wire" 115 // from the "wire"
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h
index 7c4dd15d7d1..bd6823e5122 100644
--- a/drivers/staging/hv/include/StorVscApi.h
+++ b/drivers/staging/hv/include/StorVscApi.h
@@ -71,17 +71,17 @@ typedef enum _STORVSC_REQUEST_TYPE{
71 71
72typedef struct _STORVSC_REQUEST { 72typedef struct _STORVSC_REQUEST {
73 STORVSC_REQUEST_TYPE Type; 73 STORVSC_REQUEST_TYPE Type;
74 UINT32 Host; 74 u32 Host;
75 UINT32 Bus; 75 u32 Bus;
76 UINT32 TargetId; 76 u32 TargetId;
77 UINT32 LunId; 77 u32 LunId;
78 u8 * Cdb; 78 u8 * Cdb;
79 UINT32 CdbLen; 79 u32 CdbLen;
80 UINT32 Status; 80 u32 Status;
81 UINT32 BytesXfer; 81 u32 BytesXfer;
82 82
83 UCHAR* SenseBuffer; 83 UCHAR* SenseBuffer;
84 UINT32 SenseBufferSize; 84 u32 SenseBufferSize;
85 85
86 void * Context; 86 void * Context;
87 87
@@ -99,13 +99,13 @@ typedef struct _STORVSC_DRIVER_OBJECT {
99 DRIVER_OBJECT Base; // Must be the first field 99 DRIVER_OBJECT Base; // Must be the first field
100 100
101 // Set by caller (in bytes) 101 // Set by caller (in bytes)
102 UINT32 RingBufferSize; 102 u32 RingBufferSize;
103 103
104 // Allocate this much private extension for each I/O request 104 // Allocate this much private extension for each I/O request
105 UINT32 RequestExtSize; 105 u32 RequestExtSize;
106 106
107 // Maximum # of requests in flight per channel/device 107 // Maximum # of requests in flight per channel/device
108 UINT32 MaxOutstandingRequestsPerChannel; 108 u32 MaxOutstandingRequestsPerChannel;
109 109
110 // Set by the caller to allow us to re-enumerate the bus on the host 110 // Set by the caller to allow us to re-enumerate the bus on the host
111 PFN_ON_HOST_RESCAN OnHostRescan; 111 PFN_ON_HOST_RESCAN OnHostRescan;
diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h
index adcfbdf2e30..ea7e36d9736 100644
--- a/drivers/staging/hv/include/VmbusApi.h
+++ b/drivers/staging/hv/include/VmbusApi.h
@@ -49,16 +49,16 @@ typedef struct _DEVICE_OBJECT *PDEVICE_OBJECT;
49 49
50// Single-page buffer 50// Single-page buffer
51typedef struct _PAGE_BUFFER { 51typedef struct _PAGE_BUFFER {
52 UINT32 Length; 52 u32 Length;
53 UINT32 Offset; 53 u32 Offset;
54 UINT64 Pfn; 54 UINT64 Pfn;
55} PAGE_BUFFER; 55} PAGE_BUFFER;
56 56
57// Multiple-page buffer 57// Multiple-page buffer
58typedef struct _MULTIPAGE_BUFFER { 58typedef 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 UINT32 Length; 60 u32 Length;
61 UINT32 Offset; 61 u32 Offset;
62 UINT64 PfnArray[MAX_MULTIPAGE_BUFFER_COUNT]; 62 UINT64 PfnArray[MAX_MULTIPAGE_BUFFER_COUNT];
63}MULTIPAGE_BUFFER; 63}MULTIPAGE_BUFFER;
64 64
@@ -92,10 +92,10 @@ typedef void (*VMBUS_CHANNEL_CALLBACK)(void * context);
92 92
93typedef int (*VMBUS_CHANNEL_OPEN)( 93typedef int (*VMBUS_CHANNEL_OPEN)(
94 PDEVICE_OBJECT Device, 94 PDEVICE_OBJECT Device,
95 UINT32 SendBufferSize, 95 u32 SendBufferSize,
96 UINT32 RecvRingBufferSize, 96 u32 RecvRingBufferSize,
97 void * UserData, 97 void * UserData,
98 UINT32 UserDataLen, 98 u32 UserDataLen,
99 VMBUS_CHANNEL_CALLBACK ChannelCallback, 99 VMBUS_CHANNEL_CALLBACK ChannelCallback,
100 void * Context 100 void * Context
101 ); 101 );
@@ -107,18 +107,18 @@ typedef void (*VMBUS_CHANNEL_CLOSE)(
107typedef int (*VMBUS_CHANNEL_SEND_PACKET)( 107typedef int (*VMBUS_CHANNEL_SEND_PACKET)(
108 PDEVICE_OBJECT Device, 108 PDEVICE_OBJECT Device,
109 const void * Buffer, 109 const void * Buffer,
110 UINT32 BufferLen, 110 u32 BufferLen,
111 UINT64 RequestId, 111 UINT64 RequestId,
112 UINT32 Type, 112 u32 Type,
113 UINT32 Flags 113 u32 Flags
114); 114);
115 115
116typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER)( 116typedef int (*VMBUS_CHANNEL_SEND_PACKET_PAGEBUFFER)(
117 PDEVICE_OBJECT Device, 117 PDEVICE_OBJECT Device,
118 PAGE_BUFFER PageBuffers[], 118 PAGE_BUFFER PageBuffers[],
119 UINT32 PageCount, 119 u32 PageCount,
120 void * Buffer, 120 void * Buffer,
121 UINT32 BufferLen, 121 u32 BufferLen,
122 UINT64 RequestId 122 UINT64 RequestId
123 ); 123 );
124 124
@@ -126,61 +126,61 @@ typedef int (*VMBUS_CHANNEL_SEND_PACKET_MULTIPAGEBUFFER)(
126 PDEVICE_OBJECT Device, 126 PDEVICE_OBJECT Device,
127 MULTIPAGE_BUFFER *MultiPageBuffer, 127 MULTIPAGE_BUFFER *MultiPageBuffer,
128 void * Buffer, 128 void * Buffer,
129 UINT32 BufferLen, 129 u32 BufferLen,
130 UINT64 RequestId 130 UINT64 RequestId
131); 131);
132 132
133typedef int (*VMBUS_CHANNEL_RECV_PACKET)( 133typedef int (*VMBUS_CHANNEL_RECV_PACKET)(
134 PDEVICE_OBJECT Device, 134 PDEVICE_OBJECT Device,
135 void * Buffer, 135 void * Buffer,
136 UINT32 BufferLen, 136 u32 BufferLen,
137 UINT32* BufferActualLen, 137 u32* BufferActualLen,
138 UINT64* RequestId 138 UINT64* RequestId
139 ); 139 );
140 140
141typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)( 141typedef int (*VMBUS_CHANNEL_RECV_PACKET_PAW)(
142 PDEVICE_OBJECT Device, 142 PDEVICE_OBJECT Device,
143 void * Buffer, 143 void * Buffer,
144 UINT32 BufferLen, 144 u32 BufferLen,
145 UINT32* BufferActualLen, 145 u32* BufferActualLen,
146 UINT64* RequestId 146 UINT64* RequestId
147 ); 147 );
148 148
149typedef int (*VMBUS_CHANNEL_ESTABLISH_GPADL)( 149typedef int (*VMBUS_CHANNEL_ESTABLISH_GPADL)(
150 PDEVICE_OBJECT Device, 150 PDEVICE_OBJECT Device,
151 void * Buffer, // from kmalloc() 151 void * Buffer, // from kmalloc()
152 UINT32 BufferLen, // page-size multiple 152 u32 BufferLen, // page-size multiple
153 UINT32* GpadlHandle 153 u32* GpadlHandle
154 ); 154 );
155 155
156typedef int (*VMBUS_CHANNEL_TEARDOWN_GPADL)( 156typedef int (*VMBUS_CHANNEL_TEARDOWN_GPADL)(
157 PDEVICE_OBJECT Device, 157 PDEVICE_OBJECT Device,
158 UINT32 GpadlHandle 158 u32 GpadlHandle
159 ); 159 );
160 160
161 161
162typedef struct _PORT_INFO { 162typedef struct _PORT_INFO {
163 UINT32 InterruptMask; 163 u32 InterruptMask;
164 UINT32 ReadIndex; 164 u32 ReadIndex;
165 UINT32 WriteIndex; 165 u32 WriteIndex;
166 UINT32 BytesAvailToRead; 166 u32 BytesAvailToRead;
167 UINT32 BytesAvailToWrite; 167 u32 BytesAvailToWrite;
168} PORT_INFO; 168} PORT_INFO;
169 169
170 170
171typedef struct _DEVICE_INFO { 171typedef struct _DEVICE_INFO {
172 UINT32 ChannelId; 172 u32 ChannelId;
173 UINT32 ChannelState; 173 u32 ChannelState;
174 GUID ChannelType; 174 GUID ChannelType;
175 GUID ChannelInstance; 175 GUID ChannelInstance;
176 176
177 UINT32 MonitorId; 177 u32 MonitorId;
178 UINT32 ServerMonitorPending; 178 u32 ServerMonitorPending;
179 UINT32 ServerMonitorLatency; 179 u32 ServerMonitorLatency;
180 UINT32 ServerMonitorConnectionId; 180 u32 ServerMonitorConnectionId;
181 UINT32 ClientMonitorPending; 181 u32 ClientMonitorPending;
182 UINT32 ClientMonitorLatency; 182 u32 ClientMonitorLatency;
183 UINT32 ClientMonitorConnectionId; 183 u32 ClientMonitorConnectionId;
184 184
185 PORT_INFO Inbound; 185 PORT_INFO Inbound;
186 PORT_INFO Outbound; 186 PORT_INFO Outbound;
diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h
index 87b57d285bd..900e1fc2fb8 100644
--- a/drivers/staging/hv/include/VmbusChannelInterface.h
+++ b/drivers/staging/hv/include/VmbusChannelInterface.h
@@ -67,8 +67,8 @@ typedef struct
67 GUID InterfaceType; 67 GUID InterfaceType;
68 GUID InterfaceInstance; 68 GUID InterfaceInstance;
69 UINT64 InterruptLatencyIn100nsUnits; 69 UINT64 InterruptLatencyIn100nsUnits;
70 UINT32 InterfaceRevision; 70 u32 InterfaceRevision;
71 UINT32 ServerContextAreaSize; // in bytes 71 u32 ServerContextAreaSize; // in bytes
72 u16 ChannelFlags; 72 u16 ChannelFlags;
73 u16 MmioMegabytes; // in bytes * 1024 * 1024 73 u16 MmioMegabytes; // in bytes * 1024 * 1024
74 74
@@ -89,11 +89,11 @@ typedef struct
89 // 89 //
90 struct 90 struct
91 { 91 {
92 UINT32 PipeMode; 92 u32 PipeMode;
93 UCHAR UserDefined[MAX_PIPE_USER_DEFINED_BYTES]; 93 UCHAR UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
94 } Pipe; 94 } Pipe;
95 } u; 95 } u;
96 UINT32 Padding; 96 u32 Padding;
97} VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER; 97} VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER;
98#pragma pack(pop) 98#pragma pack(pop)
99 99
@@ -107,7 +107,7 @@ typedef struct
107// FIELD_OFFSET(VMBUS_CHANNEL_OFFER, u.Standard.UserDefined))); 107// FIELD_OFFSET(VMBUS_CHANNEL_OFFER, u.Standard.UserDefined)));
108// 108//
109 109
110typedef UINT32 GPADL_HANDLE; 110typedef u32 GPADL_HANDLE;
111 111
112// 112//
113// Server Flags 113// Server Flags
diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h
index 1e8b9ceba00..7dd489a722e 100644
--- a/drivers/staging/hv/include/VmbusPacketFormat.h
+++ b/drivers/staging/hv/include/VmbusPacketFormat.h
@@ -41,8 +41,8 @@ typedef struct
41 { 41 {
42 struct 42 struct
43 { 43 {
44 volatile UINT32 In; // Offset in bytes from the ring base 44 volatile u32 In; // Offset in bytes from the ring base
45 volatile UINT32 Out; // Offset in bytes from the ring base 45 volatile u32 Out; // Offset in bytes from the ring base
46 }; 46 };
47 volatile LONGLONG InOut; 47 volatile LONGLONG InOut;
48 }; 48 };
@@ -52,7 +52,7 @@ typedef struct
52 // endpoint should not send any interrupts. 52 // endpoint should not send any interrupts.
53 // 53 //
54 54
55 volatile UINT32 InterruptMask; 55 volatile u32 InterruptMask;
56 56
57} VMRCB, *PVMRCB; 57} VMRCB, *PVMRCB;
58 58
@@ -86,7 +86,7 @@ typedef struct
86 UINT64 TransactionId; 86 UINT64 TransactionId;
87} VMPACKET_DESCRIPTOR, *PVMPACKET_DESCRIPTOR; 87} VMPACKET_DESCRIPTOR, *PVMPACKET_DESCRIPTOR;
88 88
89typedef UINT32 PREVIOUS_PACKET_OFFSET, *PPREVIOUS_PACKET_OFFSET; 89typedef u32 PREVIOUS_PACKET_OFFSET, *PPREVIOUS_PACKET_OFFSET;
90 90
91typedef struct 91typedef struct
92{ 92{
@@ -96,8 +96,8 @@ typedef struct
96 96
97typedef struct 97typedef struct
98{ 98{
99 UINT32 ByteCount; 99 u32 ByteCount;
100 UINT32 ByteOffset; 100 u32 ByteOffset;
101} VMTRANSFER_PAGE_RANGE, *PVMTRANSFER_PAGE_RANGE; 101} VMTRANSFER_PAGE_RANGE, *PVMTRANSFER_PAGE_RANGE;
102 102
103#ifdef __cplusplus 103#ifdef __cplusplus
@@ -115,7 +115,7 @@ typedef struct VMTRANSFER_PAGE_PACKET_HEADER {
115 u16 TransferPageSetId; 115 u16 TransferPageSetId;
116 BOOLEAN SenderOwnsSet; 116 BOOLEAN SenderOwnsSet;
117 u8 Reserved; 117 u8 Reserved;
118 UINT32 RangeCount; 118 u32 RangeCount;
119 VMTRANSFER_PAGE_RANGE Ranges[1]; 119 VMTRANSFER_PAGE_RANGE Ranges[1];
120 120
121} VMTRANSFER_PAGE_PACKET_HEADER, *PVMTRANSFER_PAGE_PACKET_HEADER; 121} VMTRANSFER_PAGE_PACKET_HEADER, *PVMTRANSFER_PAGE_PACKET_HEADER;
@@ -134,8 +134,8 @@ typedef struct _VMGPADL_PACKET_HEADER {
134#endif 134#endif
135 135
136 136
137 UINT32 Gpadl; 137 u32 Gpadl;
138 UINT32 Reserved; 138 u32 Reserved;
139 139
140} VMGPADL_PACKET_HEADER, *PVMGPADL_PACKET_HEADER; 140} VMGPADL_PACKET_HEADER, *PVMGPADL_PACKET_HEADER;
141 141
@@ -151,7 +151,7 @@ typedef struct _VMADD_REMOVE_TRANSFER_PAGE_SET {
151 151
152#endif 152#endif
153 153
154 UINT32 Gpadl; 154 u32 Gpadl;
155 u16 TransferPageSetId; 155 u16 TransferPageSetId;
156 u16 Reserved; 156 u16 Reserved;
157 157
@@ -166,8 +166,8 @@ typedef struct _VMADD_REMOVE_TRANSFER_PAGE_SET {
166 166
167typedef struct _GPA_RANGE { 167typedef struct _GPA_RANGE {
168 168
169 UINT32 ByteCount; 169 u32 ByteCount;
170 UINT32 ByteOffset; 170 u32 ByteOffset;
171 UINT64 PfnArray[0]; 171 UINT64 PfnArray[0];
172 172
173} GPA_RANGE, *PGPA_RANGE; 173} GPA_RANGE, *PGPA_RANGE;
@@ -196,8 +196,8 @@ typedef struct _VMESTABLISH_GPADL {
196 196
197#endif 197#endif
198 198
199 UINT32 Gpadl; 199 u32 Gpadl;
200 UINT32 RangeCount; 200 u32 RangeCount;
201 GPA_RANGE Range[1]; 201 GPA_RANGE Range[1];
202 202
203} VMESTABLISH_GPADL, *PVMESTABLISH_GPADL; 203} VMESTABLISH_GPADL, *PVMESTABLISH_GPADL;
@@ -220,8 +220,8 @@ typedef struct _VMTEARDOWN_GPADL {
220 220
221#endif 221#endif
222 222
223 UINT32 Gpadl; 223 u32 Gpadl;
224 UINT32 Reserved; // for alignment to a 8-byte boundary 224 u32 Reserved; // for alignment to a 8-byte boundary
225} VMTEARDOWN_GPADL, *PVMTEARDOWN_GPADL; 225} VMTEARDOWN_GPADL, *PVMTEARDOWN_GPADL;
226 226
227 227
@@ -242,8 +242,8 @@ typedef struct _VMDATA_GPA_DIRECT {
242 242
243#endif 243#endif
244 244
245 UINT32 Reserved; 245 u32 Reserved;
246 UINT32 RangeCount; 246 u32 RangeCount;
247 GPA_RANGE Range[1]; 247 GPA_RANGE Range[1];
248 248
249} VMDATA_GPA_DIRECT, *PVMDATA_GPA_DIRECT; 249} VMDATA_GPA_DIRECT, *PVMDATA_GPA_DIRECT;
@@ -267,8 +267,8 @@ typedef struct _VMADDITIONAL_DATA {
267#endif 267#endif
268 268
269 UINT64 TotalBytes; 269 UINT64 TotalBytes;
270 UINT32 ByteOffset; 270 u32 ByteOffset;
271 UINT32 ByteCount; 271 u32 ByteCount;
272 UCHAR Data[1]; 272 UCHAR Data[1];
273 273
274} VMADDITIONAL_DATA, *PVMADDITIONAL_DATA; 274} VMADDITIONAL_DATA, *PVMADDITIONAL_DATA;
diff --git a/drivers/staging/hv/include/nvspprotocol.h b/drivers/staging/hv/include/nvspprotocol.h
index e1dd4676d97..702f904ee8d 100644
--- a/drivers/staging/hv/include/nvspprotocol.h
+++ b/drivers/staging/hv/include/nvspprotocol.h
@@ -26,7 +26,7 @@
26 26
27#include "VmbusChannelInterface.h" 27#include "VmbusChannelInterface.h"
28 28
29#define NVSP_INVALID_PROTOCOL_VERSION ((UINT32)0xFFFFFFFF) 29#define NVSP_INVALID_PROTOCOL_VERSION ((u32)0xFFFFFFFF)
30 30
31#define NVSP_PROTOCOL_VERSION_1 2 31#define NVSP_PROTOCOL_VERSION_1 2
32#define NVSP_MIN_PROTOCOL_VERSION NVSP_PROTOCOL_VERSION_1 32#define NVSP_MIN_PROTOCOL_VERSION NVSP_PROTOCOL_VERSION_1
@@ -84,7 +84,7 @@ typedef enum _NVSP_STATUS
84 84
85typedef struct _NVSP_MESSAGE_HEADER 85typedef struct _NVSP_MESSAGE_HEADER
86{ 86{
87 UINT32 MessageType; 87 u32 MessageType;
88} NVSP_MESSAGE_HEADER, *PNVSP_MESSAGE_HEADER; 88} NVSP_MESSAGE_HEADER, *PNVSP_MESSAGE_HEADER;
89 89
90// 90//
@@ -99,8 +99,8 @@ typedef struct _NVSP_MESSAGE_HEADER
99// 99//
100typedef struct _NVSP_MESSAGE_INIT 100typedef struct _NVSP_MESSAGE_INIT
101{ 101{
102 UINT32 MinProtocolVersion; 102 u32 MinProtocolVersion;
103 UINT32 MaxProtocolVersion; 103 u32 MaxProtocolVersion;
104} NVSP_MESSAGE_INIT, *PNVSP_MESSAGE_INIT; 104} NVSP_MESSAGE_INIT, *PNVSP_MESSAGE_INIT;
105 105
106// 106//
@@ -110,9 +110,9 @@ typedef struct _NVSP_MESSAGE_INIT
110// 110//
111typedef struct _NVSP_MESSAGE_INIT_COMPLETE 111typedef struct _NVSP_MESSAGE_INIT_COMPLETE
112{ 112{
113 UINT32 NegotiatedProtocolVersion; 113 u32 NegotiatedProtocolVersion;
114 UINT32 MaximumMdlChainLength; 114 u32 MaximumMdlChainLength;
115 UINT32 Status; 115 u32 Status;
116} NVSP_MESSAGE_INIT_COMPLETE, *PNVSP_MESSAGE_INIT_COMPLETE; 116} NVSP_MESSAGE_INIT_COMPLETE, *PNVSP_MESSAGE_INIT_COMPLETE;
117 117
118typedef union _NVSP_MESSAGE_INIT_UBER 118typedef union _NVSP_MESSAGE_INIT_UBER
@@ -132,8 +132,8 @@ typedef union _NVSP_MESSAGE_INIT_UBER
132// 132//
133typedef struct _NVSP_1_MESSAGE_SEND_NDIS_VERSION 133typedef struct _NVSP_1_MESSAGE_SEND_NDIS_VERSION
134{ 134{
135 UINT32 NdisMajorVersion; 135 u32 NdisMajorVersion;
136 UINT32 NdisMinorVersion; 136 u32 NdisMinorVersion;
137} NVSP_1_MESSAGE_SEND_NDIS_VERSION, *PNVSP_1_MESSAGE_SEND_NDIS_VERSION; 137} NVSP_1_MESSAGE_SEND_NDIS_VERSION, *PNVSP_1_MESSAGE_SEND_NDIS_VERSION;
138 138
139// 139//
@@ -149,10 +149,10 @@ typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER
149 149
150typedef struct _NVSP_1_RECEIVE_BUFFER_SECTION 150typedef struct _NVSP_1_RECEIVE_BUFFER_SECTION
151{ 151{
152 UINT32 Offset; 152 u32 Offset;
153 UINT32 SubAllocationSize; 153 u32 SubAllocationSize;
154 UINT32 NumSubAllocations; 154 u32 NumSubAllocations;
155 UINT32 EndOffset; 155 u32 EndOffset;
156} NVSP_1_RECEIVE_BUFFER_SECTION, *PNVSP_1_RECEIVE_BUFFER_SECTION; 156} NVSP_1_RECEIVE_BUFFER_SECTION, *PNVSP_1_RECEIVE_BUFFER_SECTION;
157 157
158// 158//
@@ -162,8 +162,8 @@ typedef struct _NVSP_1_RECEIVE_BUFFER_SECTION
162// 162//
163typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER_COMPLETE 163typedef struct _NVSP_1_MESSAGE_SEND_RECEIVE_BUFFER_COMPLETE
164{ 164{
165 UINT32 Status; 165 u32 Status;
166 UINT32 NumSections; 166 u32 NumSections;
167 167
168 // 168 //
169 // The receive buffer is split into two parts, a large 169 // The receive buffer is split into two parts, a large
@@ -213,7 +213,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER
213// 213//
214typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE 214typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE
215{ 215{
216 UINT32 Status; 216 u32 Status;
217 217
218 // 218 //
219 // The VSC gets to choose the size of the send buffer and 219 // The VSC gets to choose the size of the send buffer and
@@ -221,7 +221,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE
221 // This was done to enable dynamic reconfigurations when 221 // This was done to enable dynamic reconfigurations when
222 // the cost of GPA-direct buffers decreases. 222 // the cost of GPA-direct buffers decreases.
223 // 223 //
224 UINT32 SectionSize; 224 u32 SectionSize;
225} NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE, *PNVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE; 225} NVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE, *PNVSP_1_MESSAGE_SEND_SEND_BUFFER_COMPLETE;
226 226
227// 227//
@@ -246,7 +246,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_RNDIS_PACKET
246 // the Network VSP only has one. Therefore, the channel 246 // the Network VSP only has one. Therefore, the channel
247 // travels with the RNDIS packet. 247 // travels with the RNDIS packet.
248 // 248 //
249 UINT32 ChannelType; 249 u32 ChannelType;
250 250
251 // 251 //
252 // This field is used to send part or all of the data 252 // This field is used to send part or all of the data
@@ -256,8 +256,8 @@ typedef struct _NVSP_1_MESSAGE_SEND_RNDIS_PACKET
256 // and all of the data was sent through other VMBus 256 // and all of the data was sent through other VMBus
257 // mechanisms. 257 // mechanisms.
258 // 258 //
259 UINT32 SendBufferSectionIndex; 259 u32 SendBufferSectionIndex;
260 UINT32 SendBufferSectionSize; 260 u32 SendBufferSectionSize;
261} NVSP_1_MESSAGE_SEND_RNDIS_PACKET, *PNVSP_1_MESSAGE_SEND_RNDIS_PACKET; 261} NVSP_1_MESSAGE_SEND_RNDIS_PACKET, *PNVSP_1_MESSAGE_SEND_RNDIS_PACKET;
262 262
263// 263//
@@ -268,7 +268,7 @@ typedef struct _NVSP_1_MESSAGE_SEND_RNDIS_PACKET
268// 268//
269typedef struct _NVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE 269typedef struct _NVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE
270{ 270{
271 UINT32 Status; 271 u32 Status;
272} NVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE, *PNVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE; 272} NVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE, *PNVSP_1_MESSAGE_SEND_RNDIS_PACKET_COMPLETE;
273 273
274typedef union _NVSP_MESSAGE_1_UBER 274typedef union _NVSP_MESSAGE_1_UBER
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h
index 2036c6f56fb..eaba978920d 100644
--- a/drivers/staging/hv/include/osd.h
+++ b/drivers/staging/hv/include/osd.h
@@ -97,7 +97,6 @@ typedef struct _DLIST_ENTRY {
97// 97//
98// unsigned types 98// unsigned types
99// 99//
100typedef unsigned int UINT32;
101#ifdef __x86_64__ 100#ifdef __x86_64__
102typedef unsigned long UINT64; 101typedef unsigned long UINT64;
103#else 102#else
@@ -112,7 +111,6 @@ typedef unsigned char UCHAR;
112// 111//
113// signed types 112// signed types
114// 113//
115typedef int INT32;
116#ifdef __x86_64__ 114#ifdef __x86_64__
117typedef long INT64; 115typedef long INT64;
118#else 116#else
@@ -131,7 +129,7 @@ typedef unsigned long SIZE_T;
131typedef unsigned char BOOL; 129typedef unsigned char BOOL;
132typedef unsigned char BOOLEAN; 130typedef unsigned char BOOLEAN;
133typedef void* HANDLE; 131typedef void* HANDLE;
134typedef UINT32 DWORD; 132typedef u32 DWORD;
135typedef char* PCHAR; 133typedef char* PCHAR;
136typedef unsigned char BYTE; 134typedef unsigned char BYTE;
137 135
@@ -148,7 +146,7 @@ typedef void (*PFN_TIMER_CALLBACK)(void* context);
148#ifdef __x86_64__ 146#ifdef __x86_64__
149 147
150#define RDMSR(reg, v) { \ 148#define RDMSR(reg, v) { \
151 UINT32 h, l; \ 149 u32 h, l; \
152 __asm__ __volatile__("rdmsr" \ 150 __asm__ __volatile__("rdmsr" \
153 : "=a" (l), "=d" (h) \ 151 : "=a" (l), "=d" (h) \
154 : "c" (reg)); \ 152 : "c" (reg)); \
@@ -156,9 +154,9 @@ typedef void (*PFN_TIMER_CALLBACK)(void* context);
156} 154}
157 155
158#define WRMSR(reg, v) { \ 156#define WRMSR(reg, v) { \
159 UINT32 h, l; \ 157 u32 h, l; \
160 l = (UINT32)(((UINT64)(v)) & 0xFFFFFFFF); \ 158 l = (u32)(((UINT64)(v)) & 0xFFFFFFFF); \
161 h = (UINT32)((((UINT64)(v)) >> 32) & 0xFFFFFFFF); \ 159 h = (u32)((((UINT64)(v)) >> 32) & 0xFFFFFFFF); \
162 __asm__ __volatile__("wrmsr" \ 160 __asm__ __volatile__("wrmsr" \
163 : /* no outputs */ \ 161 : /* no outputs */ \
164 : "c" (reg), "a" (l), "d" (h)); \ 162 : "c" (reg), "a" (l), "d" (h)); \
@@ -219,7 +217,7 @@ extern void MemoryFence(void);
219extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context); 217extern HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context);
220extern void TimerClose(HANDLE hTimer); 218extern void TimerClose(HANDLE hTimer);
221extern int TimerStop(HANDLE hTimer); 219extern int TimerStop(HANDLE hTimer);
222extern void TimerStart(HANDLE hTimer, UINT32 expirationInUs); 220extern void TimerStart(HANDLE hTimer, u32 expirationInUs);
223extern SIZE_T GetTickCount(void); 221extern SIZE_T GetTickCount(void);
224 222
225extern HANDLE WaitEventCreate(void); 223extern HANDLE WaitEventCreate(void);
@@ -228,7 +226,7 @@ extern void WaitEventSet(HANDLE hWait);
228extern int WaitEventWait(HANDLE hWait); 226extern int WaitEventWait(HANDLE hWait);
229 227
230// If >0, hWait got signaled. If ==0, timeout. If < 0, error 228// If >0, hWait got signaled. If ==0, timeout. If < 0, error
231extern int WaitEventWaitEx(HANDLE hWait, UINT32 TimeoutInMs); 229extern int WaitEventWaitEx(HANDLE hWait, u32 TimeoutInMs);
232 230
233extern HANDLE SpinlockCreate(void); 231extern HANDLE SpinlockCreate(void);
234extern void SpinlockClose(HANDLE hSpin); 232extern void SpinlockClose(HANDLE hSpin);
diff --git a/drivers/staging/hv/include/rndis.h b/drivers/staging/hv/include/rndis.h
index 803e923ee32..58d9a79e34a 100644
--- a/drivers/staging/hv/include/rndis.h
+++ b/drivers/staging/hv/include/rndis.h
@@ -28,21 +28,21 @@
28// 28//
29// Basic types 29// Basic types
30// 30//
31typedef UINT32 RNDIS_REQUEST_ID; 31typedef u32 RNDIS_REQUEST_ID;
32typedef UINT32 RNDIS_HANDLE; 32typedef u32 RNDIS_HANDLE;
33typedef UINT32 RNDIS_STATUS; 33typedef u32 RNDIS_STATUS;
34typedef UINT32 RNDIS_REQUEST_TYPE; 34typedef u32 RNDIS_REQUEST_TYPE;
35typedef UINT32 RNDIS_OID; 35typedef u32 RNDIS_OID;
36typedef UINT32 RNDIS_CLASS_ID; 36typedef u32 RNDIS_CLASS_ID;
37typedef UINT32 RNDIS_MEDIUM; 37typedef u32 RNDIS_MEDIUM;
38typedef UINT32 *PRNDIS_REQUEST_ID; 38typedef u32 *PRNDIS_REQUEST_ID;
39typedef UINT32 *PRNDIS_HANDLE; 39typedef u32 *PRNDIS_HANDLE;
40typedef UINT32 *PRNDIS_STATUS; 40typedef u32 *PRNDIS_STATUS;
41typedef UINT32 *PRNDIS_REQUEST_TYPE; 41typedef u32 *PRNDIS_REQUEST_TYPE;
42typedef UINT32 *PRNDIS_OID; 42typedef u32 *PRNDIS_OID;
43typedef UINT32 *PRNDIS_CLASS_ID; 43typedef u32 *PRNDIS_CLASS_ID;
44typedef UINT32 *PRNDIS_MEDIUM; 44typedef u32 *PRNDIS_MEDIUM;
45typedef UINT32 RNDIS_AF; 45typedef u32 RNDIS_AF;
46 46
47// 47//
48// Status codes 48// Status codes
@@ -369,9 +369,9 @@ typedef UINT32 RNDIS_AF;
369typedef struct _RNDIS_INITIALIZE_REQUEST 369typedef struct _RNDIS_INITIALIZE_REQUEST
370{ 370{
371 RNDIS_REQUEST_ID RequestId; 371 RNDIS_REQUEST_ID RequestId;
372 UINT32 MajorVersion; 372 u32 MajorVersion;
373 UINT32 MinorVersion; 373 u32 MinorVersion;
374 UINT32 MaxTransferSize; 374 u32 MaxTransferSize;
375} RNDIS_INITIALIZE_REQUEST, *PRNDIS_INITIALIZE_REQUEST; 375} RNDIS_INITIALIZE_REQUEST, *PRNDIS_INITIALIZE_REQUEST;
376 376
377 377
@@ -382,15 +382,15 @@ typedef struct _RNDIS_INITIALIZE_COMPLETE
382{ 382{
383 RNDIS_REQUEST_ID RequestId; 383 RNDIS_REQUEST_ID RequestId;
384 RNDIS_STATUS Status; 384 RNDIS_STATUS Status;
385 UINT32 MajorVersion; 385 u32 MajorVersion;
386 UINT32 MinorVersion; 386 u32 MinorVersion;
387 UINT32 DeviceFlags; 387 u32 DeviceFlags;
388 RNDIS_MEDIUM Medium; 388 RNDIS_MEDIUM Medium;
389 UINT32 MaxPacketsPerMessage; 389 u32 MaxPacketsPerMessage;
390 UINT32 MaxTransferSize; 390 u32 MaxTransferSize;
391 UINT32 PacketAlignmentFactor; 391 u32 PacketAlignmentFactor;
392 UINT32 AFListOffset; 392 u32 AFListOffset;
393 UINT32 AFListSize; 393 u32 AFListSize;
394} RNDIS_INITIALIZE_COMPLETE, *PRNDIS_INITIALIZE_COMPLETE; 394} RNDIS_INITIALIZE_COMPLETE, *PRNDIS_INITIALIZE_COMPLETE;
395 395
396 396
@@ -401,8 +401,8 @@ typedef struct _RNDIS_INITIALIZE_COMPLETE
401typedef struct _RNDIS_CO_ADDRESS_FAMILY 401typedef struct _RNDIS_CO_ADDRESS_FAMILY
402{ 402{
403 RNDIS_AF AddressFamily; 403 RNDIS_AF AddressFamily;
404 UINT32 MajorVersion; 404 u32 MajorVersion;
405 UINT32 MinorVersion; 405 u32 MinorVersion;
406} RNDIS_CO_ADDRESS_FAMILY, *PRNDIS_CO_ADDRESS_FAMILY; 406} RNDIS_CO_ADDRESS_FAMILY, *PRNDIS_CO_ADDRESS_FAMILY;
407 407
408 408
@@ -422,8 +422,8 @@ typedef struct _RNDIS_QUERY_REQUEST
422{ 422{
423 RNDIS_REQUEST_ID RequestId; 423 RNDIS_REQUEST_ID RequestId;
424 RNDIS_OID Oid; 424 RNDIS_OID Oid;
425 UINT32 InformationBufferLength; 425 u32 InformationBufferLength;
426 UINT32 InformationBufferOffset; 426 u32 InformationBufferOffset;
427 RNDIS_HANDLE DeviceVcHandle; 427 RNDIS_HANDLE DeviceVcHandle;
428} RNDIS_QUERY_REQUEST, *PRNDIS_QUERY_REQUEST; 428} RNDIS_QUERY_REQUEST, *PRNDIS_QUERY_REQUEST;
429 429
@@ -435,8 +435,8 @@ typedef struct _RNDIS_QUERY_COMPLETE
435{ 435{
436 RNDIS_REQUEST_ID RequestId; 436 RNDIS_REQUEST_ID RequestId;
437 RNDIS_STATUS Status; 437 RNDIS_STATUS Status;
438 UINT32 InformationBufferLength; 438 u32 InformationBufferLength;
439 UINT32 InformationBufferOffset; 439 u32 InformationBufferOffset;
440} RNDIS_QUERY_COMPLETE, *PRNDIS_QUERY_COMPLETE; 440} RNDIS_QUERY_COMPLETE, *PRNDIS_QUERY_COMPLETE;
441 441
442 442
@@ -447,8 +447,8 @@ typedef struct _RNDIS_SET_REQUEST
447{ 447{
448 RNDIS_REQUEST_ID RequestId; 448 RNDIS_REQUEST_ID RequestId;
449 RNDIS_OID Oid; 449 RNDIS_OID Oid;
450 UINT32 InformationBufferLength; 450 u32 InformationBufferLength;
451 UINT32 InformationBufferOffset; 451 u32 InformationBufferOffset;
452 RNDIS_HANDLE DeviceVcHandle; 452 RNDIS_HANDLE DeviceVcHandle;
453} RNDIS_SET_REQUEST, *PRNDIS_SET_REQUEST; 453} RNDIS_SET_REQUEST, *PRNDIS_SET_REQUEST;
454 454
@@ -468,7 +468,7 @@ typedef struct _RNDIS_SET_COMPLETE
468// 468//
469typedef struct _RNDIS_RESET_REQUEST 469typedef struct _RNDIS_RESET_REQUEST
470{ 470{
471 UINT32 Reserved; 471 u32 Reserved;
472} RNDIS_RESET_REQUEST, *PRNDIS_RESET_REQUEST; 472} RNDIS_RESET_REQUEST, *PRNDIS_RESET_REQUEST;
473 473
474// 474//
@@ -477,7 +477,7 @@ typedef struct _RNDIS_RESET_REQUEST
477typedef struct _RNDIS_RESET_COMPLETE 477typedef struct _RNDIS_RESET_COMPLETE
478{ 478{
479 RNDIS_STATUS Status; 479 RNDIS_STATUS Status;
480 UINT32 AddressingReset; 480 u32 AddressingReset;
481} RNDIS_RESET_COMPLETE, *PRNDIS_RESET_COMPLETE; 481} RNDIS_RESET_COMPLETE, *PRNDIS_RESET_COMPLETE;
482 482
483 483
@@ -487,8 +487,8 @@ typedef struct _RNDIS_RESET_COMPLETE
487typedef struct _RNDIS_INDICATE_STATUS 487typedef struct _RNDIS_INDICATE_STATUS
488{ 488{
489 RNDIS_STATUS Status; 489 RNDIS_STATUS Status;
490 UINT32 StatusBufferLength; 490 u32 StatusBufferLength;
491 UINT32 StatusBufferOffset; 491 u32 StatusBufferOffset;
492} RNDIS_INDICATE_STATUS, *PRNDIS_INDICATE_STATUS; 492} RNDIS_INDICATE_STATUS, *PRNDIS_INDICATE_STATUS;
493 493
494 494
@@ -499,7 +499,7 @@ typedef struct _RNDIS_INDICATE_STATUS
499typedef struct _RNDIS_DIAGNOSTIC_INFO 499typedef struct _RNDIS_DIAGNOSTIC_INFO
500{ 500{
501 RNDIS_STATUS DiagStatus; 501 RNDIS_STATUS DiagStatus;
502 UINT32 ErrorOffset; 502 u32 ErrorOffset;
503} RNDIS_DIAGNOSTIC_INFO, *PRNDIS_DIAGNOSTIC_INFO; 503} RNDIS_DIAGNOSTIC_INFO, *PRNDIS_DIAGNOSTIC_INFO;
504 504
505 505
@@ -531,15 +531,15 @@ typedef struct _RNDIS_KEEPALIVE_COMPLETE
531// 531//
532typedef struct _RNDIS_PACKET 532typedef struct _RNDIS_PACKET
533{ 533{
534 UINT32 DataOffset; 534 u32 DataOffset;
535 UINT32 DataLength; 535 u32 DataLength;
536 UINT32 OOBDataOffset; 536 u32 OOBDataOffset;
537 UINT32 OOBDataLength; 537 u32 OOBDataLength;
538 UINT32 NumOOBDataElements; 538 u32 NumOOBDataElements;
539 UINT32 PerPacketInfoOffset; 539 u32 PerPacketInfoOffset;
540 UINT32 PerPacketInfoLength; 540 u32 PerPacketInfoLength;
541 RNDIS_HANDLE VcHandle; 541 RNDIS_HANDLE VcHandle;
542 UINT32 Reserved; 542 u32 Reserved;
543} RNDIS_PACKET, *PRNDIS_PACKET; 543} RNDIS_PACKET, *PRNDIS_PACKET;
544 544
545// 545//
@@ -547,9 +547,9 @@ typedef struct _RNDIS_PACKET
547// 547//
548typedef struct _RNDIS_OOBD 548typedef struct _RNDIS_OOBD
549{ 549{
550 UINT32 Size; 550 u32 Size;
551 RNDIS_CLASS_ID Type; 551 RNDIS_CLASS_ID Type;
552 UINT32 ClassInformationOffset; 552 u32 ClassInformationOffset;
553} RNDIS_OOBD, *PRNDIS_OOBD; 553} RNDIS_OOBD, *PRNDIS_OOBD;
554 554
555// 555//
@@ -557,9 +557,9 @@ typedef struct _RNDIS_OOBD
557// 557//
558typedef struct _RNDIS_PER_PACKET_INFO 558typedef struct _RNDIS_PER_PACKET_INFO
559{ 559{
560 UINT32 Size; 560 u32 Size;
561 UINT32 Type; 561 u32 Type;
562 UINT32 PerPacketInformationOffset; 562 u32 PerPacketInformationOffset;
563} RNDIS_PER_PACKET_INFO, *PRNDIS_PER_PACKET_INFO; 563} RNDIS_PER_PACKET_INFO, *PRNDIS_PER_PACKET_INFO;
564 564
565 565
@@ -569,11 +569,11 @@ typedef struct _RNDIS_PER_PACKET_INFO
569// 569//
570typedef struct _RNDIS_CONFIG_PARAMETER_INFO 570typedef struct _RNDIS_CONFIG_PARAMETER_INFO
571{ 571{
572 UINT32 ParameterNameOffset; 572 u32 ParameterNameOffset;
573 UINT32 ParameterNameLength; 573 u32 ParameterNameLength;
574 UINT32 ParameterType; 574 u32 ParameterType;
575 UINT32 ParameterValueOffset; 575 u32 ParameterValueOffset;
576 UINT32 ParameterValueLength; 576 u32 ParameterValueLength;
577} RNDIS_CONFIG_PARAMETER_INFO, *PRNDIS_CONFIG_PARAMETER_INFO; 577} RNDIS_CONFIG_PARAMETER_INFO, *PRNDIS_CONFIG_PARAMETER_INFO;
578 578
579// 579//
@@ -636,8 +636,8 @@ typedef struct _RCONDIS_MP_QUERY_REQUEST
636 RNDIS_REQUEST_TYPE RequestType; 636 RNDIS_REQUEST_TYPE RequestType;
637 RNDIS_OID Oid; 637 RNDIS_OID Oid;
638 RNDIS_HANDLE DeviceVcHandle; 638 RNDIS_HANDLE DeviceVcHandle;
639 UINT32 InformationBufferLength; 639 u32 InformationBufferLength;
640 UINT32 InformationBufferOffset; 640 u32 InformationBufferOffset;
641} RCONDIS_MP_QUERY_REQUEST, *PRCONDIS_MP_QUERY_REQUEST; 641} RCONDIS_MP_QUERY_REQUEST, *PRCONDIS_MP_QUERY_REQUEST;
642 642
643 643
@@ -650,8 +650,8 @@ typedef struct _RCONDIS_MP_SET_REQUEST
650 RNDIS_REQUEST_TYPE RequestType; 650 RNDIS_REQUEST_TYPE RequestType;
651 RNDIS_OID Oid; 651 RNDIS_OID Oid;
652 RNDIS_HANDLE DeviceVcHandle; 652 RNDIS_HANDLE DeviceVcHandle;
653 UINT32 InformationBufferLength; 653 u32 InformationBufferLength;
654 UINT32 InformationBufferOffset; 654 u32 InformationBufferOffset;
655} RCONDIS_MP_SET_REQUEST, *PRCONDIS_MP_SET_REQUEST; 655} RCONDIS_MP_SET_REQUEST, *PRCONDIS_MP_SET_REQUEST;
656 656
657 657
@@ -662,8 +662,8 @@ typedef struct _RCONDIS_INDICATE_STATUS
662{ 662{
663 RNDIS_HANDLE NdisVcHandle; 663 RNDIS_HANDLE NdisVcHandle;
664 RNDIS_STATUS Status; 664 RNDIS_STATUS Status;
665 UINT32 StatusBufferLength; 665 u32 StatusBufferLength;
666 UINT32 StatusBufferOffset; 666 u32 StatusBufferOffset;
667} RCONDIS_INDICATE_STATUS, *PRCONDIS_INDICATE_STATUS; 667} RCONDIS_INDICATE_STATUS, *PRCONDIS_INDICATE_STATUS;
668 668
669 669
@@ -673,30 +673,30 @@ typedef struct _RCONDIS_INDICATE_STATUS
673 673
674typedef struct _RCONDIS_SPECIFIC_PARAMETERS 674typedef struct _RCONDIS_SPECIFIC_PARAMETERS
675{ 675{
676 UINT32 ParameterType; 676 u32 ParameterType;
677 UINT32 ParameterLength; 677 u32 ParameterLength;
678 UINT32 ParameterOffset; 678 u32 ParameterOffset;
679} RCONDIS_SPECIFIC_PARAMETERS, *PRCONDIS_SPECIFIC_PARAMETERS; 679} RCONDIS_SPECIFIC_PARAMETERS, *PRCONDIS_SPECIFIC_PARAMETERS;
680 680
681typedef struct _RCONDIS_MEDIA_PARAMETERS 681typedef struct _RCONDIS_MEDIA_PARAMETERS
682{ 682{
683 UINT32 Flags; 683 u32 Flags;
684 UINT32 Reserved1; 684 u32 Reserved1;
685 UINT32 Reserved2; 685 u32 Reserved2;
686 RCONDIS_SPECIFIC_PARAMETERS MediaSpecific; 686 RCONDIS_SPECIFIC_PARAMETERS MediaSpecific;
687} RCONDIS_MEDIA_PARAMETERS, *PRCONDIS_MEDIA_PARAMETERS; 687} RCONDIS_MEDIA_PARAMETERS, *PRCONDIS_MEDIA_PARAMETERS;
688 688
689 689
690typedef struct _RNDIS_FLOWSPEC 690typedef struct _RNDIS_FLOWSPEC
691{ 691{
692 UINT32 TokenRate; 692 u32 TokenRate;
693 UINT32 TokenBucketSize; 693 u32 TokenBucketSize;
694 UINT32 PeakBandwidth; 694 u32 PeakBandwidth;
695 UINT32 Latency; 695 u32 Latency;
696 UINT32 DelayVariation; 696 u32 DelayVariation;
697 UINT32 ServiceType; 697 u32 ServiceType;
698 UINT32 MaxSduSize; 698 u32 MaxSduSize;
699 UINT32 MinimumPolicedSize; 699 u32 MinimumPolicedSize;
700} RNDIS_FLOWSPEC, *PRNDIS_FLOWSPEC; 700} RNDIS_FLOWSPEC, *PRNDIS_FLOWSPEC;
701 701
702typedef struct _RCONDIS_CALL_MANAGER_PARAMETERS 702typedef struct _RCONDIS_CALL_MANAGER_PARAMETERS
@@ -712,12 +712,12 @@ typedef struct _RCONDIS_CALL_MANAGER_PARAMETERS
712typedef struct _RCONDIS_MP_ACTIVATE_VC_REQUEST 712typedef struct _RCONDIS_MP_ACTIVATE_VC_REQUEST
713{ 713{
714 RNDIS_REQUEST_ID RequestId; 714 RNDIS_REQUEST_ID RequestId;
715 UINT32 Flags; 715 u32 Flags;
716 RNDIS_HANDLE DeviceVcHandle; 716 RNDIS_HANDLE DeviceVcHandle;
717 UINT32 MediaParamsOffset; 717 u32 MediaParamsOffset;
718 UINT32 MediaParamsLength; 718 u32 MediaParamsLength;
719 UINT32 CallMgrParamsOffset; 719 u32 CallMgrParamsOffset;
720 UINT32 CallMgrParamsLength; 720 u32 CallMgrParamsLength;
721} RCONDIS_MP_ACTIVATE_VC_REQUEST, *PRCONDIS_MP_ACTIVATE_VC_REQUEST; 721} RCONDIS_MP_ACTIVATE_VC_REQUEST, *PRCONDIS_MP_ACTIVATE_VC_REQUEST;
722 722
723// 723//
@@ -736,7 +736,7 @@ typedef struct _RCONDIS_MP_ACTIVATE_VC_COMPLETE
736typedef struct _RCONDIS_MP_DEACTIVATE_VC_REQUEST 736typedef struct _RCONDIS_MP_DEACTIVATE_VC_REQUEST
737{ 737{
738 RNDIS_REQUEST_ID RequestId; 738 RNDIS_REQUEST_ID RequestId;
739 UINT32 Flags; 739 u32 Flags;
740 RNDIS_HANDLE DeviceVcHandle; 740 RNDIS_HANDLE DeviceVcHandle;
741} RCONDIS_MP_DEACTIVATE_VC_REQUEST, *PRCONDIS_MP_DEACTIVATE_VC_REQUEST; 741} RCONDIS_MP_DEACTIVATE_VC_REQUEST, *PRCONDIS_MP_DEACTIVATE_VC_REQUEST;
742 742
@@ -786,13 +786,13 @@ typedef union _RNDIS_MESSAGE_CONTAINER
786// 786//
787typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE 787typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE
788{ 788{
789 UINT32 NdisMessageType; 789 u32 NdisMessageType;
790 790
791 // 791 //
792 // Total length of this message, from the beginning 792 // Total length of this message, from the beginning
793 // of the RNDIS_MESSAGE struct, in bytes. 793 // of the RNDIS_MESSAGE struct, in bytes.
794 // 794 //
795 UINT32 MessageLength; 795 u32 MessageLength;
796 796
797 // Actual message 797 // Actual message
798 RNDIS_MESSAGE_CONTAINER Message; 798 RNDIS_MESSAGE_CONTAINER Message;
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index cf8091308d9..c178f180ab2 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -289,7 +289,7 @@ HANDLE TimerCreate(PFN_TIMER_CALLBACK pfnTimerCB, void* context)
289 return t; 289 return t;
290} 290}
291 291
292void TimerStart(HANDLE hTimer, UINT32 expirationInUs) 292void TimerStart(HANDLE hTimer, u32 expirationInUs)
293{ 293{
294 TIMER* t = (TIMER* )hTimer; 294 TIMER* t = (TIMER* )hTimer;
295 295
@@ -363,7 +363,7 @@ int WaitEventWait(HANDLE hWait)
363 return ret; 363 return ret;
364} 364}
365 365
366int WaitEventWaitEx(HANDLE hWait, UINT32 TimeoutInMs) 366int WaitEventWaitEx(HANDLE hWait, u32 TimeoutInMs)
367{ 367{
368 int ret=0; 368 int ret=0;
369 WAITEVENT* waitEvent = (WAITEVENT* )hWait; 369 WAITEVENT* waitEvent = (WAITEVENT* )hWait;
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-21 20:42:12 -0400