Commit d2aaba45 authored by Hank Janssen's avatar Hank Janssen Committed by Greg Kroah-Hartman

staging: hv: Convert camel case struct fields in vstorage.h to lowercase

Convert camel case struct fields in vstorage.h to lowercase
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 37db5264
This diff is collapsed.
...@@ -27,15 +27,17 @@ ...@@ -27,15 +27,17 @@
#define REVISION_STRING(REVISION_) #REVISION_ #define REVISION_STRING(REVISION_) #REVISION_
#define FILL_VMSTOR_REVISION(RESULT_LVALUE_) \ #define FILL_VMSTOR_REVISION(RESULT_LVALUE_) \
{ \ do { \
char *revisionString = REVISION_STRING($Revision : 6 $) + 11; \ char *revision_string \
= REVISION_STRING($Rev : 6 $) + 6; \
RESULT_LVALUE_ = 0; \ RESULT_LVALUE_ = 0; \
while (*revisionString >= '0' && *revisionString <= '9') { \ while (*revision_string >= '0' \
&& *revision_string <= '9') { \
RESULT_LVALUE_ *= 10; \ RESULT_LVALUE_ *= 10; \
RESULT_LVALUE_ += *revisionString - '0'; \ RESULT_LVALUE_ += *revision_string - '0'; \
revisionString++; \ revision_string++; \
} \ } \
} } while (0)
/* Major/minor macros. Minor version is in LSB, meaning that earlier flat */ /* Major/minor macros. Minor version is in LSB, meaning that earlier flat */
/* version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). */ /* version numbers will be interpreted as "0.x" (i.e., 1 becomes 0.1). */
...@@ -65,17 +67,17 @@ ...@@ -65,17 +67,17 @@
/* Packet structure describing virtual storage requests. */ /* Packet structure describing virtual storage requests. */
enum vstor_packet_operation { enum vstor_packet_operation {
VStorOperationCompleteIo = 1, VSTOR_OPERATION_COMPLETE_IO = 1,
VStorOperationRemoveDevice = 2, VSTOR_OPERATION_REMOVE_DEVICE = 2,
VStorOperationExecuteSRB = 3, VSTOR_OPERATION_EXECUTE_SRB = 3,
VStorOperationResetLun = 4, VSTOR_OPERATION_RESET_LUN = 4,
VStorOperationResetAdapter = 5, VSTOR_OPERATION_RESET_ADAPTER = 5,
VStorOperationResetBus = 6, VSTOR_OPERATION_RESET_BUS = 6,
VStorOperationBeginInitialization = 7, VSTOR_OPERATION_BEGIN_INITIALIZATION = 7,
VStorOperationEndInitialization = 8, VSTOR_OPERATION_END_INITIALIZATION = 8,
VStorOperationQueryProtocolVersion = 9, VSTOR_OPERATION_QUERY_PROTOCOL_VERSION = 9,
VStorOperationQueryProperties = 10, VSTOR_OPERATION_QUERY_PROPERTIES = 10,
VStorOperationMaximum = 10 VSTOR_OPERATION_MAXIMUM = 10
}; };
/* /*
...@@ -89,31 +91,29 @@ enum vstor_packet_operation { ...@@ -89,31 +91,29 @@ enum vstor_packet_operation {
#define SENSE_BUFFER_SIZE 0x12 #define SENSE_BUFFER_SIZE 0x12
#endif #endif
#define MAX_DATA_BUFFER_LENGTH_WITH_PADDING 0x14 #define MAX_DATA_BUF_LEN_WITH_PADDING 0x14
struct vmscsi_request { struct vmscsi_request {
unsigned short Length; unsigned short length;
unsigned char SrbStatus; unsigned char srb_status;
unsigned char ScsiStatus; unsigned char scsi_status;
unsigned char PortNumber; unsigned char port_number;
unsigned char PathId; unsigned char path_id;
unsigned char TargetId; unsigned char target_id;
unsigned char Lun; unsigned char lun;
unsigned char CdbLength; unsigned char cdb_length;
unsigned char SenseInfoLength; unsigned char sense_info_length;
unsigned char DataIn; unsigned char data_in;
unsigned char Reserved; unsigned char reserved;
unsigned int DataTransferLength; unsigned int data_transfer_length;
union { union {
unsigned char Cdb[CDB16GENERIC_LENGTH]; unsigned char cdb[CDB16GENERIC_LENGTH];
unsigned char sense_data[SENSE_BUFFER_SIZE];
unsigned char SenseData[SENSE_BUFFER_SIZE]; unsigned char reserved_array[MAX_DATA_BUF_LEN_WITH_PADDING];
unsigned char ReservedArray[MAX_DATA_BUFFER_LENGTH_WITH_PADDING];
}; };
} __attribute((packed)); } __attribute((packed));
...@@ -123,24 +123,24 @@ struct vmscsi_request { ...@@ -123,24 +123,24 @@ struct vmscsi_request {
* properties of the channel. * properties of the channel.
*/ */
struct vmstorage_channel_properties { struct vmstorage_channel_properties {
unsigned short ProtocolVersion; unsigned short protocol_version;
unsigned char PathId; unsigned char path_id;
unsigned char TargetId; unsigned char target_id;
/* Note: port number is only really known on the client side */ /* Note: port number is only really known on the client side */
unsigned int PortNumber; unsigned int port_number;
unsigned int Flags; unsigned int flags;
unsigned int MaxTransferBytes; unsigned int max_transfer_bytes;
/* This id is unique for each channel and will correspond with */ /* This id is unique for each channel and will correspond with */
/* vendor specific data in the inquirydata */ /* vendor specific data in the inquirydata */
unsigned long long UniqueId; unsigned long long unique_id;
} __attribute__((packed)); } __attribute__((packed));
/* This structure is sent during the storage protocol negotiations. */ /* This structure is sent during the storage protocol negotiations. */
struct vmstorage_protocol_version { struct vmstorage_protocol_version {
/* Major (MSW) and minor (LSW) version numbers. */ /* Major (MSW) and minor (LSW) version numbers. */
unsigned short MajorMinor; unsigned short major_minor;
/* /*
* Revision number is auto-incremented whenever this file is changed * Revision number is auto-incremented whenever this file is changed
...@@ -148,7 +148,7 @@ struct vmstorage_protocol_version { ...@@ -148,7 +148,7 @@ struct vmstorage_protocol_version {
* definitely indicate incompatibility--but it does indicate mismatched * definitely indicate incompatibility--but it does indicate mismatched
* builds. * builds.
*/ */
unsigned short Revision; unsigned short revision;
} __attribute__((packed)); } __attribute__((packed));
/* Channel Property Flags */ /* Channel Property Flags */
...@@ -157,13 +157,13 @@ struct vmstorage_protocol_version { ...@@ -157,13 +157,13 @@ struct vmstorage_protocol_version {
struct vstor_packet { struct vstor_packet {
/* Requested operation type */ /* Requested operation type */
enum vstor_packet_operation Operation; enum vstor_packet_operation operation;
/* Flags - see below for values */ /* Flags - see below for values */
unsigned int Flags; unsigned int flags;
/* Status of the request returned from the server side. */ /* Status of the request returned from the server side. */
unsigned int Status; unsigned int status;
/* Data payload area */ /* Data payload area */
union { union {
...@@ -171,13 +171,13 @@ struct vstor_packet { ...@@ -171,13 +171,13 @@ struct vstor_packet {
* Structure used to forward SCSI commands from the * Structure used to forward SCSI commands from the
* client to the server. * client to the server.
*/ */
struct vmscsi_request VmSrb; struct vmscsi_request vm_srb;
/* Structure used to query channel properties. */ /* Structure used to query channel properties. */
struct vmstorage_channel_properties StorageChannelProperties; struct vmstorage_channel_properties storage_channel_properties;
/* Used during version negotiations. */ /* Used during version negotiations. */
struct vmstorage_protocol_version Version; struct vmstorage_protocol_version version;
}; };
} __attribute__((packed)); } __attribute__((packed));
......
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