Commit 1aa2383b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Staging: hv: coding style cleanups for VmbusChannelInterface.h

typedefs still need to be fixed up.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 65452d1f
...@@ -21,49 +21,33 @@ ...@@ -21,49 +21,33 @@
* *
*/ */
#ifndef __VMBUSCHANNELINTERFACE_H
#define __VMBUSCHANNELINTERFACE_H
#pragma once /*
/* allow nameless unions */ * A revision number of vmbus that is used for ensuring both ends on a
/* #pragma warning(disable : 4201) */ * partition are using compatible versions.
*/
/* A revision number of vmbus that is used for ensuring both ends on a */
/* partition are using compatible versions. */
#define VMBUS_REVISION_NUMBER 13 #define VMBUS_REVISION_NUMBER 13
/* Make maximum size of pipe payload of 16K */ /* Make maximum size of pipe payload of 16K */
#define MAX_PIPE_DATA_PAYLOAD (sizeof(u8) * 16384)
#define MAX_PIPE_DATA_PAYLOAD (sizeof(BYTE) * 16384)
/* Define PipeMode values. */ /* Define PipeMode values. */
#define VMBUS_PIPE_TYPE_BYTE 0x00000000 #define VMBUS_PIPE_TYPE_BYTE 0x00000000
#define VMBUS_PIPE_TYPE_MESSAGE 0x00000004 #define VMBUS_PIPE_TYPE_MESSAGE 0x00000004
/* The size of the user defined data buffer for non-pipe offers. */ /* The size of the user defined data buffer for non-pipe offers. */
#define MAX_USER_DEFINED_BYTES 120 #define MAX_USER_DEFINED_BYTES 120
/* The size of the user defined data buffer for pipe offers. */ /* The size of the user defined data buffer for pipe offers. */
#define MAX_PIPE_USER_DEFINED_BYTES 116 #define MAX_PIPE_USER_DEFINED_BYTES 116
/*
* At the center of the Channel Management library is the Channel Offer. This
/* At the center of the Channel Management library is */ * struct contains the fundamental information about an offer.
/* the Channel Offer. This struct contains the */ */
/* fundamental information about an offer. */ typedef struct {
#pragma pack(push,1)
typedef struct
{
struct hv_guid InterfaceType; struct hv_guid InterfaceType;
struct hv_guid InterfaceInstance; struct hv_guid InterfaceInstance;
u64 InterruptLatencyIn100nsUnits; u64 InterruptLatencyIn100nsUnits;
...@@ -72,38 +56,30 @@ typedef struct ...@@ -72,38 +56,30 @@ typedef struct
u16 ChannelFlags; u16 ChannelFlags;
u16 MmioMegabytes; /* in bytes * 1024 * 1024 */ u16 MmioMegabytes; /* in bytes * 1024 * 1024 */
union union {
{
/* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */ /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
struct {
struct
{
unsigned char UserDefined[MAX_USER_DEFINED_BYTES]; unsigned char UserDefined[MAX_USER_DEFINED_BYTES];
} Standard; } Standard;
/*
/* Pipes: The following sructure is an integrated pipe protocol, which */ * Pipes:
/* is implemented on top of standard user-defined data. Pipe clients */ * The following sructure is an integrated pipe protocol, which
/* have MAX_PIPE_USER_DEFINED_BYTES left for their own use. */ * is implemented on top of standard user-defined data. Pipe
* clients have MAX_PIPE_USER_DEFINED_BYTES left for their own
struct * use.
{ */
struct {
u32 PipeMode; u32 PipeMode;
unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES]; unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
} Pipe; } Pipe;
} u; } u;
u32 Padding; u32 Padding;
} VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER; } __attribute__((packed)) VMBUS_CHANNEL_OFFER, *PVMBUS_CHANNEL_OFFER;
#pragma pack(pop)
typedef u32 GPADL_HANDLE; typedef u32 GPADL_HANDLE;
/* Server Flags */ /* Server Flags */
#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE 1 #define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE 1
#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES 2 #define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES 2
#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS 4 #define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS 4
...@@ -112,10 +88,4 @@ typedef u32 GPADL_HANDLE; ...@@ -112,10 +88,4 @@ typedef u32 GPADL_HANDLE;
#define VMBUS_CHANNEL_PARENT_OFFER 0x200 #define VMBUS_CHANNEL_PARENT_OFFER 0x200
#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION 0x400 #define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION 0x400
/* TEMPTEMP -- move this next define to devioctl.h some day */
#ifndef FILE_DEVICE_VMBUS
#define FILE_DEVICE_VMBUS 0x0000003E
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment