diff options
| author | Tim Sell | 2015-10-02 19:19:16 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-10-04 10:53:34 +0200 |
| commit | dabf6c399e27e21db9f1b438467bb9b7cfc8b834 (patch) | |
| tree | bf62c8e5eab06fa3a98044ba1af381e2a1bcadc6 /drivers/staging/unisys/visorinput/visorinput.c | |
| parent | staging: unisys: visorhid: rename to visorinput (diff) | |
| download | kernel-qcow2-linux-dabf6c399e27e21db9f1b438467bb9b7cfc8b834.tar.gz kernel-qcow2-linux-dabf6c399e27e21db9f1b438467bb9b7cfc8b834.tar.xz kernel-qcow2-linux-dabf6c399e27e21db9f1b438467bb9b7cfc8b834.zip | |
staging: unisys: visorinput: subsume .h files directly into visorinput.c
keyboardchannel.h and mousechannel.h are now included within
visorinput.c directly.
Signed-off-by: Tim Sell <Timothy.Sell@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorinput/visorinput.c')
| -rw-r--r-- | drivers/staging/unisys/visorinput/visorinput.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/staging/unisys/visorinput/visorinput.c b/drivers/staging/unisys/visorinput/visorinput.c index e1c328e402e3..4c5b594548d8 100644 --- a/drivers/staging/unisys/visorinput/visorinput.c +++ b/drivers/staging/unisys/visorinput/visorinput.c @@ -25,11 +25,26 @@ #include <linux/fs.h> #include <linux/input.h> #include <linux/uaccess.h> +#include <linux/kernel.h> +#include <linux/uuid.h> -#include "keyboardchannel.h" -#include "mousechannel.h" #include "version.h" #include "visorbus.h" +#include "channel.h" +#include "ultrainputreport.h" + +/* Keyboard channel {c73416d0-b0b8-44af-b304-9d2ae99f1b3d} */ +#define SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID \ + UUID_LE(0xc73416d0, 0xb0b8, 0x44af, \ + 0xb3, 0x4, 0x9d, 0x2a, 0xe9, 0x9f, 0x1b, 0x3d) +#define SPAR_KEYBOARD_CHANNEL_PROTOCOL_UUID_STR "c73416d0-b0b8-44af-b304-9d2ae99f1b3d" + +/* Mouse channel {addf07d4-94a9-46e2-81c3-61abcdbdbd87} */ +#define SPAR_MOUSE_CHANNEL_PROTOCOL_UUID \ + UUID_LE(0xaddf07d4, 0x94a9, 0x46e2, \ + 0x81, 0xc3, 0x61, 0xab, 0xcd, 0xbd, 0xbd, 0x87) +#define SPAR_MOUSE_CHANNEL_PROTOCOL_UUID_STR \ + "addf07d4-94a9-46e2-81c3-61abcdbdbd87" #define PIXELS_ACROSS_DEFAULT 800 #define PIXELS_DOWN_DEFAULT 600 |