redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Staging: hv: Move the contents of vmbus_api.h to hyperv.h 

Move the contents of vmbus_api.h to hyperv.h.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
hifive-unleashed-5.1
K. Y. Srinivasan 2011-05-12 19:34:24 -07:00 committed by Greg Kroah-Hartman
parent f63c9149d0
commit 35ea09c390
9 changed files with 69 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/hv/hv_kvp.c
View File

@ -31,7 +31,6 @@
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_private.h"
#include "vmbus_api.h"
#include "utils.h"
#include "hv_kvp.h"

1
drivers/staging/hv/hv_mouse.c
View File

@ -29,7 +29,6 @@
#include "hyperv.h"
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_api.h"
/*

1
drivers/staging/hv/hv_util.c
View File

@ -33,7 +33,6 @@
#include "hv_api.h"
#include "vmbus.h"
#include "vmbus_private.h"
#include "vmbus_api.h"
#include "utils.h"
#include "hv_kvp.h"

65
drivers/staging/hv/hyperv.h
View File

@ -757,4 +757,69 @@ extern unsigned int vmbus_loglevel;
__func__, ## args);\
} while (0)
#include <linux/device.h>
#include <linux/workqueue.h>
struct hv_driver;
struct hv_device;
struct hv_dev_port_info {
u32 int_mask;
u32 read_idx;
u32 write_idx;
u32 bytes_avail_toread;
u32 bytes_avail_towrite;
};
struct hv_device_info {
u32 chn_id;
u32 chn_state;
struct hv_guid chn_type;
struct hv_guid chn_instance;
u32 monitor_id;
u32 server_monitor_pending;
u32 server_monitor_latency;
u32 server_monitor_conn_id;
u32 client_monitor_pending;
u32 client_monitor_latency;
u32 client_monitor_conn_id;
struct hv_dev_port_info inbound;
struct hv_dev_port_info outbound;
};
/* Base driver object */
struct hv_driver {
const char *name;
/* the device type supported by this driver */
struct hv_guid dev_type;
struct device_driver driver;
int (*probe)(struct hv_device *);
int (*remove)(struct hv_device *);
void (*shutdown)(struct hv_device *);
};
/* Base device object */
struct hv_device {
/* the device type id of this device */
struct hv_guid dev_type;
/* the device instance id of this device */
struct hv_guid dev_instance;
struct device device;
struct vmbus_channel *channel;
/* Device extension; */
void *ext;
};
#endif /* _HYPERV_H */

2
drivers/staging/hv/netvsc_api.h
View File

@ -25,7 +25,7 @@
#ifndef _NETVSC_API_H_
#define _NETVSC_API_H_
#include "vmbus_api.h"
#include "hyperv.h"
#include "vmbus.h"
/* Fwd declaration */

2
drivers/staging/hv/storvsc_api.h
View File

@ -28,7 +28,7 @@
#include <linux/kernel.h>
#include <linux/wait.h>
#include "vstorage.h"
#include "vmbus_api.h"
#include "hyperv.h"
#include "vmbus.h"
/* Defines */

2
drivers/staging/hv/vmbus.h
View File

@ -26,7 +26,7 @@
#define _VMBUS_H_
#include <linux/device.h>
#include "vmbus_api.h"
#include "hyperv.h"

91
drivers/staging/hv/vmbus_api.h
View File

@ -1,91 +0,0 @@
/*
*
* Copyright (c) 2009, Microsoft Corporation.
*
* 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 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., 59 Temple
* Place - Suite 330, Boston, MA 02111-1307 USA.
*
* Authors:
* Haiyang Zhang <haiyangz@microsoft.com>
* Hank Janssen <hjanssen@microsoft.com>
*
*/
#ifndef _VMBUS_API_H_
#define _VMBUS_API_H_
#include <linux/device.h>
#include <linux/workqueue.h>
struct hv_driver;
struct hv_device;
struct hv_dev_port_info {
u32 int_mask;
u32 read_idx;
u32 write_idx;
u32 bytes_avail_toread;
u32 bytes_avail_towrite;
};
struct hv_device_info {
u32 chn_id;
u32 chn_state;
struct hv_guid chn_type;
struct hv_guid chn_instance;
u32 monitor_id;
u32 server_monitor_pending;
u32 server_monitor_latency;
u32 server_monitor_conn_id;
u32 client_monitor_pending;
u32 client_monitor_latency;
u32 client_monitor_conn_id;
struct hv_dev_port_info inbound;
struct hv_dev_port_info outbound;
};
/* Base driver object */
struct hv_driver {
const char *name;
/* the device type supported by this driver */
struct hv_guid dev_type;
struct device_driver driver;
int (*probe)(struct hv_device *);
int (*remove)(struct hv_device *);
void (*shutdown)(struct hv_device *);
};
/* Base device object */
struct hv_device {
/* the device type id of this device */
struct hv_guid dev_type;
/* the device instance id of this device */
struct hv_guid dev_instance;
struct device device;
struct vmbus_channel *channel;
/* Device extension; */
void *ext;
};
#endif /* _VMBUS_API_H_ */

2
drivers/staging/hv/vmbus_private.h
View File

@ -26,7 +26,7 @@
#define _VMBUS_PRIVATE_H_
#include "hv.h"
#include "vmbus_api.h"
#include "hyperv.h"
#include "ring_buffer.h"
#include <linux/list.h>
#include <asm/sync_bitops.h>