Skip to content

L
linux-davinci
Commit 88a3716f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: hv: rndis.h: codingstyle fixes 

This fixes all of the coding style issues in rndis.h with the
exception of the typedefs.  That comes next.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c488bd74
Show whitespace changes
Inline Side-by-side
Showing with 475 additions and 638 deletions
drivers/staging/hv/rndis.h
View file @ 88a3716f
......@@ -128,15 +128,8 @@
#define RNDIS_STATUS_TOKEN_RING_OPEN_ERROR (0xC0011000L)
/* Object Identifiers used by NdisRequest Query/Set Information */
/* General Objects */
#define RNDIS_OID_GEN_SUPPORTED_LIST 0x00010101
#define RNDIS_OID_GEN_HARDWARE_STATUS 0x00010102
#define RNDIS_OID_GEN_MEDIA_SUPPORTED 0x00010103
......@@ -189,10 +182,8 @@
#define RNDIS_OID_GEN_GET_TIME_CAPS 0x0002020F
#define RNDIS_OID_GEN_GET_NETCARD_TIME 0x00020210
/* These are connection-oriented general OIDs. */
/* These replace the above OIDs for connection-oriented media. */
#define RNDIS_OID_GEN_CO_SUPPORTED_LIST 0x00010101
#define RNDIS_OID_GEN_CO_HARDWARE_STATUS 0x00010102
#define RNDIS_OID_GEN_CO_MEDIA_SUPPORTED 0x00010103
......@@ -210,9 +201,7 @@
#define RNDIS_OID_GEN_CO_GET_TIME_CAPS 0x00010201
#define RNDIS_OID_GEN_CO_GET_NETCARD_TIME 0x00010202
/* These are connection-oriented statistics OIDs. */
#define RNDIS_OID_GEN_CO_XMIT_PDUS_OK 0x00020101
#define RNDIS_OID_GEN_CO_RCV_PDUS_OK 0x00020102
#define RNDIS_OID_GEN_CO_XMIT_PDUS_ERROR 0x00020103
......@@ -227,9 +216,7 @@
#define RNDIS_OID_GEN_CO_BYTES_XMIT_OUTSTANDING 0x00020205
#define RNDIS_OID_GEN_CO_NETCARD_LOAD 0x00020206
/* These are objects for Connection-oriented media call-managers. */
#define RNDIS_OID_CO_ADD_PVC 0xFF000001
#define RNDIS_OID_CO_DELETE_PVC 0xFF000002
#define RNDIS_OID_CO_GET_CALL_INFORMATION 0xFF000003
......@@ -240,19 +227,13 @@
#define RNDIS_OID_CO_SIGNALING_ENABLED 0xFF000008
#define RNDIS_OID_CO_SIGNALING_DISABLED 0xFF000009
/* 802.3 Objects (Ethernet) */
#define RNDIS_OID_802_3_PERMANENT_ADDRESS 0x01010101
#define RNDIS_OID_802_3_CURRENT_ADDRESS 0x01010102
#define RNDIS_OID_802_3_MULTICAST_LIST 0x01010103
#define RNDIS_OID_802_3_MAXIMUM_LIST_SIZE 0x01010104
#define RNDIS_OID_802_3_MAC_OPTIONS 0x01010105
#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001
#define RNDIS_OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101
......@@ -267,10 +248,7 @@
#define RNDIS_OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206
#define RNDIS_OID_802_3_XMIT_LATE_COLLISIONS 0x01020207
/* Remote NDIS message types */
#define REMOTE_NDIS_PACKET_MSG 0x00000001
#define REMOTE_NDIS_INITIALIZE_MSG 0x00000002
#define REMOTE_NDIS_HALT_MSG 0x00000003
......@@ -286,7 +264,6 @@
#define REMOTE_CONDIS_MP_DEACTIVATE_VC_MSG 0x00008006
#define REMOTE_CONDIS_INDICATE_STATUS_MSG 0x00008007
/* Remote NDIS message completion types */
#define REMOTE_NDIS_INITIALIZE_CMPLT 0x80000002
#define REMOTE_NDIS_QUERY_CMPLT 0x80000004
......@@ -299,24 +276,18 @@
#define REMOTE_CONDIS_MP_ACTIVATE_VC_CMPLT 0x80008005
#define REMOTE_CONDIS_MP_DEACTIVATE_VC_CMPLT 0x80008006
/* Reserved message type for private communication between lower-layer */
/* host driver and remote device, if necessary. */
/*
* Reserved message type for private communication between lower-layer host
* driver and remote device, if necessary.
*/
#define REMOTE_NDIS_BUS_MSG 0xff000001
/* Defines for DeviceFlags in RNDIS_INITIALIZE_COMPLETE */
#define RNDIS_DF_CONNECTIONLESS 0x00000001
#define RNDIS_DF_CONNECTION_ORIENTED 0x00000002
#define RNDIS_DF_RAW_DATA 0x00000004
/* Remote NDIS medium types. */
#define RNdisMedium802_3 0x00000000
#define RNdisMedium802_5 0x00000001
#define RNdisMediumFddi 0x00000002
......@@ -328,37 +299,29 @@
#define RNdisMediumWirelessWan 0x00000009
#define RNdisMediumIrda 0x0000000a
#define RNdisMediumCoWan 0x0000000b
#define RNdisMediumMax 0x0000000d /* Not a real medium, defined as an upper-bound */
/* Not a real medium, defined as an upper-bound */
#define RNdisMediumMax 0x0000000d
/* Remote NDIS medium connection states. */
#define RNdisMediaStateConnected 0x00000000
#define RNdisMediaStateDisconnected 0x00000001
/* Remote NDIS version numbers */
#define RNDIS_MAJOR_VERSION 0x00000001
#define RNDIS_MINOR_VERSION 0x00000000
/* NdisInitialize message */
typedef struct _RNDIS_INITIALIZE_REQUEST
{
typedef struct _RNDIS_INITIALIZE_REQUEST {
u32 RequestId;
u32 MajorVersion;
u32 MinorVersion;
u32 MaxTransferSize;
} RNDIS_INITIALIZE_REQUEST, *PRNDIS_INITIALIZE_REQUEST;
/* Response to NdisInitialize */
typedef struct _RNDIS_INITIALIZE_COMPLETE
{
typedef struct _RNDIS_INITIALIZE_COMPLETE {
u32 RequestId;
u32 Status;
u32 MajorVersion;
......@@ -372,33 +335,21 @@ typedef struct _RNDIS_INITIALIZE_COMPLETE
u32 AFListSize;
} RNDIS_INITIALIZE_COMPLETE, *PRNDIS_INITIALIZE_COMPLETE;
/* Call manager devices only: Information about an address family */
/* supported by the device is appended to the response to NdisInitialize. */
typedef struct _RNDIS_CO_ADDRESS_FAMILY
{
typedef struct _RNDIS_CO_ADDRESS_FAMILY {
u32 AddressFamily;
u32 MajorVersion;
u32 MinorVersion;
} RNDIS_CO_ADDRESS_FAMILY, *PRNDIS_CO_ADDRESS_FAMILY;
/* NdisHalt message */
typedef struct _RNDIS_HALT_REQUEST
{
typedef struct _RNDIS_HALT_REQUEST {
u32 RequestId;
} RNDIS_HALT_REQUEST, *PRNDIS_HALT_REQUEST;
/* NdisQueryRequest message */
typedef struct _RNDIS_QUERY_REQUEST
{
typedef struct _RNDIS_QUERY_REQUEST {
u32 RequestId;
u32 Oid;
u32 InformationBufferLength;
......@@ -406,24 +357,16 @@ typedef struct _RNDIS_QUERY_REQUEST
u32 DeviceVcHandle;
} RNDIS_QUERY_REQUEST, *PRNDIS_QUERY_REQUEST;
/* Response to NdisQueryRequest */
typedef struct _RNDIS_QUERY_COMPLETE
{
typedef struct _RNDIS_QUERY_COMPLETE {
u32 RequestId;
u32 Status;
u32 InformationBufferLength;
u32 InformationBufferOffset;
} RNDIS_QUERY_COMPLETE, *PRNDIS_QUERY_COMPLETE;
/* NdisSetRequest message */
typedef struct _RNDIS_SET_REQUEST
{
typedef struct _RNDIS_SET_REQUEST {
u32 RequestId;
u32 Oid;
u32 InformationBufferLength;
......@@ -431,85 +374,54 @@ typedef struct _RNDIS_SET_REQUEST
u32 DeviceVcHandle;
} RNDIS_SET_REQUEST, *PRNDIS_SET_REQUEST;
/* Response to NdisSetRequest */
typedef struct _RNDIS_SET_COMPLETE
{
typedef struct _RNDIS_SET_COMPLETE {
u32 RequestId;
u32 Status;
} RNDIS_SET_COMPLETE, *PRNDIS_SET_COMPLETE;
/* NdisReset message */
typedef struct _RNDIS_RESET_REQUEST
{
typedef struct _RNDIS_RESET_REQUEST {
u32 Reserved;
} RNDIS_RESET_REQUEST, *PRNDIS_RESET_REQUEST;
/* Response to NdisReset */
typedef struct _RNDIS_RESET_COMPLETE
{
typedef struct _RNDIS_RESET_COMPLETE {
u32 Status;
u32 AddressingReset;
} RNDIS_RESET_COMPLETE, *PRNDIS_RESET_COMPLETE;
/* NdisMIndicateStatus message */
typedef struct _RNDIS_INDICATE_STATUS
{
typedef struct _RNDIS_INDICATE_STATUS {
u32 Status;
u32 StatusBufferLength;
u32 StatusBufferOffset;
} RNDIS_INDICATE_STATUS, *PRNDIS_INDICATE_STATUS;
/* Diagnostic information passed as the status buffer in */
/* RNDIS_INDICATE_STATUS messages signifying error conditions. */
typedef struct _RNDIS_DIAGNOSTIC_INFO
{
typedef struct _RNDIS_DIAGNOSTIC_INFO {
u32 DiagStatus;
u32 ErrorOffset;
} RNDIS_DIAGNOSTIC_INFO, *PRNDIS_DIAGNOSTIC_INFO;
/* NdisKeepAlive message */
typedef struct _RNDIS_KEEPALIVE_REQUEST
{
typedef struct _RNDIS_KEEPALIVE_REQUEST {
u32 RequestId;
} RNDIS_KEEPALIVE_REQUEST, *PRNDIS_KEEPALIVE_REQUEST;
/* Response to NdisKeepAlive */
typedef struct _RNDIS_KEEPALIVE_COMPLETE
{
typedef struct _RNDIS_KEEPALIVE_COMPLETE {
u32 RequestId;
u32 Status;
} RNDIS_KEEPALIVE_COMPLETE, *PRNDIS_KEEPALIVE_COMPLETE;
/* Data message. All Offset fields contain byte offsets from the beginning */
/* of the RNDIS_PACKET structure. All Length fields are in bytes. */
/* VcHandle is set to 0 for connectionless data, otherwise it */
/* contains the VC handle. */
typedef struct _RNDIS_PACKET
{
/*
* Data message. All Offset fields contain byte offsets from the beginning of
* the RNDIS_PACKET structure. All Length fields are in bytes. VcHandle is set
* to 0 for connectionless data, otherwise it contains the VC handle.
*/
typedef struct _RNDIS_PACKET {
u32 DataOffset;
u32 DataLength;
u32 OOBDataOffset;
......@@ -521,33 +433,23 @@ typedef struct _RNDIS_PACKET
u32 Reserved;
} RNDIS_PACKET, *PRNDIS_PACKET;
/* Optional Out of Band data associated with a Data message. */
typedef struct _RNDIS_OOBD
{
typedef struct _RNDIS_OOBD {
u32 Size;
u32 Type;
u32 ClassInformationOffset;
} RNDIS_OOBD, *PRNDIS_OOBD;
/* Packet extension field contents associated with a Data message. */
typedef struct _RNDIS_PER_PACKET_INFO
{
typedef struct _RNDIS_PER_PACKET_INFO {
u32 Size;
u32 Type;
u32 PerPacketInformationOffset;
} RNDIS_PER_PACKET_INFO, *PRNDIS_PER_PACKET_INFO;
/* Format of Information buffer passed in a SetRequest for the OID */
/* OID_GEN_RNDIS_CONFIG_PARAMETER. */
typedef struct _RNDIS_CONFIG_PARAMETER_INFO
{
typedef struct _RNDIS_CONFIG_PARAMETER_INFO {
u32 ParameterNameOffset;
u32 ParameterNameLength;
u32 ParameterType;
......@@ -555,62 +457,40 @@ typedef struct _RNDIS_CONFIG_PARAMETER_INFO
u32 ParameterValueLength;
} RNDIS_CONFIG_PARAMETER_INFO, *PRNDIS_CONFIG_PARAMETER_INFO;
/* Values for ParameterType in RNDIS_CONFIG_PARAMETER_INFO */
#define RNDIS_CONFIG_PARAM_TYPE_INTEGER 0
#define RNDIS_CONFIG_PARAM_TYPE_STRING 2
/* CONDIS Miniport messages for connection oriented devices */
/* that do not implement a call manager. */
/* CoNdisMiniportCreateVc message */
typedef struct _RCONDIS_MP_CREATE_VC
{
typedef struct _RCONDIS_MP_CREATE_VC {
u32 RequestId;
u32 NdisVcHandle;
} RCONDIS_MP_CREATE_VC, *PRCONDIS_MP_CREATE_VC;
/* Response to CoNdisMiniportCreateVc */
typedef struct _RCONDIS_MP_CREATE_VC_COMPLETE
{
typedef struct _RCONDIS_MP_CREATE_VC_COMPLETE {
u32 RequestId;
u32 DeviceVcHandle;
u32 Status;
} RCONDIS_MP_CREATE_VC_COMPLETE, *PRCONDIS_MP_CREATE_VC_COMPLETE;
/* CoNdisMiniportDeleteVc message */
typedef struct _RCONDIS_MP_DELETE_VC
{
typedef struct _RCONDIS_MP_DELETE_VC {
u32 RequestId;
u32 DeviceVcHandle;
} RCONDIS_MP_DELETE_VC, *PRCONDIS_MP_DELETE_VC;
/* Response to CoNdisMiniportDeleteVc */
typedef struct _RCONDIS_MP_DELETE_VC_COMPLETE
{
typedef struct _RCONDIS_MP_DELETE_VC_COMPLETE {
u32 RequestId;
u32 Status;
} RCONDIS_MP_DELETE_VC_COMPLETE, *PRCONDIS_MP_DELETE_VC_COMPLETE;
/* CoNdisMiniportQueryRequest message */
typedef struct _RCONDIS_MP_QUERY_REQUEST
{
typedef struct _RCONDIS_MP_QUERY_REQUEST {
u32 RequestId;
u32 RequestType;
u32 Oid;
......@@ -619,12 +499,8 @@ typedef struct _RCONDIS_MP_QUERY_REQUEST
u32 InformationBufferOffset;
} RCONDIS_MP_QUERY_REQUEST, *PRCONDIS_MP_QUERY_REQUEST;
/* CoNdisMiniportSetRequest message */
typedef struct _RCONDIS_MP_SET_REQUEST
{
typedef struct _RCONDIS_MP_SET_REQUEST {
u32 RequestId;
u32 RequestType;
u32 Oid;
......@@ -633,41 +509,29 @@ typedef struct _RCONDIS_MP_SET_REQUEST
u32 InformationBufferOffset;
} RCONDIS_MP_SET_REQUEST, *PRCONDIS_MP_SET_REQUEST;
/* CoNdisIndicateStatus message */
typedef struct _RCONDIS_INDICATE_STATUS
{
typedef struct _RCONDIS_INDICATE_STATUS {
u32 NdisVcHandle;
u32 Status;
u32 StatusBufferLength;
u32 StatusBufferOffset;
} RCONDIS_INDICATE_STATUS, *PRCONDIS_INDICATE_STATUS;
/* CONDIS Call/VC parameters */
typedef struct _RCONDIS_SPECIFIC_PARAMETERS
{
typedef struct _RCONDIS_SPECIFIC_PARAMETERS {
u32 ParameterType;
u32 ParameterLength;
u32 ParameterOffset;
} RCONDIS_SPECIFIC_PARAMETERS, *PRCONDIS_SPECIFIC_PARAMETERS;
typedef struct _RCONDIS_MEDIA_PARAMETERS
{
typedef struct _RCONDIS_MEDIA_PARAMETERS {
u32 Flags;
u32 Reserved1;
u32 Reserved2;
RCONDIS_SPECIFIC_PARAMETERS MediaSpecific;
} RCONDIS_MEDIA_PARAMETERS, *PRCONDIS_MEDIA_PARAMETERS;
typedef struct _RNDIS_FLOWSPEC
{
typedef struct _RNDIS_FLOWSPEC {
u32 TokenRate;
u32 TokenBucketSize;
u32 PeakBandwidth;
......@@ -678,18 +542,14 @@ typedef struct _RNDIS_FLOWSPEC
u32 MinimumPolicedSize;
} RNDIS_FLOWSPEC, *PRNDIS_FLOWSPEC;
typedef struct _RCONDIS_CALL_MANAGER_PARAMETERS
{
typedef struct _RCONDIS_CALL_MANAGER_PARAMETERS {
RNDIS_FLOWSPEC Transmit;
RNDIS_FLOWSPEC Receive;
RCONDIS_SPECIFIC_PARAMETERS CallMgrSpecific;
} RCONDIS_CALL_MANAGER_PARAMETERS, *PRCONDIS_CALL_MANAGER_PARAMETERS;
/* CoNdisMiniportActivateVc message */
typedef struct _RCONDIS_MP_ACTIVATE_VC_REQUEST
{
typedef struct _RCONDIS_MP_ACTIVATE_VC_REQUEST {
u32 RequestId;
u32 Flags;
u32 DeviceVcHandle;
......@@ -699,41 +559,28 @@ typedef struct _RCONDIS_MP_ACTIVATE_VC_REQUEST
u32 CallMgrParamsLength;
} RCONDIS_MP_ACTIVATE_VC_REQUEST, *PRCONDIS_MP_ACTIVATE_VC_REQUEST;
/* Response to CoNdisMiniportActivateVc */
typedef struct _RCONDIS_MP_ACTIVATE_VC_COMPLETE
{
typedef struct _RCONDIS_MP_ACTIVATE_VC_COMPLETE {
u32 RequestId;
u32 Status;
} RCONDIS_MP_ACTIVATE_VC_COMPLETE, *PRCONDIS_MP_ACTIVATE_VC_COMPLETE;
/* CoNdisMiniportDeactivateVc message */
typedef struct _RCONDIS_MP_DEACTIVATE_VC_REQUEST
{
typedef struct _RCONDIS_MP_DEACTIVATE_VC_REQUEST {
u32 RequestId;
u32 Flags;
u32 DeviceVcHandle;
} RCONDIS_MP_DEACTIVATE_VC_REQUEST, *PRCONDIS_MP_DEACTIVATE_VC_REQUEST;
/* Response to CoNdisMiniportDeactivateVc */
typedef struct _RCONDIS_MP_DEACTIVATE_VC_COMPLETE
{
typedef struct _RCONDIS_MP_DEACTIVATE_VC_COMPLETE {
u32 RequestId;
u32 Status;
} RCONDIS_MP_DEACTIVATE_VC_COMPLETE, *PRCONDIS_MP_DEACTIVATE_VC_COMPLETE;
/* union with all of the RNDIS messages */
typedef union _RNDIS_MESSAGE_CONTAINER
{
typedef union _RNDIS_MESSAGE_CONTAINER {
RNDIS_PACKET Packet;
RNDIS_INITIALIZE_REQUEST InitializeRequest;
RNDIS_HALT_REQUEST HaltRequest;
......@@ -756,37 +603,27 @@ typedef union _RNDIS_MESSAGE_CONTAINER
RCONDIS_MP_DELETE_VC_COMPLETE CoMiniportDeleteVcComplete;
RCONDIS_MP_ACTIVATE_VC_COMPLETE CoMiniportActivateVcComplete;
RCONDIS_MP_DEACTIVATE_VC_COMPLETE CoMiniportDeactivateVcComplete;
} RNDIS_MESSAGE_CONTAINER, *PRNDIS_MESSAGE_CONTAINER;
/* Remote NDIS message format */
typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE
{
typedef __struct_bcount(MessageLength) struct _RNDIS_MESSAGE {
u32 NdisMessageType;
/* Total length of this message, from the beginning */
/* of the RNDIS_MESSAGE struct, in bytes. */
u32 MessageLength;
/* Actual message */
RNDIS_MESSAGE_CONTAINER Message;
} RNDIS_MESSAGE, *PRNDIS_MESSAGE;
/* Handy macros */
/* get the size of an RNDIS message. Pass in the message type, */
/* RNDIS_SET_REQUEST, RNDIS_PACKET for example */
#define RNDIS_MESSAGE_SIZE(Message) \
(sizeof(Message) + (sizeof(RNDIS_MESSAGE) - sizeof(RNDIS_MESSAGE_CONTAINER)))
(sizeof(Message) + (sizeof(RNDIS_MESSAGE) - \
sizeof(RNDIS_MESSAGE_CONTAINER)))
/* get pointer to info buffer with message pointer */
#define MESSAGE_TO_INFO_BUFFER(Message) \
......
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