Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 818352a8 authored by Benjamin Romer's avatar Benjamin Romer Committed by Greg Kroah-Hartman
Browse files

staging: unisys: refactor handle_command() 



First, fix the CamelCase local variable names:

parametersAddr => parm_addr
parametersBytes => parm_bytes
isLocalAddr => local_addr

Change the type of local_addr to bool instead of using the #defined
type. Update all references to use the fixed names. Fix the indentation of that
line that's over the 80 column limit.

Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6a55e3c3

drivers/staging/unisys/visorchipset/visorchipset_main.c

+11 −11
Original line number Diff line number Diff line
@@ -1645,34 +1645,34 @@ static BOOL 
handle_command(struct controlvm_message inmsg, HOSTADDRESS channel_addr)

{

	struct controlvm_message_packet *cmd = &inmsg.cmd;

	u64 parametersAddr = 0;

	u32 parametersBytes = 0;

	u64 parm_addr = 0;

	u32 parm_bytes = 0;

	struct parser_context *parser_ctx = NULL;

	BOOL isLocalAddr = FALSE;

	bool local_addr = false;

	struct controlvm_message ackmsg;



	/* create parsing context if necessary */

	isLocalAddr = (inmsg.hdr.flags.test_message == 1);

	local_addr = (inmsg.hdr.flags.test_message == 1);

	if (channel_addr == 0)

		return TRUE;

	parametersAddr = channel_addr + inmsg.hdr.payload_vm_offset;

	parametersBytes = inmsg.hdr.payload_bytes;

	parm_addr = channel_addr + inmsg.hdr.payload_vm_offset;

	parm_bytes = inmsg.hdr.payload_bytes;



	/* Parameter and channel addresses within test messages actually lie

	 * within our OS-controlled memory.  We need to know that, because it

	 * makes a difference in how we compute the virtual address.

	 */

	if (parametersAddr != 0 && parametersBytes != 0) {

	if (parm_addr != 0 && parm_bytes != 0) {

		BOOL retry = FALSE;



		parser_ctx =

		    parser_init_byte_stream(parametersAddr, parametersBytes,

					   isLocalAddr, &retry);

		    parser_init_byte_stream(parm_addr, parm_bytes,

					    local_addr, &retry);

		if (!parser_ctx && retry)

			return FALSE;

	}



	if (!isLocalAddr) {

	if (!local_addr) {

		controlvm_init_response(&ackmsg, &inmsg.hdr,

					CONTROLVM_RESP_SUCCESS);

		if (controlvm_channel)