From dabf6c399e27e21db9f1b438467bb9b7cfc8b834 Mon Sep 17 00:00:00 2001 From: Tim Sell Date: Fri, 2 Oct 2015 13:19:16 -0400 Subject: [PATCH] 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 Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../staging/unisys/visorinput/keyboardchannel.h | 32 --------------------- drivers/staging/unisys/visorinput/mousechannel.h | 33 ---------------------- drivers/staging/unisys/visorinput/visorinput.c | 19 +++++++++++-- 3 files changed, 17 insertions(+), 67 deletions(-) delete mode 100644 drivers/staging/unisys/visorinput/keyboardchannel.h delete mode 100644 drivers/staging/unisys/visorinput/mousechannel.h diff --git a/drivers/staging/unisys/visorinput/keyboardchannel.h b/drivers/staging/unisys/visorinput/keyboardchannel.h deleted file mode 100644 index 2ed2602b427c..000000000000 --- a/drivers/staging/unisys/visorinput/keyboardchannel.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2010 - 2015 UNISYS CORPORATION - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for more - * details. - */ - -#ifndef __SPAR_KEYBOARDCHANNEL_H__ -#define __SPAR_KEYBOARDCHANNEL_H__ - -#include -#include - -#include "channel.h" -#include "ultrainputreport.h" - -/* {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" -#define SPAR_KEYBOARD_CHANNEL_PROTOCOL_VERSIONID 1 -#define KEYBOARD_MAXINPUTREPORTS 50 - -#endif diff --git a/drivers/staging/unisys/visorinput/mousechannel.h b/drivers/staging/unisys/visorinput/mousechannel.h deleted file mode 100644 index 256477ae6e5e..000000000000 --- a/drivers/staging/unisys/visorinput/mousechannel.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright (C) 2010 - 2015 UNISYS CORPORATION - * All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or - * NON INFRINGEMENT. See the GNU General Public License for more - * details. - */ - -#ifndef __SPAR_MOUSECHANNEL_H__ -#define __SPAR_MOUSECHANNEL_H__ - -#include -#include - -#include "channel.h" -#include "ultrainputreport.h" - -/* {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 SPAR_MOUSE_CHANNEL_PROTOCOL_VERSIONID 1 -#define MOUSE_MAXINPUTREPORTS 50 - -#endif 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 #include #include +#include +#include -#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 -- 2.11.0