Commit f207671f authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman

staging: unisys: refactor ULTRA_DIAG_CHANNEL_PROTOCOL

Get rid of the typedef and use struct spar_diag_channel_protocol instead. Fix
CamelCase member names, and update references and comments to match.

struct channel_header CommonChannelHeader;
QueueHeader => queue_header
DiagChannelHeader => diag_channel_header
Events => events
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f0a528b
...@@ -62,14 +62,14 @@ static const uuid_le spar_diag_channel_protocol_uuid = ...@@ -62,14 +62,14 @@ static const uuid_le spar_diag_channel_protocol_uuid =
(spar_check_channel_client(ch,\ (spar_check_channel_client(ch,\
spar_diag_channel_protocol_uuid,\ spar_diag_channel_protocol_uuid,\
"diag",\ "diag",\
sizeof(ULTRA_DIAG_CHANNEL_PROTOCOL),\ sizeof(struct spar_diag_channel_protocol),\
ULTRA_DIAG_CHANNEL_PROTOCOL_VERSIONID,\ ULTRA_DIAG_CHANNEL_PROTOCOL_VERSIONID,\
ULTRA_DIAG_CHANNEL_PROTOCOL_SIGNATURE)) ULTRA_DIAG_CHANNEL_PROTOCOL_SIGNATURE))
#define SPAR_DIAG_CHANNEL_OK_SERVER(bytes)\ #define SPAR_DIAG_CHANNEL_OK_SERVER(bytes)\
(spar_check_channel_server(spar_diag_channel_protocol_uuid,\ (spar_check_channel_server(spar_diag_channel_protocol_uuid,\
"diag",\ "diag",\
sizeof(ULTRA_DIAG_CHANNEL_PROTOCOL),\ sizeof(struct spar_diag_channel_protocol),\
bytes)) bytes))
#define MAX_MODULE_NAME_SIZE 128 /* Maximum length of module name... */ #define MAX_MODULE_NAME_SIZE 128 /* Maximum length of module name... */
...@@ -398,7 +398,7 @@ struct diag_channel_protocol_header { ...@@ -398,7 +398,7 @@ struct diag_channel_protocol_header {
#define DIAG_CH_LRG_SIZE (2 * DIAG_CH_SIZE) /* 8 MB */ #define DIAG_CH_LRG_SIZE (2 * DIAG_CH_SIZE) /* 8 MB */
/* /*
* Structure: ULTRA_DIAG_CHANNEL_PROTOCOL * Structure: spar_diag_channel_protocol
* *
* Purpose: Contains attributes that make up the DIAG_CHANNEL memory. * Purpose: Contains attributes that make up the DIAG_CHANNEL memory.
* *
...@@ -416,13 +416,12 @@ struct diag_channel_protocol_header { ...@@ -416,13 +416,12 @@ struct diag_channel_protocol_header {
* *
*Reserved: Reserved area to allow for correct channel size padding. *Reserved: Reserved area to allow for correct channel size padding.
*/ */
typedef struct _ULTRA_DIAG_CHANNEL_PROTOCOL { struct spar_diag_channel_protocol {
struct channel_header CommonChannelHeader; struct channel_header common_channel_header;
struct signal_queue_header QueueHeader; struct signal_queue_header queue_header;
struct diag_channel_protocol_header DiagChannelHeader; struct diag_channel_protocol_header diag_channel_header;
struct diag_channel_event Events[(DIAG_CH_SIZE - DIAG_CH_EVENT_OFFSET) / struct diag_channel_event events[(DIAG_CH_SIZE - DIAG_CH_EVENT_OFFSET) /
sizeof(struct diag_channel_event)]; sizeof(struct diag_channel_event)];
} };
ULTRA_DIAG_CHANNEL_PROTOCOL;
#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