From 94fcc88868e4068d3fe9aa0d719a380bfa44a0a0 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 Mar 2011 17:57:51 -0800 Subject: [PATCH] Staging: hv: delete mousevsc_api.h This file is only used by one .c file (hv_mouse.c) so just move the whole thing into that file. Cc: Hank Janssen Cc: K. Y. Srinivasan Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/hv_mouse.c | 37 +++++++++++++++++++- drivers/staging/hv/mousevsc_api.h | 73 --------------------------------------- 2 files changed, 36 insertions(+), 74 deletions(-) delete mode 100644 drivers/staging/hv/mousevsc_api.h diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index b62409d22ce5..3fb5ee800812 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -29,11 +29,44 @@ #include "version_info.h" #include "vmbus.h" #include "vmbus_api.h" -#include "mousevsc_api.h" #include "channel.h" #include "vmbus_packet_format.h" +/* + * Data types + */ +struct input_dev_info { + unsigned short VendorID; + unsigned short ProductID; + unsigned short VersionNumber; + char Name[128]; +}; + +/* Represents the input vsc driver */ +struct mousevsc_drv_obj { + struct hv_driver Base; // Must be the first field + /* + * This is set by the caller to allow us to callback when + * we receive a packet from the "wire" + */ + void (*OnDeviceInfo)(struct hv_device *dev, + struct input_dev_info* info); + void (*OnInputReport)(struct hv_device *dev, void* packet, u32 len); + void (*OnReportDescriptor)(struct hv_device *dev, + void* packet, u32 len); + /* Specific to this driver */ + int (*OnOpen)(struct hv_device *Device); + int (*OnClose)(struct hv_device *Device); + void *Context; +}; + + +/* + * Interface + */ +int mouse_vsc_initialize(struct hv_driver *drv); + /* The maximum size of a synthetic input message. */ #define SYNTHHID_MAX_INPUT_REPORT_SIZE 16 @@ -119,6 +152,8 @@ typedef struct { #pragma pack(pop) +#define INPUTVSC_SEND_RING_BUFFER_SIZE 10*PAGE_SIZE +#define INPUTVSC_RECV_RING_BUFFER_SIZE 10*PAGE_SIZE #define NBITS(x) (((x)/BITS_PER_LONG)+1) diff --git a/drivers/staging/hv/mousevsc_api.h b/drivers/staging/hv/mousevsc_api.h deleted file mode 100644 index f3610867143d..000000000000 --- a/drivers/staging/hv/mousevsc_api.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2009 Citrix Systems, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * 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. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * For clarity, the licensor of this program does not intend that a - * "derivative work" include code which compiles header information from - * this program. - * - * This code has been modified from its original by - * Hank Janssen - * - */ - -#ifndef _INPUTVSC_API_H_ -#define _INPUTVSC_API_H_ - -#include "vmbus_api.h" - -/* - * Defines - */ -#define INPUTVSC_SEND_RING_BUFFER_SIZE 10*PAGE_SIZE -#define INPUTVSC_RECV_RING_BUFFER_SIZE 10*PAGE_SIZE - - -/* - * Data types - */ -struct input_dev_info { - unsigned short VendorID; - unsigned short ProductID; - unsigned short VersionNumber; - char Name[128]; -}; - -/* Represents the input vsc driver */ -struct mousevsc_drv_obj { - struct hv_driver Base; // Must be the first field - /* - * This is set by the caller to allow us to callback when - * we receive a packet from the "wire" - */ - void (*OnDeviceInfo)(struct hv_device *dev, - struct input_dev_info* info); - void (*OnInputReport)(struct hv_device *dev, void* packet, u32 len); - void (*OnReportDescriptor)(struct hv_device *dev, - void* packet, u32 len); - /* Specific to this driver */ - int (*OnOpen)(struct hv_device *Device); - int (*OnClose)(struct hv_device *Device); - void *Context; -}; - - -/* - * Interface - */ -int mouse_vsc_initialize(struct hv_driver *drv); - -#endif // _INPUTVSC_API_H_ -- 2.11.4.GIT