Commit 785542c6 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman

staging: unisys: visorinput: renamed #defines in visorinput.c to match driver namespace

Renamed #defines
* SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID to
		VISOR_KEYBOARD_CHANNEL_UUID
* SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID_STR to
		VISOR_KEYBOARD_CHANNEL_UUID_STR
* SPAR_MOUSE_CHANNEL_PROTOCOL_UUID to
		VISOR_MOUSE_CHANNEL_UUID
* SPAR_MOUSE_CHANNEL_PROTOCOL_UUID_STR to
		VISOR_MOUSE_CHANNEL_UUID_STR
Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3ad6e69
...@@ -282,7 +282,7 @@ i.e.: ...@@ -282,7 +282,7 @@ i.e.:
The visorinput driver registers with visorbus as the function driver to The visorinput driver registers with visorbus as the function driver to
handle human input devices, specified using the handle human input devices, specified using the
SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID and SPAR_MOUSE_CHANNEL_PROTOCOL_UUID VISOR_KEYBOARD_CHANNEL_UUID and VISOR_MOUSE_CHANNEL_UUID
types in the visorbus_register_visor_driver() call. visorinput uses types in the visorbus_register_visor_driver() call. visorinput uses
input_register_device() to expose devices of class input input_register_device() to expose devices of class input
(e.g., /sys/class/input/) for virtual keyboard and virtual mouse devices. (e.g., /sys/class/input/) for virtual keyboard and virtual mouse devices.
...@@ -307,8 +307,8 @@ When compiled as a module, visorinput can be autoloaded by visorbus in ...@@ -307,8 +307,8 @@ When compiled as a module, visorinput can be autoloaded by visorbus in
standard udev/systemd environments, as it includes the modules.alias standard udev/systemd environments, as it includes the modules.alias
definition: definition:
"visorbus:"+SPAR_MOUSE_CHANNEL_PROTOCOL_UUID_STR "visorbus:"+VISOR_MOUSE_CHANNEL_UUID_STR
"visorbus:"+SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID_STR "visorbus:"+VISOR_KEYBOARD_CHANNEL_UUID_STR
i.e.: i.e.:
......
...@@ -33,17 +33,16 @@ ...@@ -33,17 +33,16 @@
#include "ultrainputreport.h" #include "ultrainputreport.h"
/* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */ /* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */
#define SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID \ #define VISOR_KEYBOARD_CHANNEL_UUID \
UUID_LE(0xc73416d0, 0xb0b8, 0x44af, \ UUID_LE(0xc73416d0, 0xb0b8, 0x44af, \
0xb3, 0x4, 0x9d, 0x2a, 0xe9, 0x9f, 0x1b, 0x3d) 0xb3, 0x4, 0x9d, 0x2a, 0xe9, 0x9f, 0x1b, 0x3d)
#define SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID_STR "c73416d0-b0b8-44af-b304-9d2ae99f1b3d" #define VISOR_KEYBOARD_CHANNEL_UUID_STR "c73416d0-b0b8-44af-b304-9d2ae99f1b3d"
/* Mouse channel {addf07d4-94a9-46e2-81c3-61abcdbdbd87} */ /* Mouse channel {addf07d4-94a9-46e2-81c3-61abcdbdbd87} */
#define SPAR_MOUSE_CHANNEL_PROTOCOL_UUID \ #define VISOR_MOUSE_CHANNEL_UUID \
UUID_LE(0xaddf07d4, 0x94a9, 0x46e2, \ UUID_LE(0xaddf07d4, 0x94a9, 0x46e2, \
0x81, 0xc3, 0x61, 0xab, 0xcd, 0xbd, 0xbd, 0x87) 0x81, 0xc3, 0x61, 0xab, 0xcd, 0xbd, 0xbd, 0x87)
#define SPAR_MOUSE_CHANNEL_PROTOCOL_UUID_STR \ #define VISOR_MOUSE_CHANNEL_UUID_STR "addf07d4-94a9-46e2-81c3-61abcdbdbd87"
"addf07d4-94a9-46e2-81c3-61abcdbdbd87"
#define PIXELS_ACROSS_DEFAULT 800 #define PIXELS_ACROSS_DEFAULT 800
#define PIXELS_DOWN_DEFAULT 600 #define PIXELS_DOWN_DEFAULT 600
...@@ -70,10 +69,8 @@ struct visorinput_devdata { ...@@ -70,10 +69,8 @@ struct visorinput_devdata {
unsigned char keycode_table[0]; unsigned char keycode_table[0];
}; };
static const uuid_le spar_keyboard_channel_protocol_uuid = static const uuid_le visor_keyboard_channel_uuid = VISOR_KEYBOARD_CHANNEL_UUID;
SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID; static const uuid_le visor_mouse_channel_uuid = VISOR_MOUSE_CHANNEL_UUID;
static const uuid_le spar_mouse_channel_protocol_uuid =
SPAR_MOUSE_CHANNEL_PROTOCOL_UUID;
/* /*
* Borrowed from drivers/input/keyboard/atakbd.c * Borrowed from drivers/input/keyboard/atakbd.c
...@@ -456,9 +453,9 @@ visorinput_probe(struct visor_device *dev) ...@@ -456,9 +453,9 @@ visorinput_probe(struct visor_device *dev)
enum visorinput_device_type devtype; enum visorinput_device_type devtype;
guid = visorchannel_get_uuid(dev->visorchannel); guid = visorchannel_get_uuid(dev->visorchannel);
if (uuid_le_cmp(guid, spar_mouse_channel_protocol_uuid) == 0) if (uuid_le_cmp(guid, visor_mouse_channel_uuid) == 0)
devtype = visorinput_mouse; devtype = visorinput_mouse;
else if (uuid_le_cmp(guid, spar_keyboard_channel_protocol_uuid) == 0) else if (uuid_le_cmp(guid, visor_keyboard_channel_uuid) == 0)
devtype = visorinput_keyboard; devtype = visorinput_keyboard;
else else
return -ENODEV; return -ENODEV;
...@@ -730,8 +727,8 @@ visorinput_resume(struct visor_device *dev, ...@@ -730,8 +727,8 @@ visorinput_resume(struct visor_device *dev,
/* GUIDS for all channel types supported by this driver. */ /* GUIDS for all channel types supported by this driver. */
static struct visor_channeltype_descriptor visorinput_channel_types[] = { static struct visor_channeltype_descriptor visorinput_channel_types[] = {
{ SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID, "keyboard"}, { VISOR_KEYBOARD_CHANNEL_UUID, "keyboard"},
{ SPAR_MOUSE_CHANNEL_PROTOCOL_UUID, "mouse"}, { VISOR_MOUSE_CHANNEL_UUID, "mouse"},
{ NULL_UUID_LE, NULL } { NULL_UUID_LE, NULL }
}; };
...@@ -767,5 +764,5 @@ MODULE_AUTHOR("Unisys"); ...@@ -767,5 +764,5 @@ MODULE_AUTHOR("Unisys");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("s-Par human input driver for virtual keyboard/mouse"); MODULE_DESCRIPTION("s-Par human input driver for virtual keyboard/mouse");
MODULE_ALIAS("visorbus:" SPAR_MOUSE_CHANNEL_PROTOCOL_UUID_STR); MODULE_ALIAS("visorbus:" VISOR_MOUSE_CHANNEL_UUID_STR);
MODULE_ALIAS("visorbus:" SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID_STR); MODULE_ALIAS("visorbus:" VISOR_KEYBOARD_CHANNEL_UUID_STR);
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