summaryrefslogtreecommitdiffstats
path: root/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
diff options
context:
space:
mode:
authorBenjamin Romer2014-10-23 20:30:27 +0200
committerGreg Kroah-Hartman2014-10-27 03:33:11 +0100
commitf91b926273134d9bfec32d6c4fcbd5188afd07dc (patch)
tree8ec56100a62ec4001034e36f4dcbeb7b81c11328 /drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
parentstaging: unisys: refactor CONTROLVM_MESSAGE_HEADER (diff)
downloadkernel-qcow2-linux-f91b926273134d9bfec32d6c4fcbd5188afd07dc.tar.gz
kernel-qcow2-linux-f91b926273134d9bfec32d6c4fcbd5188afd07dc.tar.xz
kernel-qcow2-linux-f91b926273134d9bfec32d6c4fcbd5188afd07dc.zip
staging: unisys: refactor CONTROLVM_PACKET_DEVICE_CREATE
Get rid of the typedef for CONTROLVM_PACKET_DEVICE_CREATE, instead using struct controlvm_packet_device_create. Fix CamelCase names and update all references to changed names. Clean up comments. busNo => bus_no devNo => dev_no channelAddr => channel_addr channelBytes => channel_bytes dataTypeGuid => data_type_uuid devInstGuid => dev_inst_uuid Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h')
-rw-r--r--drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h29
1 files changed, 13 insertions, 16 deletions
diff --git a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
index abf6bc9f57d0..78c4b3366da4 100644
--- a/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
+++ b/drivers/staging/unisys/common-spar/include/channels/controlvmchannel.h
@@ -215,20 +215,17 @@ struct controlvm_message_header {
/* if non-zero, there is a payload to copy. */
};
-typedef struct _CONTROLVM_PACKET_DEVICE_CREATE {
- u32 busNo; /**< bus # (0..n-1) from the msg receiver's
- * perspective */
-
- /* Control uses header SegmentIndex field to access bus number... */
- u32 devNo; /**< bus-relative (0..n-1) device number */
- u64 channelAddr; /**< Guest physical address of the channel, which
- * can be dereferenced by the receiver
- * of this ControlVm command */
- u64 channelBytes; /**< specifies size of the channel in bytes */
- uuid_le dataTypeGuid;/**< specifies format of data in channel */
- uuid_le devInstGuid; /**< instance guid for the device */
- struct irq_info intr; /**< specifies interrupt information */
-} CONTROLVM_PACKET_DEVICE_CREATE; /* for CONTROLVM_DEVICE_CREATE */
+struct controlvm_packet_device_create {
+ u32 bus_no; /* bus # (0..n-1) from the msg receiver's end */
+ u32 dev_no; /* bus-relative (0..n-1) device number */
+ u64 channel_addr; /* Guest physical address of the channel, which
+ * can be dereferenced by the receiver of this
+ * ControlVm command */
+ u64 channel_bytes; /* specifies size of the channel in bytes */
+ uuid_le data_type_uuid; /* specifies format of data in channel */
+ uuid_le dev_inst_uuid; /* instance guid for the device */
+ struct irq_info intr; /* specifies interrupt information */
+}; /* for CONTROLVM_DEVICE_CREATE */
typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE {
u32 busNo; /**< bus # (0..n-1) from the msg
@@ -240,7 +237,7 @@ typedef struct _CONTROLVM_PACKET_DEVICE_CONFIGURE {
typedef struct _CONTROLVM_MESSAGE_DEVICE_CREATE {
struct controlvm_message_header Header;
- CONTROLVM_PACKET_DEVICE_CREATE Packet;
+ struct controlvm_packet_device_create Packet;
} CONTROLVM_MESSAGE_DEVICE_CREATE; /* total 128 bytes */
typedef struct _CONTROLVM_MESSAGE_DEVICE_CONFIGURE {
@@ -285,7 +282,7 @@ struct controlvm_message_packet {
* sendBusInterruptHandle is kept in CP. */
} configure_bus; /* for CONTROLVM_BUS_CONFIGURE */
/* for CONTROLVM_DEVICE_CREATE */
- CONTROLVM_PACKET_DEVICE_CREATE create_device;
+ struct controlvm_packet_device_create create_device;
struct {
u32 bus_no; /* bus # (0..n-1) from the msg
* receiver's perspective */