Commit 35ea09c3 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

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: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarAbhishek Kane <v-abkane@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f63c9149

drivers/staging/hv/hv_kvp.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/staging/hv/hv_mouse.c

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "hyperv.h"

#include "hv_api.h"

#include "vmbus.h"

#include "vmbus_api.h"





/*

drivers/staging/hv/hv_util.c

+0 −1
Original line number Diff line number Diff line
@@ -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"

drivers/staging/hv/hyperv.h

+65 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/staging/hv/netvsc_api.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#ifndef _NETVSC_API_H_

#define _NETVSC_API_H_



#include "vmbus_api.h"

#include "hyperv.h"

#include "vmbus.h"



/* Fwd declaration */