From 4d64311468a90d4ab1e83c62d63b27da598b73ea Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 Jul 2009 15:09:36 -0700 Subject: Staging: hv: remove UINT32 and INT32 typedefs The UINT32 and INT32 typedefs are now removed from the Hyper-V driver code. Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/RingBuffer.h | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'drivers/staging/hv/RingBuffer.h') 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 @@ typedef struct _SG_BUFFER_LIST { void * Data; - UINT32 Length; + u32 Length; } SG_BUFFER_LIST; typedef struct _RING_BUFFER { - volatile UINT32 WriteIndex; // Offset in bytes from the start of ring data below - volatile UINT32 ReadIndex; // Offset in bytes from the start of ring data below + volatile u32 WriteIndex; // Offset in bytes from the start of ring data below + volatile u32 ReadIndex; // Offset in bytes from the start of ring data below - volatile UINT32 InterruptMask; + volatile u32 InterruptMask; 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; + // volatile u32 InterruptMask; // Ring data starts here + RingDataStartOffset !!! DO NOT place any fields below this !!! u8 Buffer[0]; } STRUCT_PACKED RING_BUFFER; typedef struct _RING_BUFFER_INFO { RING_BUFFER* RingBuffer; - UINT32 RingSize; // Include the shared header + u32 RingSize; // Include the shared header HANDLE RingLock; - UINT32 RingDataSize; // < ringSize - UINT32 RingDataStartOffset; + u32 RingDataSize; // < ringSize + u32 RingDataStartOffset; } RING_BUFFER_INFO; typedef struct _RING_BUFFER_DEBUG_INFO { - UINT32 CurrentInterruptMask; - UINT32 CurrentReadIndex; - UINT32 CurrentWriteIndex; - UINT32 BytesAvailToRead; - UINT32 BytesAvailToWrite; + u32 CurrentInterruptMask; + u32 CurrentReadIndex; + u32 CurrentWriteIndex; + u32 BytesAvailToRead; + u32 BytesAvailToWrite; }RING_BUFFER_DEBUG_INFO; @@ -73,7 +73,7 @@ static int RingBufferInit( RING_BUFFER_INFO *RingInfo, void * Buffer, - UINT32 BufferLen + u32 BufferLen ); static void @@ -85,25 +85,25 @@ static int RingBufferWrite( RING_BUFFER_INFO *RingInfo, SG_BUFFER_LIST SgBuffers[], - UINT32 SgBufferCount + u32 SgBufferCount ); static int RingBufferPeek( RING_BUFFER_INFO *RingInfo, void * Buffer, - UINT32 BufferLen + u32 BufferLen ); static int RingBufferRead( RING_BUFFER_INFO *RingInfo, void * Buffer, - UINT32 BufferLen, - UINT32 Offset + u32 BufferLen, + u32 Offset ); -static UINT32 +static u32 GetRingBufferInterruptMask( RING_BUFFER_INFO *RingInfo ); -- cgit v1.2.3