From foo@baz Tue Jul 14 15:08:20 PDT 2009 Date: Tue, 14 Jul 2009 15:08:20 -0700 To: Greg KH From: Greg Kroah-Hartman Subject: Staging: hv: remove UINT8 and INT8 typedefs From: Greg Kroah-Hartman The UINT8 and INT8 typedefs are now removed from the Hyper-V driver code. Had to include in a few places to get the build to work properly as well. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/BlkVsc.c | 2 +- drivers/staging/hv/Channel.c | 6 +++--- drivers/staging/hv/ChannelMgmt.c | 4 ++-- drivers/staging/hv/ChannelMgmt.h | 4 ++-- drivers/staging/hv/NetVsc.c | 1 + drivers/staging/hv/RingBuffer.h | 4 ++-- drivers/staging/hv/RndisFilter.c | 1 + drivers/staging/hv/StorVsc.c | 1 + drivers/staging/hv/Vmbus.c | 2 +- drivers/staging/hv/include/ChannelMessages.h | 2 +- drivers/staging/hv/include/HvSynicApi.h | 14 +++++++------- drivers/staging/hv/include/StorVscApi.h | 2 +- drivers/staging/hv/include/VmbusPacketFormat.h | 6 +++--- drivers/staging/hv/include/osd.h | 2 -- 14 files changed, 26 insertions(+), 25 deletions(-) --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c @@ -20,7 +20,7 @@ * */ - +#include #include "StorVsc.c" static const char* gBlkDriverName="blkvsc"; --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c @@ -21,7 +21,7 @@ * */ - +#include #include "include/osd.h" #include "include/logging.h" @@ -162,8 +162,8 @@ VmbusChannelGetDebugInfo( ) { HV_MONITOR_PAGE *monitorPage; - UINT8 monitorGroup = (UINT8)Channel->OfferMsg.MonitorId / 32; - UINT8 monitorOffset = (UINT8)Channel->OfferMsg.MonitorId % 32; + u8 monitorGroup = (u8)Channel->OfferMsg.MonitorId / 32; + u8 monitorOffset = (u8)Channel->OfferMsg.MonitorId % 32; //UINT32 monitorBit = 1 << monitorOffset; DebugInfo->RelId = Channel->OfferMsg.ChildRelId; --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c @@ -396,8 +396,8 @@ VmbusChannelOnOffer( DPRINT_DBG(VMBUS, "channel object allocated - %p", newChannel); memcpy(&newChannel->OfferMsg, offer, sizeof(VMBUS_CHANNEL_OFFER_CHANNEL)); - newChannel->MonitorGroup = (UINT8)offer->MonitorId / 32; - newChannel->MonitorBit = (UINT8)offer->MonitorId % 32; + newChannel->MonitorGroup = (u8)offer->MonitorId / 32; + newChannel->MonitorBit = (u8)offer->MonitorId % 32; // TODO: Make sure the offer comes from our parent partition WorkQueueQueueWorkItem(newChannel->ControlWQ, VmbusChannelProcessOffer, newChannel); --- a/drivers/staging/hv/ChannelMgmt.h +++ b/drivers/staging/hv/ChannelMgmt.h @@ -53,8 +53,8 @@ typedef struct _VMBUS_CHANNEL { VMBUS_CHANNEL_OFFER_CHANNEL OfferMsg; // These are based on the OfferMsg.MonitorId. Save it here for easy access. - UINT8 MonitorGroup; - UINT8 MonitorBit; + u8 MonitorGroup; + u8 MonitorBit; UINT32 RingBufferGpadlHandle; --- a/drivers/staging/hv/include/ChannelMessages.h +++ b/drivers/staging/hv/include/ChannelMessages.h @@ -91,7 +91,7 @@ typedef struct _VMBUS_CHANNEL_OFFER_CHAN VMBUS_CHANNEL_MESSAGE_HEADER Header; VMBUS_CHANNEL_OFFER Offer; UINT32 ChildRelId; - UINT8 MonitorId; + u8 MonitorId; BOOLEAN MonitorAllocated; } VMBUS_CHANNEL_OFFER_CHANNEL, *PVMBUS_CHANNEL_OFFER_CHANNEL; --- a/drivers/staging/hv/include/HvSynicApi.h +++ b/drivers/staging/hv/include/HvSynicApi.h @@ -264,11 +264,11 @@ typedef const HV_CONNECTION_INFO *PCHV_C typedef union _HV_MESSAGE_FLAGS { - UINT8 AsUINT8; + u8 Asu8; struct { - UINT8 MessagePending:1; - UINT8 Reserved:7; + u8 MessagePending:1; + u8 Reserved:7; }; } HV_MESSAGE_FLAGS, *PHV_MESSAGE_FLAGS; @@ -280,9 +280,9 @@ typedef union _HV_MESSAGE_FLAGS typedef struct _HV_MESSAGE_HEADER { HV_MESSAGE_TYPE MessageType; - UINT8 PayloadSize; + u8 PayloadSize; HV_MESSAGE_FLAGS MessageFlags; - UINT8 Reserved[2]; + u8 Reserved[2]; union { HV_PARTITION_ID Sender; @@ -337,7 +337,7 @@ typedef struct _HV_MESSAGE_PAGE typedef union _HV_SYNIC_EVENT_FLAGS { - UINT8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT]; + u8 Flags8[HV_EVENT_FLAGS_BYTE_COUNT]; UINT32 Flags32[HV_EVENT_FLAGS_DWORD_COUNT]; } HV_SYNIC_EVENT_FLAGS, *PHV_SYNIC_EVENT_FLAGS; @@ -483,7 +483,7 @@ typedef struct _HV_MONITOR_PAGE HV_MONITOR_PARAMETER Parameter[4][32]; - UINT8 RsvdZ4[1984]; + u8 RsvdZ4[1984]; } HV_MONITOR_PAGE, *PHV_MONITOR_PAGE; --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/include/osd.h @@ -97,7 +97,6 @@ typedef struct _DLIST_ENTRY { // // unsigned types // -typedef unsigned char UINT8; typedef unsigned short UINT16; typedef unsigned int UINT32; #ifdef __x86_64__ @@ -114,7 +113,6 @@ typedef unsigned char UCHAR; // // signed types // -typedef char INT8; typedef short INT16; typedef int INT32; #ifdef __x86_64__ --- a/drivers/staging/hv/include/StorVscApi.h +++ b/drivers/staging/hv/include/StorVscApi.h @@ -75,7 +75,7 @@ typedef struct _STORVSC_REQUEST { UINT32 Bus; UINT32 TargetId; UINT32 LunId; - UINT8* Cdb; + u8 * Cdb; UINT32 CdbLen; UINT32 Status; UINT32 BytesXfer; --- a/drivers/staging/hv/include/VmbusPacketFormat.h +++ b/drivers/staging/hv/include/VmbusPacketFormat.h @@ -65,14 +65,14 @@ typedef struct VMRCB Control; }; - UINT8 Reserved[PAGE_SIZE]; + u8 Reserved[PAGE_SIZE]; }; // // Beginning of the ring data. Note: It must be guaranteed that // this data does not share a page with the control structure. // - UINT8 Data[1]; + u8 Data[1]; } VMRING, *PVMRING; #pragma pack(push, 1) @@ -114,7 +114,7 @@ typedef struct VMTRANSFER_PAGE_PACKET_HE UINT16 TransferPageSetId; BOOLEAN SenderOwnsSet; - UINT8 Reserved; + u8 Reserved; UINT32 RangeCount; VMTRANSFER_PAGE_RANGE Ranges[1]; --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -22,6 +22,7 @@ #define KERNEL_2_6_27 +#include #include "include/logging.h" #include "NetVsc.h" #include "RndisFilter.h" --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h @@ -37,12 +37,12 @@ typedef struct _RING_BUFFER { volatile UINT32 ReadIndex; // Offset in bytes from the start of ring data below volatile UINT32 InterruptMask; - UINT8 Reserved[4084]; // Pad it to PAGE_SIZE so that data starts on page boundary + u8 Reserved[4084]; // Pad it to PAGE_SIZE so that data starts on page boundary // NOTE: The InterruptMask field is used only for channels but since our vmbus connection // also uses this data structure and its data starts here, we commented out this field. // volatile UINT32 InterruptMask; // Ring data starts here + RingDataStartOffset !!! DO NOT place any fields below this !!! - UINT8 Buffer[0]; + u8 Buffer[0]; } STRUCT_PACKED RING_BUFFER; typedef struct _RING_BUFFER_INFO { --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -23,6 +23,7 @@ #define KERNEL_2_6_27 +#include #include "include/logging.h" #include "include/NetVscApi.h" --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -23,6 +23,7 @@ #define KERNEL_2_6_27 +#include #include "include/logging.h" #include "include/StorVscApi.h" --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -21,7 +21,7 @@ * */ - +#include #include "include/logging.h" #include "VersionInfo.h" #include "VmbusPrivate.h"