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

Commit dabf6c39 authored by Tim Sell's avatar Tim Sell Committed by Greg Kroah-Hartman
Browse files

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: default avatarTim Sell <Timothy.Sell@unisys.com>
Signed-off-by: default avatarBenjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ea9b6e6

drivers/staging/unisys/visorinput/keyboardchannel.h

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/* 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 <linux/kernel.h>

#include <linux/uuid.h>



#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

drivers/staging/unisys/visorinput/mousechannel.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/* 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 <linux/kernel.h>

#include <linux/uuid.h>



#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

drivers/staging/unisys/visorinput/visorinput.c

+17 −2
Original line number Diff line number Diff line
@@ -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