Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/hv/Channel.c | 38 ++++-----
drivers/staging/hv/Channel.h | 195 +++++++++++++++++-------------------------
2 files changed, 93 insertions(+), 140 deletions(-)
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c
index 2938e58..89ddbf1 100644
--- a/drivers/staging/hv/Channel.c
+++ b/drivers/staging/hv/Channel.c
@@ -159,7 +159,7 @@ Description:
Retrieve various channel debug info
--*/
-static void
+void
VmbusChannelGetDebugInfo(
VMBUS_CHANNEL *Channel,
VMBUS_CHANNEL_DEBUG_INFO *DebugInfo
@@ -203,7 +203,7 @@ Description:
Open the specified channel.
--*/
-static int
+int
VmbusChannelOpen(
VMBUS_CHANNEL *NewChannel,
u32 SendRingBufferSize,
@@ -516,7 +516,7 @@ Description:
Estabish a GPADL for the specified buffer
--*/
-static int
+int
VmbusChannelEstablishGpadl(
VMBUS_CHANNEL *Channel,
void * Kbuffer, /* from kmalloc() */
@@ -621,7 +621,7 @@ Description:
Teardown the specified GPADL handle
--*/
-static int
+int
VmbusChannelTeardownGpadl(
VMBUS_CHANNEL *Channel,
u32 GpadlHandle
@@ -682,7 +682,7 @@ Description:
Close the specified channel
--*/
-static void
+void
VmbusChannelClose(
VMBUS_CHANNEL *Channel
)
@@ -759,7 +759,7 @@ Description:
Send the specified buffer on the given channel
--*/
-static int
+int
VmbusChannelSendPacket(
VMBUS_CHANNEL *Channel,
const void * Buffer,
@@ -821,7 +821,7 @@ Description:
Send a range of single-page buffer packets using a GPADL Direct packet type.
--*/
-static int
+int
VmbusChannelSendPacketPageBuffer(
VMBUS_CHANNEL *Channel,
PAGE_BUFFER PageBuffers[],
@@ -900,7 +900,7 @@ Description:
Send a multi-page buffer packet using a GPADL Direct packet type.
--*/
-static int
+int
VmbusChannelSendPacketMultiPageBuffer(
VMBUS_CHANNEL *Channel,
MULTIPAGE_BUFFER *MultiPageBuffer,
@@ -979,14 +979,11 @@ Description:
--*/
/* TODO: Do we ever receive a gpa direct packet other than the ones we send ? */
-static int
-VmbusChannelRecvPacket(
- VMBUS_CHANNEL *Channel,
- void * Buffer,
- u32 BufferLen,
- u32* BufferActualLen,
- u64* RequestId
- )
+int VmbusChannelRecvPacket(VMBUS_CHANNEL *Channel,
+ void *Buffer,
+ u32 BufferLen,
+ u32 *BufferActualLen,
+ u64 *RequestId)
{
VMPACKET_DESCRIPTOR desc;
u32 packetLen;
@@ -1057,7 +1054,7 @@ Description:
Retrieve the raw packet on the specified channel
--*/
-static int
+int
VmbusChannelRecvPacketRaw(
VMBUS_CHANNEL *Channel,
void * Buffer,
@@ -1134,10 +1131,7 @@ Description:
Channel event callback
--*/
-static void
-VmbusChannelOnChannelEvent(
- VMBUS_CHANNEL *Channel
- )
+void VmbusChannelOnChannelEvent(VMBUS_CHANNEL *Channel)
{
DumpVmbusChannel(Channel);
ASSERT(Channel->OnChannelCallback);
@@ -1160,7 +1154,7 @@ Description:
Timer event callback
--*/
-static void VmbusChannelOnTimer(unsigned long data)
+void VmbusChannelOnTimer(unsigned long data)
{
VMBUS_CHANNEL *channel = (VMBUS_CHANNEL*)data;
diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h
index 16d6e7d..4fc5baf 100644
--- a/drivers/staging/hv/Channel.h
+++ b/drivers/staging/hv/Channel.h
@@ -28,127 +28,86 @@
#include "include/osd.h"
#include "ChannelMgmt.h"
-#pragma pack(push,1)
-
-
/* The format must be the same as VMDATA_GPA_DIRECT */
struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
- u16 Type;
- u16 DataOffset8;
- u16 Length8;
- u16 Flags;
- u64 TransactionId;
- u32 Reserved;
- u32 RangeCount;
- PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT];
-};
-
+ u16 Type;
+ u16 DataOffset8;
+ u16 Length8;
+ u16 Flags;
+ u64 TransactionId;
+ u32 Reserved;
+ u32 RangeCount;
+ PAGE_BUFFER Range[MAX_PAGE_BUFFER_COUNT];
+} __attribute__((packed));
/* The format must be the same as VMDATA_GPA_DIRECT */
struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER {
- u16 Type;
- u16 DataOffset8;
- u16 Length8;
- u16 Flags;
- u64 TransactionId;
- u32 Reserved;
- u32 RangeCount; /* Always 1 in this case */
- MULTIPAGE_BUFFER Range;
-};
-
-#pragma pack(pop)
-
-
-/* Routines */
-
-
-static int
-VmbusChannelOpen(
- VMBUS_CHANNEL *Channel,
- u32 SendRingBufferSize,
- u32 RecvRingBufferSize,
- void * UserData,
- u32 UserDataLen,
- PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
- void * Context
- );
-
-static void
-VmbusChannelClose(
- VMBUS_CHANNEL *Channel
- );
-
-static int
-VmbusChannelSendPacket(
- VMBUS_CHANNEL *Channel,
- const void * Buffer,
- u32 BufferLen,
- u64 RequestId,
- VMBUS_PACKET_TYPE Type,
- u32 Flags
-);
-
-static int
-VmbusChannelSendPacketPageBuffer(
- VMBUS_CHANNEL *Channel,
- PAGE_BUFFER PageBuffers[],
- u32 PageCount,
- void * Buffer,
- u32 BufferLen,
- u64 RequestId
- );
-
-static int
-VmbusChannelSendPacketMultiPageBuffer(
- VMBUS_CHANNEL *Channel,
- MULTIPAGE_BUFFER *MultiPageBuffer,
- void * Buffer,
- u32 BufferLen,
- u64 RequestId
-);
-
-static int
-VmbusChannelEstablishGpadl(
- VMBUS_CHANNEL *Channel,
- void * Kbuffer, /* from kmalloc() */
- u32 Size, /* page-size multiple */
- u32 *GpadlHandle
- );
-
-static int
-VmbusChannelTeardownGpadl(
- VMBUS_CHANNEL *Channel,
- u32 GpadlHandle
- );
-
-static int
-VmbusChannelRecvPacket(
- VMBUS_CHANNEL *Channel,
- void * Buffer,
- u32 BufferLen,
- u32* BufferActualLen,
- u64* RequestId
- );
-
-static int
-VmbusChannelRecvPacketRaw(
- VMBUS_CHANNEL *Channel,
- void * Buffer,
- u32 BufferLen,
- u32* BufferActualLen,
- u64* RequestId
- );
-
-static void
-VmbusChannelOnChannelEvent(
- VMBUS_CHANNEL *Channel
- );
-
-static void
-VmbusChannelGetDebugInfo(
- VMBUS_CHANNEL *Channel,
- VMBUS_CHANNEL_DEBUG_INFO *DebugInfo
- );
-
-static void VmbusChannelOnTimer(unsigned long data);
+ u16 Type;
+ u16 DataOffset8;
+ u16 Length8;
+ u16 Flags;
+ u64 TransactionId;
+ u32 Reserved;
+ u32 RangeCount; /* Always 1 in this case */
+ MULTIPAGE_BUFFER Range;
+} __attribute__((packed));
+
+
+extern int VmbusChannelOpen(VMBUS_CHANNEL *Channel,
+ u32 SendRingBufferSize,
+ u32 RecvRingBufferSize,
+ void *UserData,
+ u32 UserDataLen,
+ PFN_CHANNEL_CALLBACK pfnOnChannelCallback,
+ void *Context);
+
+extern void VmbusChannelClose(VMBUS_CHANNEL *Channel);
+
+extern int VmbusChannelSendPacket(VMBUS_CHANNEL *Channel,
+ const void *Buffer,
+ u32 BufferLen,
+ u64 RequestId,
+ VMBUS_PACKET_TYPE Type,
+ u32 Flags);
+
+extern int VmbusChannelSendPacketPageBuffer(VMBUS_CHANNEL *Channel,
+ PAGE_BUFFER PageBuffers[],
+ u32 PageCount,
+ void *Buffer,
+ u32 BufferLen,
+ u64 RequestId);
+
+extern int VmbusChannelSendPacketMultiPageBuffer(VMBUS_CHANNEL *Channel,
+ MULTIPAGE_BUFFER *MultiPageBuffer,
+ void *Buffer,
+ u32 BufferLen,
+ u64 RequestId);
+
+extern int VmbusChannelEstablishGpadl(VMBUS_CHANNEL *Channel,
+ void *Kbuffer,
+ u32 Size,
+ u32 *GpadlHandle);
+
+extern int VmbusChannelTeardownGpadl(VMBUS_CHANNEL *Channel,
+ u32 GpadlHandle);
+
+extern int VmbusChannelRecvPacket(VMBUS_CHANNEL *Channel,
+ void *Buffer,
+ u32 BufferLen,
+ u32 *BufferActualLen,
+ u64 *RequestId);
+
+extern int VmbusChannelRecvPacketRaw(VMBUS_CHANNEL *Channel,
+ void *Buffer,
+ u32 BufferLen,
+ u32 *BufferActualLen,
+ u64 *RequestId);
+
+extern void VmbusChannelOnChannelEvent(VMBUS_CHANNEL *Channel);
+
+extern void VmbusChannelGetDebugInfo(VMBUS_CHANNEL *Channel,
+ VMBUS_CHANNEL_DEBUG_INFO *DebugInfo);
+
+extern void VmbusChannelOnTimer(unsigned long data);
+
#endif /* _CHANNEL_H_ */
--
1.6.4.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
