---

yaml --- r: 249624 b: refs/heads/master c: 35ea09c h: refs/heads/master v: v3
git-mirror · May 17, 2011 · 713754e · 713754e
1 parent a9e3377
commit 713754e
Show file tree

Hide file tree

Showing 10 changed files with 70 additions and 99 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f63c9149d052c86113fc84edd4ce138db44e768a
+refs/heads/master: 35ea09c390378a4189f145fa4e894d42d21bd896
diff --git a/trunk/drivers/staging/hv/hv_kvp.c b/trunk/drivers/staging/hv/hv_kvp.c
@@ -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"
 

diff --git a/trunk/drivers/staging/hv/hv_mouse.c b/trunk/drivers/staging/hv/hv_mouse.c
@@ -29,7 +29,6 @@
 #include "hyperv.h"
 #include "hv_api.h"
 #include "vmbus.h"
-#include "vmbus_api.h"
 
 
 /*

diff --git a/trunk/drivers/staging/hv/hv_util.c b/trunk/drivers/staging/hv/hv_util.c
@@ -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"
 

diff --git a/trunk/drivers/staging/hv/hyperv.h b/trunk/drivers/staging/hv/hyperv.h
@@ -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 */
diff --git a/trunk/drivers/staging/hv/netvsc_api.h b/trunk/drivers/staging/hv/netvsc_api.h
@@ -25,7 +25,7 @@
 #ifndef _NETVSC_API_H_
 #define _NETVSC_API_H_
 
-#include "vmbus_api.h"
+#include "hyperv.h"
 #include "vmbus.h"
 
 /* Fwd declaration */

diff --git a/trunk/drivers/staging/hv/storvsc_api.h b/trunk/drivers/staging/hv/storvsc_api.h
@@ -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 */

diff --git a/trunk/drivers/staging/hv/vmbus.h b/trunk/drivers/staging/hv/vmbus.h
@@ -26,7 +26,7 @@
 #define _VMBUS_H_
 
 #include <linux/device.h>
-#include "vmbus_api.h"
+#include "hyperv.h"
 
 
 

diff --git a/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h
diff --git a/trunk/drivers/staging/hv/vmbus_private.h b/trunk/drivers/staging/hv/vmbus_private.h
@@ -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>