Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 220369
b: refs/heads/master
c: 9de050c
h: refs/heads/master
i:
  220367: a8226f0
v: v3
  • Loading branch information
Haiyang Zhang authored and Greg Kroah-Hartman committed Oct 15, 2010
1 parent 93d557b commit 9831bba
Show file tree
Hide file tree
Showing 2 changed files with 65 additions and 63 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cc58cbb88569e3ecb9786b3da891e7d019d2cfff
refs/heads/master: 9de050c420648ef500f18be5b22c35951acce622
126 changes: 64 additions & 62 deletions trunk/drivers/staging/hv/channel_interface.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,116 +25,118 @@
#include "osd.h"
#include "vmbus_private.h"

static int IVmbusChannelOpen(struct hv_device *device, u32 SendBufferSize,
u32 RecvRingBufferSize, void *UserData,
u32 UserDataLen,
void (*ChannelCallback)(void *context),
void *Context)
static int IVmbusChannelOpen(struct hv_device *device, u32 sendbuffer_size,
u32 recv_ringbuffer_size, void *userdata,
u32 userdatalen,
void (*channel_callback)(void *context),
void *context)
{
return vmbus_open(device->context, SendBufferSize,
RecvRingBufferSize, UserData, UserDataLen,
ChannelCallback, Context);
return vmbus_open(device->context, sendbuffer_size,
recv_ringbuffer_size, userdata, userdatalen,
channel_callback, context);
}

static void IVmbusChannelClose(struct hv_device *device)
{
vmbus_close(device->context);
}

static int IVmbusChannelSendPacket(struct hv_device *device, const void *Buffer,
u32 BufferLen, u64 RequestId, u32 Type,
u32 Flags)
static int IVmbusChannelSendPacket(struct hv_device *device, const void *buffer,
u32 bufferlen, u64 requestid, u32 type,
u32 flags)
{
return vmbus_sendpacket(device->context, Buffer, BufferLen,
RequestId, Type, Flags);
return vmbus_sendpacket(device->context, buffer, bufferlen,
requestid, type, flags);
}

static int IVmbusChannelSendPacketPageBuffer(struct hv_device *device,
struct hv_page_buffer PageBuffers[],
u32 PageCount, void *Buffer,
u32 BufferLen, u64 RequestId)
struct hv_page_buffer pagebuffers[],
u32 pagecount, void *buffer,
u32 bufferlen, u64 requestid)
{
return vmbus_sendpacket_pagebuffer(device->context, PageBuffers,
PageCount, Buffer, BufferLen,
RequestId);
return vmbus_sendpacket_pagebuffer(device->context, pagebuffers,
pagecount, buffer, bufferlen,
requestid);
}

static int IVmbusChannelSendPacketMultiPageBuffer(struct hv_device *device,
struct hv_multipage_buffer *MultiPageBuffer,
void *Buffer, u32 BufferLen, u64 RequestId)
struct hv_multipage_buffer *multi_pagebuffer,
void *buffer, u32 bufferlen, u64 requestid)
{
return vmbus_sendpacket_multipagebuffer(device->context,
MultiPageBuffer, Buffer,
BufferLen, RequestId);
multi_pagebuffer, buffer,
bufferlen, requestid);
}

static int IVmbusChannelRecvPacket(struct hv_device *device, void *Buffer,
u32 BufferLen, u32 *BufferActualLen,
u64 *RequestId)
static int IVmbusChannelRecvPacket(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *buffer_actuallen,
u64 *requestid)
{
return vmbus_recvpacket(device->context, Buffer, BufferLen,
BufferActualLen, RequestId);
return vmbus_recvpacket(device->context, buffer, bufferlen,
buffer_actuallen, requestid);
}

static int IVmbusChannelRecvPacketRaw(struct hv_device *device, void *Buffer,
u32 BufferLen, u32 *BufferActualLen,
u64 *RequestId)
static int IVmbusChannelRecvPacketRaw(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *buffer_actuallen,
u64 *requestid)
{
return vmbus_recvpacket_raw(device->context, Buffer, BufferLen,
BufferActualLen, RequestId);
return vmbus_recvpacket_raw(device->context, buffer, bufferlen,
buffer_actuallen, requestid);
}

static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *Buffer,
u32 BufferLen, u32 *GpadlHandle)
static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *buffer,
u32 bufferlen, u32 *gpadl_handle)
{
return vmbus_establish_gpadl(device->context, Buffer, BufferLen,
GpadlHandle);
return vmbus_establish_gpadl(device->context, buffer, bufferlen,
gpadl_handle);
}

static int IVmbusChannelTeardownGpadl(struct hv_device *device, u32 GpadlHandle)
static int IVmbusChannelTeardownGpadl(struct hv_device *device,
u32 gpadl_handle)
{
return vmbus_teardown_gpadl(device->context, GpadlHandle);
return vmbus_teardown_gpadl(device->context, gpadl_handle);

}


void GetChannelInfo(struct hv_device *device, struct hv_device_info *info)
{
struct vmbus_channel_debug_info debugInfo;
struct vmbus_channel_debug_info debug_info;

if (!device->context)
return;

vmbus_get_debug_info(device->context, &debugInfo);
vmbus_get_debug_info(device->context, &debug_info);

info->ChannelId = debugInfo.RelId;
info->ChannelState = debugInfo.State;
memcpy(&info->ChannelType, &debugInfo.InterfaceType,
info->ChannelId = debug_info.RelId;
info->ChannelState = debug_info.State;
memcpy(&info->ChannelType, &debug_info.InterfaceType,
sizeof(struct hv_guid));
memcpy(&info->ChannelInstance, &debugInfo.InterfaceInstance,
memcpy(&info->ChannelInstance, &debug_info.InterfaceInstance,
sizeof(struct hv_guid));

info->MonitorId = debugInfo.MonitorId;
info->MonitorId = debug_info.MonitorId;

info->ServerMonitorPending = debugInfo.ServerMonitorPending;
info->ServerMonitorLatency = debugInfo.ServerMonitorLatency;
info->ServerMonitorConnectionId = debugInfo.ServerMonitorConnectionId;
info->ServerMonitorPending = debug_info.ServerMonitorPending;
info->ServerMonitorLatency = debug_info.ServerMonitorLatency;
info->ServerMonitorConnectionId = debug_info.ServerMonitorConnectionId;

info->ClientMonitorPending = debugInfo.ClientMonitorPending;
info->ClientMonitorLatency = debugInfo.ClientMonitorLatency;
info->ClientMonitorConnectionId = debugInfo.ClientMonitorConnectionId;
info->ClientMonitorPending = debug_info.ClientMonitorPending;
info->ClientMonitorLatency = debug_info.ClientMonitorLatency;
info->ClientMonitorConnectionId = debug_info.ClientMonitorConnectionId;

info->Inbound.InterruptMask = debugInfo.Inbound.CurrentInterruptMask;
info->Inbound.ReadIndex = debugInfo.Inbound.CurrentReadIndex;
info->Inbound.WriteIndex = debugInfo.Inbound.CurrentWriteIndex;
info->Inbound.BytesAvailToRead = debugInfo.Inbound.BytesAvailToRead;
info->Inbound.BytesAvailToWrite = debugInfo.Inbound.BytesAvailToWrite;
info->Inbound.InterruptMask = debug_info.Inbound.CurrentInterruptMask;
info->Inbound.ReadIndex = debug_info.Inbound.CurrentReadIndex;
info->Inbound.WriteIndex = debug_info.Inbound.CurrentWriteIndex;
info->Inbound.BytesAvailToRead = debug_info.Inbound.BytesAvailToRead;
info->Inbound.BytesAvailToWrite = debug_info.Inbound.BytesAvailToWrite;

info->Outbound.InterruptMask = debugInfo.Outbound.CurrentInterruptMask;
info->Outbound.ReadIndex = debugInfo.Outbound.CurrentReadIndex;
info->Outbound.WriteIndex = debugInfo.Outbound.CurrentWriteIndex;
info->Outbound.BytesAvailToRead = debugInfo.Outbound.BytesAvailToRead;
info->Outbound.BytesAvailToWrite = debugInfo.Outbound.BytesAvailToWrite;
info->Outbound.InterruptMask = debug_info.Outbound.CurrentInterruptMask;
info->Outbound.ReadIndex = debug_info.Outbound.CurrentReadIndex;
info->Outbound.WriteIndex = debug_info.Outbound.CurrentWriteIndex;
info->Outbound.BytesAvailToRead = debug_info.Outbound.BytesAvailToRead;
info->Outbound.BytesAvailToWrite =
debug_info.Outbound.BytesAvailToWrite;
}


Expand Down

0 comments on commit 9831bba

Please sign in to comment.