leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: unisys: remove typedef for PARSER_CONTEXT

Browse Source 
Convert all references to PARSER_CONTEXT into struct parser_context.

Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Benjamin Romer 2015-03-16 13:57:51 -04:00 committed by Greg Kroah-Hartman
parent a18c634275
commit 317d9614a9
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/staging/unisys/visorchipset/parser.c
View File

@ -31,7 +31,7 @@
#define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128) #define MAX_CONTROLVM_PAYLOAD_BYTES (1024*128)
static ulong controlvm_payload_bytes_buffered; static ulong controlvm_payload_bytes_buffered;
struct PARSER_CONTEXT_Tag { struct parser_context {
ulong allocbytes; ulong allocbytes;
ulong param_bytes; ulong param_bytes;
u8 *curr; u8 *curr;
@ -40,13 +40,13 @@ struct PARSER_CONTEXT_Tag {
char data[0]; char data[0];
}; };
static PARSER_CONTEXT * static struct parser_context *
parser_init_guts(u64 addr, u32 bytes, BOOL isLocal, parser_init_guts(u64 addr, u32 bytes, BOOL isLocal,
BOOL hasStandardPayloadHeader, BOOL *tryAgain) BOOL hasStandardPayloadHeader, BOOL *tryAgain)
{ {
int allocbytes = sizeof(PARSER_CONTEXT) + bytes; int allocbytes = sizeof(struct parser_context) + bytes;
PARSER_CONTEXT *rc = NULL; struct parser_context *rc = NULL;
PARSER_CONTEXT *ctx = NULL; struct parser_context *ctx = NULL;
struct memregion *rgn = NULL; struct memregion *rgn = NULL;
struct spar_controlvm_parameters_header *phdr = NULL; struct spar_controlvm_parameters_header *phdr = NULL;
@ -134,7 +134,7 @@ Away:
return rc; return rc;
} }
PARSER_CONTEXT * struct parser_context *
parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain) parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
{ {
return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain); return parser_init_guts(addr, bytes, isLocal, TRUE, tryAgain);
@ -145,7 +145,7 @@ parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
* structures. Afterwards, you can call parser_simpleString_get() or * structures. Afterwards, you can call parser_simpleString_get() or
* parser_byteStream_get() to obtain the data. * parser_byteStream_get() to obtain the data.
*/ */
PARSER_CONTEXT * struct parser_context *
parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain) parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
{ {
return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain); return parser_init_guts(addr, bytes, isLocal, FALSE, tryAgain);
@ -154,7 +154,7 @@ parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain)
/* Obtain '\0'-terminated copy of string in payload area. /* Obtain '\0'-terminated copy of string in payload area.
*/ */
char * char *
parser_simpleString_get(PARSER_CONTEXT *ctx) parser_simpleString_get(struct parser_context *ctx)
{ {
if (!ctx->byte_stream) if (!ctx->byte_stream)
return NULL; return NULL;
@ -166,7 +166,7 @@ parser_simpleString_get(PARSER_CONTEXT *ctx)
/* Obtain a copy of the buffer in the payload area. /* Obtain a copy of the buffer in the payload area.
*/ */
void * void *
parser_byteStream_get(PARSER_CONTEXT *ctx, ulong *nbytes) parser_byteStream_get(struct parser_context *ctx, ulong *nbytes)
{ {
if (!ctx->byte_stream) if (!ctx->byte_stream)
return NULL; return NULL;
@ -176,7 +176,7 @@ parser_byteStream_get(PARSER_CONTEXT *ctx, ulong *nbytes)
} }
uuid_le uuid_le
parser_id_get(PARSER_CONTEXT *ctx) parser_id_get(struct parser_context *ctx)
{ {
struct spar_controlvm_parameters_header *phdr = NULL; struct spar_controlvm_parameters_header *phdr = NULL;
@ -187,7 +187,7 @@ parser_id_get(PARSER_CONTEXT *ctx)
} }
void void
parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string) parser_param_start(struct parser_context *ctx, PARSER_WHICH_STRING which_string)
{ {
struct spar_controlvm_parameters_header *phdr = NULL; struct spar_controlvm_parameters_header *phdr = NULL;
@ -220,7 +220,7 @@ Away:
} }
void void
parser_done(PARSER_CONTEXT *ctx) parser_done(struct parser_context *ctx)
{ {
if (!ctx) if (!ctx)
return; return;
@ -263,7 +263,7 @@ string_length_no_trail(char *s, int len)
* parameter * parameter
*/ */
void * void *
parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize) parser_param_get(struct parser_context *ctx, char *nam, int namesize)
{ {
u8 *pscan, *pnam = nam; u8 *pscan, *pnam = nam;
ulong nscan; ulong nscan;
@ -398,7 +398,7 @@ parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize)
} }
void * void *
parser_string_get(PARSER_CONTEXT *ctx) parser_string_get(struct parser_context *ctx)
{ {
u8 *pscan; u8 *pscan;
ulong nscan; ulong nscan;

22
drivers/staging/unisys/visorchipset/parser.h
View File

@ -30,17 +30,17 @@ typedef enum {
PARSERSTRING_NAME, PARSERSTRING_NAME,
} PARSER_WHICH_STRING; } PARSER_WHICH_STRING;
typedef struct PARSER_CONTEXT_Tag PARSER_CONTEXT; struct parser_context *parser_init(u64 addr, u32 bytes, BOOL isLocal,
BOOL *tryAgain);
PARSER_CONTEXT *parser_init(u64 addr, u32 bytes, BOOL isLocal, BOOL *tryAgain); struct parser_context *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
PARSER_CONTEXT *parser_init_byteStream(u64 addr, u32 bytes, BOOL isLocal,
BOOL *tryAgain); BOOL *tryAgain);
void parser_param_start(PARSER_CONTEXT *ctx, PARSER_WHICH_STRING which_string); void parser_param_start(struct parser_context *ctx,
void *parser_param_get(PARSER_CONTEXT *ctx, char *nam, int namesize); PARSER_WHICH_STRING which_string);
void *parser_string_get(PARSER_CONTEXT *ctx); void *parser_param_get(struct parser_context *ctx, char *nam, int namesize);
uuid_le parser_id_get(PARSER_CONTEXT *ctx); void *parser_string_get(struct parser_context *ctx);
char *parser_simpleString_get(PARSER_CONTEXT *ctx); uuid_le parser_id_get(struct parser_context *ctx);
void *parser_byteStream_get(PARSER_CONTEXT *ctx, ulong *nbytes); char *parser_simpleString_get(struct parser_context *ctx);
void parser_done(PARSER_CONTEXT *ctx); void *parser_byteStream_get(struct parser_context *ctx, ulong *nbytes);
void parser_done(struct parser_context *ctx);
#endif #endif

9
drivers/staging/unisys/visorchipset/visorchipset_main.c
View File

@ -144,7 +144,7 @@ static const char Putfile_buffer_list_pool_name[] =
*/ */
struct putfile_buffer_entry { struct putfile_buffer_entry {
struct list_head next; /* putfile_buffer_entry list */ struct list_head next; /* putfile_buffer_entry list */
PARSER_CONTEXT *parser_ctx; /* points to buffer containing input data */ struct parser_context *parser_ctx; /* points to input data buffer */
}; };
/* List of struct putfile_request *, via next_putfile_request member. /* List of struct putfile_request *, via next_putfile_request member.
@ -159,7 +159,7 @@ static LIST_HEAD(Putfile_request_list);
*/ */
struct putfile_active_buffer { struct putfile_active_buffer {
/* a payload from a controlvm message, containing a file data buffer */ /* a payload from a controlvm message, containing a file data buffer */
PARSER_CONTEXT *parser_ctx; struct parser_context *parser_ctx;
/* points within data area of parser_ctx to next byte of data */ /* points within data area of parser_ctx to next byte of data */
u8 *pnext; u8 *pnext;
/* # bytes left from <pnext> to the end of this data buffer */ /* # bytes left from <pnext> to the end of this data buffer */
@ -1134,7 +1134,8 @@ Away:
} }
static void static void
bus_configure(struct controlvm_message *inmsg, PARSER_CONTEXT *parser_ctx) bus_configure(struct controlvm_message *inmsg,
struct parser_context *parser_ctx)
{ {
struct controlvm_message_packet *cmd = &inmsg->cmd; struct controlvm_message_packet *cmd = &inmsg->cmd;
ulong busNo = cmd->configure_bus.bus_no; ulong busNo = cmd->configure_bus.bus_no;
@ -1697,7 +1698,7 @@ handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)
struct controlvm_message_packet *cmd = &inmsg.cmd; struct controlvm_message_packet *cmd = &inmsg.cmd;
u64 parametersAddr = 0; u64 parametersAddr = 0;
u32 parametersBytes = 0; u32 parametersBytes = 0;
PARSER_CONTEXT *parser_ctx = NULL; struct parser_context *parser_ctx = NULL;
BOOL isLocalAddr = FALSE; BOOL isLocalAddr = FALSE;
struct controlvm_message ackmsg; struct controlvm_message ackmsg;