From c52e07ce2b4ff12faad734f40d4134e4b54bb232 Mon Sep 17 00:00:00 2001 From: David Kershner Date: Wed, 31 Jan 2018 11:41:15 -0500 Subject: staging: unisys: visorinput: combine ultrainputreport.h with visorinput.c The file ultrainputreport.h was just being used by visorinput.c. Move the definitions into visorinput.c and get rid of the file. Signed-off-by: David Kershner Reviewed-by: Tim Sell Signed-off-by: Greg Kroah-Hartman --- .../staging/unisys/visorinput/ultrainputreport.h | 55 ---------------------- drivers/staging/unisys/visorinput/visorinput.c | 43 ++++++++++++++++- 2 files changed, 42 insertions(+), 56 deletions(-) delete mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h (limited to 'drivers/staging/unisys/visorinput') diff --git a/drivers/staging/unisys/visorinput/ultrainputreport.h b/drivers/staging/unisys/visorinput/ultrainputreport.h deleted file mode 100644 index 5eafa6c37cd4..000000000000 --- a/drivers/staging/unisys/visorinput/ultrainputreport.h +++ /dev/null @@ -1,55 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2010 - 2015 UNISYS CORPORATION - * All rights reserved. - */ - -#ifndef __SPAR_ULTRAINPUTREPORT_H__ -#define __SPAR_ULTRAINPUTREPORT_H__ - -#include - -/* These defines identify mouse and keyboard activity which is specified by the - * firmware to the host using the cmsimpleinput protocol. @ingroup coretypes - */ -/* only motion; arg1=x, arg2=y */ -#define INPUTACTION_XY_MOTION 1 - -/* arg1: 1=left,2=center,3=right */ -#define INPUTACTION_MOUSE_BUTTON_DOWN 2 -#define INPUTACTION_MOUSE_BUTTON_UP 3 -#define INPUTACTION_MOUSE_BUTTON_CLICK 4 -#define INPUTACTION_MOUSE_BUTTON_DCLICK 5 - -/* arg1: wheel rotation away from/toward user */ -#define INPUTACTION_WHEEL_ROTATE_AWAY 6 -#define INPUTACTION_WHEEL_ROTATE_TOWARD 7 - -/* arg1: scancode, as follows: If arg1 <= 0xff, it's a 1-byte scancode and arg1 - * is that scancode. If arg1 > 0xff, it's a 2-byte scanecode, with the 1st - * byte in the low 8 bits, and the 2nd byte in the high 8 bits. - * E.g., the right ALT key would appear as x'38e0'. - */ -#define INPUTACTION_KEY_DOWN 64 -#define INPUTACTION_KEY_UP 65 -#define INPUTACTION_KEY_DOWN_UP 67 - -/* arg1: scancode (in same format as inputaction_keyDown); MUST refer to one of - * the locking keys, like capslock, numlock, or scrolllock. - * arg2: 1 iff locking key should be in the LOCKED position (e.g., light is ON) - */ -#define INPUTACTION_SET_LOCKING_KEY_STATE 66 - -struct visor_inputactivity { - u16 action; - u16 arg1; - u16 arg2; - u16 arg3; -} __packed; - -struct visor_inputreport { - u64 seq_no; - struct visor_inputactivity activity; -} __packed; - -#endif diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index 99730409bd7f..634b16b8ebbc 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -18,7 +18,36 @@ #include #include -#include "ultrainputreport.h" +/* These defines identify mouse and keyboard activity which is specified by the + * firmware to the host using the cmsimpleinput protocol. @ingroup coretypes + */ +/* only motion; arg1=x, arg2=y */ +#define INPUTACTION_XY_MOTION 1 + +/* arg1: 1=left,2=center,3=right */ +#define INPUTACTION_MOUSE_BUTTON_DOWN 2 +#define INPUTACTION_MOUSE_BUTTON_UP 3 +#define INPUTACTION_MOUSE_BUTTON_CLICK 4 +#define INPUTACTION_MOUSE_BUTTON_DCLICK 5 + +/* arg1: wheel rotation away from/toward user */ +#define INPUTACTION_WHEEL_ROTATE_AWAY 6 +#define INPUTACTION_WHEEL_ROTATE_TOWARD 7 + +/* arg1: scancode, as follows: If arg1 <= 0xff, it's a 1-byte scancode and arg1 + * is that scancode. If arg1 > 0xff, it's a 2-byte scanecode, with the 1st + * byte in the low 8 bits, and the 2nd byte in the high 8 bits. + * E.g., the right ALT key would appear as x'38e0'. + */ +#define INPUTACTION_KEY_DOWN 64 +#define INPUTACTION_KEY_UP 65 +#define INPUTACTION_KEY_DOWN_UP 67 + +/* arg1: scancode (in same format as inputaction_keyDown); MUST refer to one of + * the locking keys, like capslock, numlock, or scrolllock. + * arg2: 1 iff locking key should be in the LOCKED position (e.g., light is ON) + */ +#define INPUTACTION_SET_LOCKING_KEY_STATE 66 /* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */ #define VISOR_KEYBOARD_CHANNEL_GUID \ @@ -36,6 +65,18 @@ #define PIXELS_DOWN_DEFAULT 768 #define KEYCODE_TABLE_BYTES 256 +struct visor_inputactivity { + u16 action; + u16 arg1; + u16 arg2; + u16 arg3; +} __packed; + +struct visor_inputreport { + u64 seq_no; + struct visor_inputactivity activity; +} __packed; + /* header of keyboard/mouse channels */ struct visor_input_channel_data { u32 n_input_reports; -- cgit v1.2.3