Commit a388eb17 authored by Haiyang Zhang's avatar Haiyang Zhang Committed by Greg Kroah-Hartman
Browse files

staging: hv: Convert camel cased struct fields in rndis.h to lower cases

parent 53d21fdb
Loading
Loading
Loading
Loading
+177 −176
Original line number Diff line number Diff line
@@ -288,24 +288,24 @@
#define RNDIS_DF_RAW_DATA			0x00000004

/*  Remote NDIS medium types. */
#define RNdisMedium802_3			0x00000000
#define RNdisMedium802_5			0x00000001
#define RNdisMediumFddi				0x00000002
#define RNdisMediumWan				0x00000003
#define RNdisMediumLocalTalk			0x00000004
#define RNdisMediumArcnetRaw			0x00000006
#define RNdisMediumArcnet878_2			0x00000007
#define RNdisMediumAtm				0x00000008
#define RNdisMediumWirelessWan			0x00000009
#define RNdisMediumIrda				0x0000000a
#define RNdisMediumCoWan			0x0000000b
#define RNDIS_MEDIUM_802_3			0x00000000
#define RNDIS_MEDIUM_802_5			0x00000001
#define RNDIS_MEDIUM_FDDI				0x00000002
#define RNDIS_MEDIUM_WAN				0x00000003
#define RNDIS_MEDIUM_LOCAL_TALK			0x00000004
#define RNDIS_MEDIUM_ARCNET_RAW			0x00000006
#define RNDIS_MEDIUM_ARCNET_878_2			0x00000007
#define RNDIS_MEDIUM_ATM				0x00000008
#define RNDIS_MEDIUM_WIRELESS_WAN			0x00000009
#define RNDIS_MEDIUM_IRDA				0x0000000a
#define RNDIS_MEDIUM_CO_WAN			0x0000000b
/* Not a real medium, defined as an upper-bound */
#define RNdisMediumMax				0x0000000d
#define RNDIS_MEDIUM_MAX				0x0000000d


/* Remote NDIS medium connection states. */
#define RNdisMediaStateConnected		0x00000000
#define RNdisMediaStateDisconnected		0x00000001
#define RNDIS_MEDIA_STATE_CONNECTED		0x00000000
#define RNDIS_MEDIA_STATE_DISCONNECTED		0x00000001

/*  Remote NDIS version numbers */
#define RNDIS_MAJOR_VERSION			0x00000001
@@ -314,106 +314,106 @@

/* NdisInitialize message */
struct rndis_initialize_request {
	u32 RequestId;
	u32 MajorVersion;
	u32 MinorVersion;
	u32 MaxTransferSize;
	u32 req_id;
	u32 major_ver;
	u32 minor_ver;
	u32 max_xfer_size;
};

/* Response to NdisInitialize */
struct rndis_initialize_complete {
	u32 RequestId;
	u32 Status;
	u32 MajorVersion;
	u32 MinorVersion;
	u32 DeviceFlags;
	u32 Medium;
	u32 MaxPacketsPerMessage;
	u32 MaxTransferSize;
	u32 PacketAlignmentFactor;
	u32 AFListOffset;
	u32 AFListSize;
	u32 req_id;
	u32 status;
	u32 major_ver;
	u32 minor_ver;
	u32 dev_flags;
	u32 medium;
	u32 max_pkt_per_msg;
	u32 max_xfer_size;
	u32 pkt_alignment_factor;
	u32 af_list_offset;
	u32 af_list_size;
};

/* Call manager devices only: Information about an address family */
/* supported by the device is appended to the response to NdisInitialize. */
struct rndis_co_address_family {
	u32 AddressFamily;
	u32 MajorVersion;
	u32 MinorVersion;
	u32 address_family;
	u32 major_ver;
	u32 minor_ver;
};

/* NdisHalt message */
struct rndis_halt_request {
	u32 RequestId;
	u32 req_id;
};

/* NdisQueryRequest message */
struct rndis_query_request {
	u32 RequestId;
	u32 Oid;
	u32 InformationBufferLength;
	u32 InformationBufferOffset;
	u32 DeviceVcHandle;
	u32 req_id;
	u32 oid;
	u32 info_buflen;
	u32 info_buf_offset;
	u32 dev_vc_handle;
};

/* Response to NdisQueryRequest */
struct rndis_query_complete {
	u32 RequestId;
	u32 Status;
	u32 InformationBufferLength;
	u32 InformationBufferOffset;
	u32 req_id;
	u32 status;
	u32 info_buflen;
	u32 info_buf_offset;
};

/* NdisSetRequest message */
struct rndis_set_request {
	u32 RequestId;
	u32 Oid;
	u32 InformationBufferLength;
	u32 InformationBufferOffset;
	u32 DeviceVcHandle;
	u32 req_id;
	u32 oid;
	u32 info_buflen;
	u32 info_buf_offset;
	u32 dev_vc_handle;
};

/* Response to NdisSetRequest */
struct rndis_set_complete {
	u32 RequestId;
	u32 Status;
	u32 req_id;
	u32 status;
};

/* NdisReset message */
struct rndis_reset_request {
	u32 Reserved;
	u32 reserved;
};

/* Response to NdisReset */
struct rndis_reset_complete {
	u32 Status;
	u32 AddressingReset;
	u32 status;
	u32 addressing_reset;
};

/* NdisMIndicateStatus message */
struct rndis_indicate_status {
	u32 Status;
	u32 StatusBufferLength;
	u32 StatusBufferOffset;
	u32 status;
	u32 status_buflen;
	u32 status_buf_offset;
};

/* Diagnostic information passed as the status buffer in */
/* struct rndis_indicate_status messages signifying error conditions. */
struct rndis_diagnostic_info {
	u32 DiagStatus;
	u32 ErrorOffset;
	u32 diag_status;
	u32 error_offset;
};

/* NdisKeepAlive message */
struct rndis_keepalive_request {
	u32 RequestId;
	u32 req_id;
};

/* Response to NdisKeepAlive */
struct rndis_keepalive_complete {
	u32 RequestId;
	u32 Status;
	u32 req_id;
	u32 status;
};

/*
@@ -422,39 +422,39 @@ struct rndis_keepalive_complete {
 * to 0 for connectionless data, otherwise it contains the VC handle.
 */
struct rndis_packet {
	u32 DataOffset;
	u32 DataLength;
	u32 OOBDataOffset;
	u32 OOBDataLength;
	u32 NumOOBDataElements;
	u32 PerPacketInfoOffset;
	u32 PerPacketInfoLength;
	u32 VcHandle;
	u32 Reserved;
	u32 data_offset;
	u32 data_len;
	u32 oob_data_offset;
	u32 oob_data_len;
	u32 num_oob_data_elements;
	u32 per_pkt_info_offset;
	u32 per_pkt_info_len;
	u32 vc_handle;
	u32 reserved;
};

/* Optional Out of Band data associated with a Data message. */
struct rndis_oobd {
	u32 Size;
	u32 Type;
	u32 ClassInformationOffset;
	u32 size;
	u32 type;
	u32 class_info_offset;
};

/* Packet extension field contents associated with a Data message. */
struct rndis_per_packet_info {
	u32 Size;
	u32 Type;
	u32 PerPacketInformationOffset;
	u32 size;
	u32 type;
	u32 per_pkt_info_offset;
};

/* Format of Information buffer passed in a SetRequest for the OID */
/* OID_GEN_RNDIS_CONFIG_PARAMETER. */
struct rndis_config_parameter_info {
	u32 ParameterNameOffset;
	u32 ParameterNameLength;
	u32 ParameterType;
	u32 ParameterValueOffset;
	u32 ParameterValueLength;
	u32 parameter_name_offset;
	u32 parameter_name_length;
	u32 parameter_type;
	u32 parameter_value_offset;
	u32 parameter_value_length;
};

/* Values for ParameterType in struct rndis_config_parameter_info */
@@ -466,187 +466,188 @@ struct rndis_config_parameter_info {

/* CoNdisMiniportCreateVc message */
struct rcondis_mp_create_vc {
	u32 RequestId;
	u32 NdisVcHandle;
	u32 req_id;
	u32 ndis_vc_handle;
};

/* Response to CoNdisMiniportCreateVc */
struct rcondis_mp_create_vc_complete {
	u32 RequestId;
	u32 DeviceVcHandle;
	u32 Status;
	u32 req_id;
	u32 dev_vc_handle;
	u32 status;
};

/* CoNdisMiniportDeleteVc message */
struct rcondis_mp_delete_vc {
	u32 RequestId;
	u32 DeviceVcHandle;
	u32 req_id;
	u32 dev_vc_handle;
};

/* Response to CoNdisMiniportDeleteVc */
struct rcondis_mp_delete_vc_complete {
	u32 RequestId;
	u32 Status;
	u32 req_id;
	u32 status;
};

/* CoNdisMiniportQueryRequest message */
struct rcondis_mp_query_request {
	u32 RequestId;
	u32 RequestType;
	u32 Oid;
	u32 DeviceVcHandle;
	u32 InformationBufferLength;
	u32 InformationBufferOffset;
	u32 req_id;
	u32 request_type;
	u32 oid;
	u32 dev_vc_handle;
	u32 info_buflen;
	u32 info_buf_offset;
};

/* CoNdisMiniportSetRequest message */
struct rcondis_mp_set_request {
	u32 RequestId;
	u32 RequestType;
	u32 Oid;
	u32 DeviceVcHandle;
	u32 InformationBufferLength;
	u32 InformationBufferOffset;
	u32 req_id;
	u32 request_type;
	u32 oid;
	u32 dev_vc_handle;
	u32 info_buflen;
	u32 info_buf_offset;
};

/* CoNdisIndicateStatus message */
struct rcondis_indicate_status {
	u32 NdisVcHandle;
	u32 Status;
	u32 StatusBufferLength;
	u32 StatusBufferOffset;
	u32 ndis_vc_handle;
	u32 status;
	u32 status_buflen;
	u32 status_buf_offset;
};

/* CONDIS Call/VC parameters */
struct rcondis_specific_parameters {
	u32 ParameterType;
	u32 ParameterLength;
	u32 ParameterOffset;
	u32 parameter_type;
	u32 parameter_length;
	u32 parameter_lffset;
};

struct rcondis_media_parameters {
	u32 Flags;
	u32 Reserved1;
	u32 Reserved2;
	struct rcondis_specific_parameters MediaSpecific;
	u32 flags;
	u32 reserved1;
	u32 reserved2;
	struct rcondis_specific_parameters media_specific;
};

struct rndis_flowspec {
	u32 TokenRate;
	u32 TokenBucketSize;
	u32 PeakBandwidth;
	u32 Latency;
	u32 DelayVariation;
	u32 ServiceType;
	u32 MaxSduSize;
	u32 MinimumPolicedSize;
	u32 token_rate;
	u32 token_bucket_size;
	u32 peak_bandwidth;
	u32 latency;
	u32 delay_variation;
	u32 service_type;
	u32 max_sdu_size;
	u32 minimum_policed_size;
};

struct rcondis_call_manager_parameters {
	struct rndis_flowspec Transmit;
	struct rndis_flowspec Receive;
	struct rcondis_specific_parameters CallMgrSpecific;
	struct rndis_flowspec transmit;
	struct rndis_flowspec receive;
	struct rcondis_specific_parameters call_mgr_specific;
};

/* CoNdisMiniportActivateVc message */
struct rcondis_mp_activate_vc_request {
	u32 RequestId;
	u32 Flags;
	u32 DeviceVcHandle;
	u32 MediaParamsOffset;
	u32 MediaParamsLength;
	u32 CallMgrParamsOffset;
	u32 CallMgrParamsLength;
	u32 req_id;
	u32 flags;
	u32 dev_vc_handle;
	u32 media_params_offset;
	u32 media_params_length;
	u32 call_mgr_params_offset;
	u32 call_mgr_params_length;
};

/* Response to CoNdisMiniportActivateVc */
struct rcondis_mp_activate_vc_complete {
	u32 RequestId;
	u32 Status;
	u32 req_id;
	u32 status;
};

/* CoNdisMiniportDeactivateVc message */
struct rcondis_mp_deactivate_vc_request {
	u32 RequestId;
	u32 Flags;
	u32 DeviceVcHandle;
	u32 req_id;
	u32 flags;
	u32 dev_vc_handle;
};

/* Response to CoNdisMiniportDeactivateVc */
struct rcondis_mp_deactivate_vc_complete {
	u32 RequestId;
	u32 Status;
	u32 req_id;
	u32 status;
};


/* union with all of the RNDIS messages */
union rndis_message_container {
	struct rndis_packet Packet;
	struct rndis_initialize_request InitializeRequest;
	struct rndis_halt_request HaltRequest;
	struct rndis_query_request QueryRequest;
	struct rndis_set_request SetRequest;
	struct rndis_reset_request ResetRequest;
	struct rndis_keepalive_request KeepaliveRequest;
	struct rndis_indicate_status IndicateStatus;
	struct rndis_initialize_complete InitializeComplete;
	struct rndis_query_complete QueryComplete;
	struct rndis_set_complete SetComplete;
	struct rndis_reset_complete ResetComplete;
	struct rndis_keepalive_complete KeepaliveComplete;
	struct rcondis_mp_create_vc CoMiniportCreateVc;
	struct rcondis_mp_delete_vc CoMiniportDeleteVc;
	struct rcondis_indicate_status CoIndicateStatus;
	struct rcondis_mp_activate_vc_request CoMiniportActivateVc;
	struct rcondis_mp_deactivate_vc_request CoMiniportDeactivateVc;
	struct rcondis_mp_create_vc_complete CoMiniportCreateVcComplete;
	struct rcondis_mp_delete_vc_complete CoMiniportDeleteVcComplete;
	struct rcondis_mp_activate_vc_complete CoMiniportActivateVcComplete;
	struct rcondis_mp_deactivate_vc_complete CoMiniportDeactivateVcComplete;
	struct rndis_packet pkt;
	struct rndis_initialize_request init_req;
	struct rndis_halt_request halt_req;
	struct rndis_query_request query_req;
	struct rndis_set_request set_req;
	struct rndis_reset_request reset_req;
	struct rndis_keepalive_request keep_alive_req;
	struct rndis_indicate_status indicate_status;
	struct rndis_initialize_complete init_complete;
	struct rndis_query_complete query_complete;
	struct rndis_set_complete set_complete;
	struct rndis_reset_complete reset_complete;
	struct rndis_keepalive_complete keep_alive_complete;
	struct rcondis_mp_create_vc co_miniport_create_vc;
	struct rcondis_mp_delete_vc co_miniport_delete_vc;
	struct rcondis_indicate_status co_indicate_status;
	struct rcondis_mp_activate_vc_request co_miniport_activate_vc;
	struct rcondis_mp_deactivate_vc_request co_miniport_deactivate_vc;
	struct rcondis_mp_create_vc_complete co_miniport_create_vc_complete;
	struct rcondis_mp_delete_vc_complete co_miniport_delete_vc_complete;
	struct rcondis_mp_activate_vc_complete co_miniport_activate_vc_complete;
	struct rcondis_mp_deactivate_vc_complete
		co_miniport_deactivate_vc_complete;
};

/* Remote NDIS message format */
struct rndis_message {
	u32 NdisMessageType;
	u32 ndis_msg_type;

	/* Total length of this message, from the beginning */
	/* of the sruct rndis_message, in bytes. */
	u32 MessageLength;
	u32 msg_len;

	/* Actual message */
	union rndis_message_container Message;
	union rndis_message_container msg;
};

/* Handy macros */

/* get the size of an RNDIS message. Pass in the message type, */
/* struct rndis_set_request, struct rndis_packet for example */
#define RNDIS_MESSAGE_SIZE(Message)				\
	(sizeof(Message) + (sizeof(struct rndis_message) -	\
#define RNDIS_MESSAGE_SIZE(msg)				\
	(sizeof(msg) + (sizeof(struct rndis_message) -	\
	 sizeof(union rndis_message_container)))

/* get pointer to info buffer with message pointer */
#define MESSAGE_TO_INFO_BUFFER(Message)				\
	(((unsigned char *)(Message)) + Message->InformationBufferOffset)
#define MESSAGE_TO_INFO_BUFFER(msg)				\
	(((unsigned char *)(msg)) + msg->info_buf_offset)

/* get pointer to status buffer with message pointer */
#define MESSAGE_TO_STATUS_BUFFER(Message)			\
	(((unsigned char *)(Message)) + Message->StatusBufferOffset)
#define MESSAGE_TO_STATUS_BUFFER(msg)			\
	(((unsigned char *)(msg)) + msg->status_buf_offset)

/* get pointer to OOBD buffer with message pointer */
#define MESSAGE_TO_OOBD_BUFFER(Message)				\
	(((unsigned char *)(Message)) + Message->OOBDataOffset)
#define MESSAGE_TO_OOBD_BUFFER(msg)				\
	(((unsigned char *)(msg)) + msg->oob_data_offset)

/* get pointer to data buffer with message pointer */
#define MESSAGE_TO_DATA_BUFFER(Message)				\
	(((unsigned char *)(Message)) + Message->PerPacketInfoOffset)
#define MESSAGE_TO_DATA_BUFFER(msg)				\
	(((unsigned char *)(msg)) + msg->per_pkt_info_offset)

/* get pointer to contained message from NDIS_MESSAGE pointer */
#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(RndisMessage)		\
	((void *) &RndisMessage->Message)
#define RNDIS_MESSAGE_PTR_TO_MESSAGE_PTR(rndis_msg)		\
	((void *) &rndis_msg->msg)

/* get pointer to contained message from NDIS_MESSAGE pointer */
#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(RndisMessage)	\
	((void *) RndisMessage)
#define RNDIS_MESSAGE_RAW_PTR_TO_MESSAGE_PTR(rndis_msg)	\
	((void *) rndis_msg)

#endif /* _RNDIS_H_ */
+102 −102

File changed.

Preview size limit exceeded, changes collapsed.