diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-14 18:08:20 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:01:46 -0400 |
commit | 5654e932262840f853233317689fc59536226d76 (patch) | |
tree | c527031d8e6060a3fe0da9d6daae8281b7173f49 /drivers | |
parent | e20f683b6451a39619cd67e20d69597070aa8d17 (diff) |
Staging: hv: remove UINT8 and INT8 typedefs
The UINT8 and INT8 typedefs are now removed from the Hyper-V driver
code.
Had to include <linux/kernel.h> in a few places to get the
build to work properly as well.
Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/hv/BlkVsc.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/Channel.c | 6 | ||||
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.c | 4 | ||||
-rw-r--r-- | drivers/staging/hv/ChannelMgmt.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/NetVsc.c | 1 | ||||
-rw-r--r-- | drivers/staging/hv/RingBuffer.h | 4 | ||||
-rw-r--r-- | drivers/staging/hv/RndisFilter.c | 1 | ||||
-rw-r--r-- | drivers/staging/hv/StorVsc.c | 1 | ||||
-rw-r--r-- | drivers/staging/hv/Vmbus.c | 2 | ||||
-rw-r--r-- | drivers/staging/hv/include/ChannelMessages.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/include/HvSynicApi.h | 14 | ||||
-rw-r--r-- | drivers/staging/hv/include/StorVscApi.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/include/VmbusPacketFormat.h | 6 | ||||
-rw-r--r-- | drivers/staging/hv/include/osd.h | 2 |
14 files changed, 26 insertions, 25 deletions
diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c index be53e65b19e..dc38232725b 100644 --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * | 20 | * |
21 | */ | 21 | */ |
22 | 22 | ||
23 | 23 | #include <linux/kernel.h> | |
24 | #include "StorVsc.c" | 24 | #include "StorVsc.c" |
25 | 25 | ||
26 | static const char* gBlkDriverName="blkvsc"; | 26 | static const char* gBlkDriverName="blkvsc"; |
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 07fb5c7f91b..04268b8309d 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | #include <linux/kernel.h> | |
25 | #include "include/osd.h" | 25 | #include "include/osd.h" |
26 | #include "include/logging.h" | 26 | #include "include/logging.h" |
27 | 27 | ||
@@ -162,8 +162,8 @@ VmbusChannelGetDebugInfo( | |||
162 | ) | 162 | ) |
163 | { | 163 | { |
164 | HV_MONITOR_PAGE *monitorPage; | 164 | HV_MONITOR_PAGE *monitorPage; |
165 | UINT8 monitorGroup = (UINT8)Channel->OfferMsg.MonitorId / 32; | 165 | u8 monitorGroup = (u8)Channel->OfferMsg.MonitorId / 32; |
166 | UINT8 monitorOffset = (UINT8)Channel->OfferMsg.MonitorId % 32; | 166 | u8 monitorOffset = (u8)Channel->OfferMsg.MonitorId % 32; |
167 | //UINT32 monitorBit = 1 << monitorOffset; | 167 | //UINT32 monitorBit = 1 << monitorOffset; |
168 | 168 | ||
169 | DebugInfo->RelId = Channel->OfferMsg.ChildRelId; | 169 | DebugInfo->RelId = Channel->OfferMsg.ChildRelId; |
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index 9d8f4ef1e0b..68f25805c35 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
@@ -396,8 +396,8 @@ VmbusChannelOnOffer( | |||
396 | DPRINT_DBG(VMBUS, "channel object allocated - %p", newChannel); | 396 | DPRINT_DBG(VMBUS, "channel object allocated - %p", newChannel); |
397 | 397 | ||
398 | memcpy(&newChannel->OfferMsg, offer, sizeof(VMBUS_CHANNEL_OFFER_CHANNEL)); | 398 | memcpy(&newChannel->OfferMsg, offer, sizeof(VMBUS_CHANNEL_OFFER_CHANNEL)); |
399 | newChannel->MonitorGroup = (UINT8)offer->MonitorId / 32; | 399 | newChannel->MonitorGroup = (u8)offer->MonitorId / 32; |
400 | newChannel->MonitorBit = (UINT8)offer->MonitorId % 32; | 400 | newChannel->MonitorBit = (u8)offer->MonitorId % 32; |
401 | 401 | ||
402 | // TODO: Make sure the offer comes from our parent partition | 402 | // TODO: Make sure the offer comes from our parent partition |
403 | WorkQueueQueueWorkItem(newChannel->ControlWQ, VmbusChannelProcessOffer, newChannel); | 403 | WorkQueueQueueWorkItem(newChannel->ControlWQ, VmbusChannelProcessOffer, newChannel); |
diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h index 511b80fa22d..06308a45dd7 100644 --- a/drivers/staging/hv/ChannelMgmt.h +++ b/drivers/staging/hv/ChannelMgmt.h | |||
@@ -53,8 +53,8 @@ typedef struct _VMBUS_CHANNEL { | |||
53 | 53 | ||
54 | VMBUS_CHANNEL_OFFER_CHANNEL OfferMsg; | 54 | VMBUS_CHANNEL_OFFER_CHANNEL OfferMsg; |
55 | // These are based on the OfferMsg.MonitorId. Save it here for easy access. | 55 | // These are based on the OfferMsg.MonitorId. Save it here for easy access. |
56 | UINT8 MonitorGroup; | 56 | u8 MonitorGroup; |
57 | UINT8 MonitorBit; | 57 | u8 MonitorBit; |
58 | 58 | ||
59 | UINT32 RingBufferGpadlHandle; | 59 | UINT32 RingBufferGpadlHandle; |
60 | 60 | ||
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 72cc7e3ad79..11b78f4cf75 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c | |||
@@ -22,6 +22,7 @@ | |||
22 | 22 | ||
23 | #define KERNEL_2_6_27 | 23 | #define KERNEL_2_6_27 |
24 | 24 | ||
25 | #include <linux/kernel.h> | ||
25 | #include "include/logging.h" | 26 | #include "include/logging.h" |
26 | #include "NetVsc.h" | 27 | #include "NetVsc.h" |
27 | #include "RndisFilter.h" | 28 | #include "RndisFilter.h" |
diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h index f62f3d77c0d..a190b3a6d30 100644 --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h | |||
@@ -37,12 +37,12 @@ typedef struct _RING_BUFFER { | |||
37 | volatile UINT32 ReadIndex; // Offset in bytes from the start of ring data below | 37 | volatile UINT32 ReadIndex; // Offset in bytes from the start of ring data below |
38 | 38 | ||
39 | volatile UINT32 InterruptMask; | 39 | volatile UINT32 InterruptMask; |
40 | UINT8 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 UINT32 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 | UINT8 Buffer[0]; | 45 | u8 Buffer[0]; |
46 | } STRUCT_PACKED RING_BUFFER; | 46 | } STRUCT_PACKED RING_BUFFER; |
47 | 47 | ||
48 | typedef struct _RING_BUFFER_INFO { | 48 | typedef struct _RING_BUFFER_INFO { |
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index a455a89d755..6d9ca8d46e5 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #define KERNEL_2_6_27 | 24 | #define KERNEL_2_6_27 |
25 | 25 | ||
26 | #include <linux/kernel.h> | ||
26 | #include "include/logging.h" | 27 | #include "include/logging.h" |
27 | 28 | ||
28 | #include "include/NetVscApi.h" | 29 | #include "include/NetVscApi.h" |
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index d71fab2bfb3..7750d3224e7 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #define KERNEL_2_6_27 | 24 | #define KERNEL_2_6_27 |
25 | 25 | ||
26 | #include <linux/kernel.h> | ||
26 | #include "include/logging.h" | 27 | #include "include/logging.h" |
27 | 28 | ||
28 | #include "include/StorVscApi.h" | 29 | #include "include/StorVscApi.h" |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index ace782471ac..8bfec126e0a 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | 24 | #include <linux/kernel.h> | |
25 | #include "include/logging.h" | 25 | #include "include/logging.h" |
26 | #include "VersionInfo.h" | 26 | #include "VersionInfo.h" |
27 | #include "VmbusPrivate.h" | 27 | #include "VmbusPrivate.h" |
diff --git a/drivers/staging/hv/include/ChannelMessages.h b/drivers/staging/hv/include/ChannelMessages.h index 27a88ea6df5..95d3601d214 100644 --- a/drivers/staging/hv/include/ChannelMessages.h +++ b/drivers/staging/hv/include/ChannelMessages.h | |||
@@ -91,7 +91,7 @@ typedef struct _VMBUS_CHANNEL_OFFER_CHANNEL | |||
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 | UINT32 ChildRelId; |
94 | UINT8 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; |
97 | 97 | ||
diff --git a/drivers/staging/hv/include/HvSynicApi.h b/drivers/staging/hv/include/HvSynicApi.h index dd4fa0eb37e..0c3700bb0ed 100644 --- a/drivers/staging/hv/include/HvSynicApi.h +++ b/drivers/staging/hv/include/HvSynicApi.h | |||
@@ -264,11 +264,11 @@ typedef const HV_CONNECTION_INFO *PCHV_CONNECTION_INFO; | |||
264 | 264 | ||
265 | typedef union _HV_MESSAGE_FLAGS | 265 | typedef union _HV_MESSAGE_FLAGS |
266 | { | 266 | { |
267 | UINT8 AsUINT8; | 267 | u8 Asu8; |
268 | struct | 268 | struct |
269 | { | 269 | { |
270 | UINT8 MessagePending:1; | 270 | u8 MessagePending:1; |
271 | UINT8 Reserved:7; | 271 | u8 Reserved:7; |
272 | }; | 272 | }; |
273 | } HV_MESSAGE_FLAGS, *PHV_MESSAGE_FLAGS; | 273 | } HV_MESSAGE_FLAGS, *PHV_MESSAGE_FLAGS; |
274 | 274 | ||
@@ -280,9 +280,9 @@ typedef union _HV_MESSAGE_FLAGS | |||
280 | typedef struct _HV_MESSAGE_HEADER | 280 | typedef struct _HV_MESSAGE_HEADER |
281 | { | 281 | { |
282 | HV_MESSAGE_TYPE MessageType; | 282 | HV_MESSAGE_TYPE MessageType; |
283 | UINT8 PayloadSize; | 283 | u8 PayloadSize; |
284 | HV_MESSAGE_FLAGS MessageFlags; | 284 | HV_MESSAGE_FLAGS MessageFlags; |
285 | UINT8 Reserved[2]; | 285 | u8 Reserved[2]; |
286 | union | 286 | union |
287 | { | 287 | { |
288 | HV_PARTITION_ID Sender; | 288 | HV_PARTITION_ID Sender; |
@@ -337,7 +337,7 @@ typedef struct _HV_MESSAGE_PAGE | |||
337 | 337 | ||
338 | typedef union _HV_SYNIC_EVENT_FLAGS | 338 | typedef union _HV_SYNIC_EVENT_FLAGS |
339 | { | 339 | { |
340 | UINT8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT]; | 340 | u8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT]; |
341 | UINT32 Flags32[HV_EVENT_FLAGS_DWORD_COUNT]; | 341 | UINT32 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 | ||
@@ -483,7 +483,7 @@ typedef struct _HV_MONITOR_PAGE | |||
483 | 483 | ||
484 | HV_MONITOR_PARAMETER Parameter[4][32]; | 484 | HV_MONITOR_PARAMETER Parameter[4][32]; |
485 | 485 | ||
486 | UINT8 RsvdZ4[1984]; | 486 | u8 RsvdZ4[1984]; |
487 | 487 | ||
488 | } HV_MONITOR_PAGE, *PHV_MONITOR_PAGE; | 488 | } HV_MONITOR_PAGE, *PHV_MONITOR_PAGE; |
489 | 489 | ||
diff --git a/drivers/staging/hv/include/StorVscApi.h b/drivers/staging/hv/include/StorVscApi.h index 95e9c551dfe..7c4dd15d7d1 100644 --- a/drivers/staging/hv/include/StorVscApi.h +++ b/drivers/staging/hv/include/StorVscApi.h | |||
@@ -75,7 +75,7 @@ typedef struct _STORVSC_REQUEST { | |||
75 | UINT32 Bus; | 75 | UINT32 Bus; |
76 | UINT32 TargetId; | 76 | UINT32 TargetId; |
77 | UINT32 LunId; | 77 | UINT32 LunId; |
78 | UINT8* Cdb; | 78 | u8 * Cdb; |
79 | UINT32 CdbLen; | 79 | UINT32 CdbLen; |
80 | UINT32 Status; | 80 | UINT32 Status; |
81 | UINT32 BytesXfer; | 81 | UINT32 BytesXfer; |
diff --git a/drivers/staging/hv/include/VmbusPacketFormat.h b/drivers/staging/hv/include/VmbusPacketFormat.h index 372d9c0eef4..ff8dd2084e2 100644 --- a/drivers/staging/hv/include/VmbusPacketFormat.h +++ b/drivers/staging/hv/include/VmbusPacketFormat.h | |||
@@ -65,14 +65,14 @@ typedef struct | |||
65 | VMRCB Control; | 65 | VMRCB Control; |
66 | }; | 66 | }; |
67 | 67 | ||
68 | UINT8 Reserved[PAGE_SIZE]; | 68 | u8 Reserved[PAGE_SIZE]; |
69 | }; | 69 | }; |
70 | 70 | ||
71 | // | 71 | // |
72 | // Beginning of the ring data. Note: It must be guaranteed that | 72 | // Beginning of the ring data. Note: It must be guaranteed that |
73 | // this data does not share a page with the control structure. | 73 | // this data does not share a page with the control structure. |
74 | // | 74 | // |
75 | UINT8 Data[1]; | 75 | u8 Data[1]; |
76 | } VMRING, *PVMRING; | 76 | } VMRING, *PVMRING; |
77 | 77 | ||
78 | #pragma pack(push, 1) | 78 | #pragma pack(push, 1) |
@@ -114,7 +114,7 @@ typedef struct VMTRANSFER_PAGE_PACKET_HEADER { | |||
114 | 114 | ||
115 | UINT16 TransferPageSetId; | 115 | UINT16 TransferPageSetId; |
116 | BOOLEAN SenderOwnsSet; | 116 | BOOLEAN SenderOwnsSet; |
117 | UINT8 Reserved; | 117 | u8 Reserved; |
118 | UINT32 RangeCount; | 118 | UINT32 RangeCount; |
119 | VMTRANSFER_PAGE_RANGE Ranges[1]; | 119 | VMTRANSFER_PAGE_RANGE Ranges[1]; |
120 | 120 | ||
diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/include/osd.h index c78dd62cf5f..d5f2a91cd57 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 | // |
100 | typedef unsigned char UINT8; | ||
101 | typedef unsigned short UINT16; | 100 | typedef unsigned short UINT16; |
102 | typedef unsigned int UINT32; | 101 | typedef unsigned int UINT32; |
103 | #ifdef __x86_64__ | 102 | #ifdef __x86_64__ |
@@ -114,7 +113,6 @@ typedef unsigned char UCHAR; | |||
114 | // | 113 | // |
115 | // signed types | 114 | // signed types |
116 | // | 115 | // |
117 | typedef char INT8; | ||
118 | typedef short INT16; | 116 | typedef short INT16; |
119 | typedef int INT32; | 117 | typedef int INT32; |
120 | #ifdef __x86_64__ | 118 | #ifdef __x86_64__ |