---

yaml --- r: 249622 b: refs/heads/master c: c35470b h: refs/heads/master v: v3
git-mirror · May 17, 2011 · 577e775 · 577e775
1 parent 9eda0f2
commit 577e775
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 121 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b56dda06b4dddeb5a39e00a6812909fa832d527b
+refs/heads/master: c35470b2297f0e05596a7aeebff8a67f4c6e3552
diff --git a/trunk/drivers/staging/hv/channel.h b/trunk/drivers/staging/hv/channel.h
diff --git a/trunk/drivers/staging/hv/hv_kvp.c b/trunk/drivers/staging/hv/hv_kvp.c
@@ -31,7 +31,6 @@
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
-#include "channel.h"
 #include "vmbus_private.h"
 #include "vmbus_api.h"
 #include "utils.h"

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

diff --git a/trunk/drivers/staging/hv/hv_util.c b/trunk/drivers/staging/hv/hv_util.c
@@ -33,7 +33,6 @@
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"
-#include "channel.h"
 #include "vmbus_private.h"
 #include "vmbus_api.h"
 #include "utils.h"

diff --git a/trunk/drivers/staging/hv/hyperv.h b/trunk/drivers/staging/hv/hyperv.h
@@ -607,4 +607,86 @@ void vmbus_onmessage(void *context);
 
 int vmbus_request_offers(void);
 
+/* The format must be the same as struct vmdata_gpa_direct */
+struct vmbus_channel_packet_page_buffer {
+	u16 type;
+	u16 dataoffset8;
+	u16 length8;
+	u16 flags;
+	u64 transactionid;
+	u32 reserved;
+	u32 rangecount;
+	struct hv_page_buffer range[MAX_PAGE_BUFFER_COUNT];
+} __packed;
+
+/* The format must be the same as struct vmdata_gpa_direct */
+struct vmbus_channel_packet_multipage_buffer {
+	u16 type;
+	u16 dataoffset8;
+	u16 length8;
+	u16 flags;
+	u64 transactionid;
+	u32 reserved;
+	u32 rangecount;		/* Always 1 in this case */
+	struct hv_multipage_buffer range;
+} __packed;
+
+
+extern int vmbus_open(struct vmbus_channel *channel,
+			    u32 send_ringbuffersize,
+			    u32 recv_ringbuffersize,
+			    void *userdata,
+			    u32 userdatalen,
+			    void(*onchannel_callback)(void *context),
+			    void *context);
+
+extern void vmbus_close(struct vmbus_channel *channel);
+
+extern int vmbus_sendpacket(struct vmbus_channel *channel,
+				  const void *buffer,
+				  u32 bufferLen,
+				  u64 requestid,
+				  enum vmbus_packet_type type,
+				  u32 flags);
+
+extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel,
+					    struct hv_page_buffer pagebuffers[],
+					    u32 pagecount,
+					    void *buffer,
+					    u32 bufferlen,
+					    u64 requestid);
+
+extern int vmbus_sendpacket_multipagebuffer(struct vmbus_channel *channel,
+					struct hv_multipage_buffer *mpb,
+					void *buffer,
+					u32 bufferlen,
+					u64 requestid);
+
+extern int vmbus_establish_gpadl(struct vmbus_channel *channel,
+				      void *kbuffer,
+				      u32 size,
+				      u32 *gpadl_handle);
+
+extern int vmbus_teardown_gpadl(struct vmbus_channel *channel,
+				     u32 gpadl_handle);
+
+extern int vmbus_recvpacket(struct vmbus_channel *channel,
+				  void *buffer,
+				  u32 bufferlen,
+				  u32 *buffer_actual_len,
+				  u64 *requestid);
+
+extern int vmbus_recvpacket_raw(struct vmbus_channel *channel,
+				     void *buffer,
+				     u32 bufferlen,
+				     u32 *buffer_actual_len,
+				     u64 *requestid);
+
+extern void vmbus_onchannel_event(struct vmbus_channel *channel);
+
+extern void vmbus_get_debug_info(struct vmbus_channel *channel,
+				     struct vmbus_channel_debug_info *debug);
+
+extern void vmbus_ontimer(unsigned long data);
+
 #endif /* _HYPERV_H */
diff --git a/trunk/drivers/staging/hv/netvsc.c b/trunk/drivers/staging/hv/netvsc.c
@@ -33,7 +33,6 @@
 #include "logging.h"
 #include "netvsc.h"
 #include "rndis_filter.h"
-#include "channel.h"
 
 
 /* Globals */

diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
@@ -33,7 +33,6 @@
 #include "logging.h"
 #include "storvsc_api.h"
 #include "vstorage.h"
-#include "channel.h"
 
 
 static inline struct storvsc_device *alloc_stor_device(struct hv_device *device)

diff --git a/trunk/drivers/staging/hv/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c
@@ -39,7 +39,6 @@
 #include "vmbus.h"
 #include "storvsc_api.h"
 #include "vstorage.h"
-#include "channel.h"
 
 static int storvsc_ringbuffer_size = STORVSC_RING_BUFFER_SIZE;
 

diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -39,7 +39,6 @@
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus.h"
-#include "channel.h"
 #include "vmbus_private.h"
 
 

diff --git a/trunk/drivers/staging/hv/vmbus_private.h b/trunk/drivers/staging/hv/vmbus_private.h
@@ -27,7 +27,6 @@
 
 #include "hv.h"
 #include "vmbus_api.h"
-#include "channel.h"
 #include "ring_buffer.h"
 #include <linux/list.h>
 #include <asm/sync_bitops.h>