Staging: hv: move VmbusChannelInterface.h
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 28 Aug 2009 23:24:34 +0000 (16:24 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 15 Sep 2009 19:02:01 +0000 (12:02 -0700)
Move it out of the include subdirectory.

No code changes here, just file movements.

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/hv/ChannelMgmt.h
drivers/staging/hv/NetVsc.h
drivers/staging/hv/VmbusChannelInterface.h [new file with mode: 0644]
drivers/staging/hv/include/VmbusChannelInterface.h [deleted file]

index 922eac21f55b875c22dc18935eded462ee870c5d..6d327c65d938caf234a95ac69dc88facb4faa498 100644 (file)
@@ -28,7 +28,7 @@
 #include "List.h"
 #include "RingBuffer.h"
 
-#include "include/VmbusChannelInterface.h"
+#include "VmbusChannelInterface.h"
 #include "include/VmbusPacketFormat.h"
 
 /* Version 1 messages */
index afa764f13acf6fca7ccd96eb69df76975c50b8d3..ce6f1e2daf62954a0ff93ff2969c4a29e4f5d560 100644 (file)
@@ -25,7 +25,7 @@
 #define _NETVSC_H_
 
 #include "include/VmbusPacketFormat.h"
-#include "include/VmbusChannelInterface.h"
+#include "VmbusChannelInterface.h"
 #include "List.h"
 #include "NetVscApi.h"
 
diff --git a/drivers/staging/hv/VmbusChannelInterface.h b/drivers/staging/hv/VmbusChannelInterface.h
new file mode 100644 (file)
index 0000000..2674282
--- /dev/null
@@ -0,0 +1,89 @@
+/*
+ *
+ * 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 __VMBUSCHANNELINTERFACE_H
+#define __VMBUSCHANNELINTERFACE_H
+
+/*
+ * A revision number of vmbus that is used for ensuring both ends on a
+ * partition are using compatible versions.
+ */
+#define VMBUS_REVISION_NUMBER          13
+
+/* Make maximum size of pipe payload of 16K */
+#define MAX_PIPE_DATA_PAYLOAD          (sizeof(u8) * 16384)
+
+/* Define PipeMode values. */
+#define VMBUS_PIPE_TYPE_BYTE           0x00000000
+#define VMBUS_PIPE_TYPE_MESSAGE                0x00000004
+
+/* The size of the user defined data buffer for non-pipe offers. */
+#define MAX_USER_DEFINED_BYTES         120
+
+/* The size of the user defined data buffer for pipe offers. */
+#define MAX_PIPE_USER_DEFINED_BYTES    116
+
+/*
+ * At the center of the Channel Management library is the Channel Offer. This
+ * struct contains the fundamental information about an offer.
+ */
+struct vmbus_channel_offer {
+       struct hv_guid InterfaceType;
+       struct hv_guid InterfaceInstance;
+       u64 InterruptLatencyIn100nsUnits;
+       u32 InterfaceRevision;
+       u32 ServerContextAreaSize;      /* in bytes */
+       u16 ChannelFlags;
+       u16 MmioMegabytes;              /* in bytes * 1024 * 1024 */
+
+       union {
+               /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
+               struct {
+                       unsigned char UserDefined[MAX_USER_DEFINED_BYTES];
+               } Standard;
+
+               /*
+                * Pipes:
+                * The following sructure is an integrated pipe protocol, which
+                * is implemented on top of standard user-defined data. Pipe
+                * clients have MAX_PIPE_USER_DEFINED_BYTES left for their own
+                * use.
+                */
+               struct {
+                       u32  PipeMode;
+                       unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
+               } Pipe;
+       } u;
+       u32 Padding;
+} __attribute__((packed));
+
+/* Server Flags */
+#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE       1
+#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES   2
+#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS           4
+#define VMBUS_CHANNEL_NAMED_PIPE_MODE                  0x10
+#define VMBUS_CHANNEL_LOOPBACK_OFFER                   0x100
+#define VMBUS_CHANNEL_PARENT_OFFER                     0x200
+#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION   0x400
+
+#endif
diff --git a/drivers/staging/hv/include/VmbusChannelInterface.h b/drivers/staging/hv/include/VmbusChannelInterface.h
deleted file mode 100644 (file)
index 2674282..0000000
+++ /dev/null
@@ -1,89 +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 __VMBUSCHANNELINTERFACE_H
-#define __VMBUSCHANNELINTERFACE_H
-
-/*
- * A revision number of vmbus that is used for ensuring both ends on a
- * partition are using compatible versions.
- */
-#define VMBUS_REVISION_NUMBER          13
-
-/* Make maximum size of pipe payload of 16K */
-#define MAX_PIPE_DATA_PAYLOAD          (sizeof(u8) * 16384)
-
-/* Define PipeMode values. */
-#define VMBUS_PIPE_TYPE_BYTE           0x00000000
-#define VMBUS_PIPE_TYPE_MESSAGE                0x00000004
-
-/* The size of the user defined data buffer for non-pipe offers. */
-#define MAX_USER_DEFINED_BYTES         120
-
-/* The size of the user defined data buffer for pipe offers. */
-#define MAX_PIPE_USER_DEFINED_BYTES    116
-
-/*
- * At the center of the Channel Management library is the Channel Offer. This
- * struct contains the fundamental information about an offer.
- */
-struct vmbus_channel_offer {
-       struct hv_guid InterfaceType;
-       struct hv_guid InterfaceInstance;
-       u64 InterruptLatencyIn100nsUnits;
-       u32 InterfaceRevision;
-       u32 ServerContextAreaSize;      /* in bytes */
-       u16 ChannelFlags;
-       u16 MmioMegabytes;              /* in bytes * 1024 * 1024 */
-
-       union {
-               /* Non-pipes: The user has MAX_USER_DEFINED_BYTES bytes. */
-               struct {
-                       unsigned char UserDefined[MAX_USER_DEFINED_BYTES];
-               } Standard;
-
-               /*
-                * Pipes:
-                * The following sructure is an integrated pipe protocol, which
-                * is implemented on top of standard user-defined data. Pipe
-                * clients have MAX_PIPE_USER_DEFINED_BYTES left for their own
-                * use.
-                */
-               struct {
-                       u32  PipeMode;
-                       unsigned char UserDefined[MAX_PIPE_USER_DEFINED_BYTES];
-               } Pipe;
-       } u;
-       u32 Padding;
-} __attribute__((packed));
-
-/* Server Flags */
-#define VMBUS_CHANNEL_ENUMERATE_DEVICE_INTERFACE       1
-#define VMBUS_CHANNEL_SERVER_SUPPORTS_TRANSFER_PAGES   2
-#define VMBUS_CHANNEL_SERVER_SUPPORTS_GPADLS           4
-#define VMBUS_CHANNEL_NAMED_PIPE_MODE                  0x10
-#define VMBUS_CHANNEL_LOOPBACK_OFFER                   0x100
-#define VMBUS_CHANNEL_PARENT_OFFER                     0x200
-#define VMBUS_CHANNEL_REQUEST_MONITORED_NOTIFICATION   0x400
-
-#endif