From 490707d2aaf4b142fb2fb53d8065dbae95b41377 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 28 Aug 2009 16:25:39 -0700 Subject: [PATCH] Staging: hv: coding style cleanups of ChannelInterface.c Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/ChannelInterface.c | 370 ++++++++++++++-------------------- 1 file changed, 152 insertions(+), 218 deletions(-) rewrite drivers/staging/hv/ChannelInterface.c (83%) diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c dissimilarity index 83% index 3463ea3640e..26309abfa06 100644 --- a/drivers/staging/hv/ChannelInterface.c +++ b/drivers/staging/hv/ChannelInterface.c @@ -1,218 +1,152 @@ -/* - * - * 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 - * Hank Janssen - * - */ - -#include -#include -#include "osd.h" -#include "VmbusPrivate.h" - -static int -IVmbusChannelOpen( - struct hv_device *Device, - u32 SendBufferSize, - u32 RecvRingBufferSize, - void * UserData, - u32 UserDataLen, - VMBUS_CHANNEL_CALLBACK ChannelCallback, - void * Context - ) -{ - return VmbusChannelOpen((struct vmbus_channel *)Device->context, - SendBufferSize, - RecvRingBufferSize, - UserData, - UserDataLen, - ChannelCallback, - Context); -} - - -static void -IVmbusChannelClose( - struct hv_device *Device - ) -{ - VmbusChannelClose((struct vmbus_channel *)Device->context); -} - - -static int -IVmbusChannelSendPacket( - struct hv_device *Device, - const void * Buffer, - u32 BufferLen, - u64 RequestId, - u32 Type, - u32 Flags - ) -{ - return VmbusChannelSendPacket((struct vmbus_channel *)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 - ) -{ - return VmbusChannelSendPacketPageBuffer((struct vmbus_channel *)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 - ) -{ - return VmbusChannelSendPacketMultiPageBuffer((struct vmbus_channel *)Device->context, - MultiPageBuffer, - Buffer, - BufferLen, - RequestId); -} - -static int -IVmbusChannelRecvPacket ( - struct hv_device *Device, - void * Buffer, - u32 BufferLen, - u32* BufferActualLen, - u64* RequestId - ) -{ - return VmbusChannelRecvPacket((struct vmbus_channel *)Device->context, - Buffer, - BufferLen, - BufferActualLen, - RequestId); -} - -static int -IVmbusChannelRecvPacketRaw( - struct hv_device *Device, - void * Buffer, - u32 BufferLen, - u32* BufferActualLen, - u64* RequestId - ) -{ - return VmbusChannelRecvPacketRaw((struct vmbus_channel *)Device->context, - Buffer, - BufferLen, - BufferActualLen, - RequestId); -} - -static int -IVmbusChannelEstablishGpadl( - struct hv_device *Device, - void * Buffer, - u32 BufferLen, - u32* GpadlHandle - ) -{ - return VmbusChannelEstablishGpadl((struct vmbus_channel *)Device->context, - Buffer, - BufferLen, - GpadlHandle); -} - -static int -IVmbusChannelTeardownGpadl( - struct hv_device *Device, - u32 GpadlHandle - ) -{ - return VmbusChannelTeardownGpadl((struct vmbus_channel *)Device->context, - GpadlHandle); - -} - -void GetChannelInterface(struct vmbus_channel_interface *ChannelInterface) -{ - ChannelInterface->Open = IVmbusChannelOpen; - ChannelInterface->Close = IVmbusChannelClose; - ChannelInterface->SendPacket = IVmbusChannelSendPacket; - ChannelInterface->SendPacketPageBuffer = IVmbusChannelSendPacketPageBuffer; - ChannelInterface->SendPacketMultiPageBuffer = IVmbusChannelSendPacketMultiPageBuffer; - ChannelInterface->RecvPacket = IVmbusChannelRecvPacket; - ChannelInterface->RecvPacketRaw = IVmbusChannelRecvPacketRaw; - ChannelInterface->EstablishGpadl = IVmbusChannelEstablishGpadl; - ChannelInterface->TeardownGpadl = IVmbusChannelTeardownGpadl; - ChannelInterface->GetInfo = GetChannelInfo; -} - - -void GetChannelInfo(struct hv_device *Device, struct hv_device_info *DeviceInfo) -{ - struct vmbus_channel_debug_info debugInfo; - - if (Device->context) - { - VmbusChannelGetDebugInfo((struct vmbus_channel *)Device->context, &debugInfo); - - DeviceInfo->ChannelId = debugInfo.RelId; - DeviceInfo->ChannelState = debugInfo.State; - memcpy(&DeviceInfo->ChannelType, &debugInfo.InterfaceType, sizeof(struct hv_guid)); - memcpy(&DeviceInfo->ChannelInstance, &debugInfo.InterfaceInstance, sizeof(struct hv_guid)); - - DeviceInfo->MonitorId = debugInfo.MonitorId; - - DeviceInfo->ServerMonitorPending = debugInfo.ServerMonitorPending; - DeviceInfo->ServerMonitorLatency = debugInfo.ServerMonitorLatency; - DeviceInfo->ServerMonitorConnectionId = debugInfo.ServerMonitorConnectionId; - - DeviceInfo->ClientMonitorPending = debugInfo.ClientMonitorPending; - DeviceInfo->ClientMonitorLatency = debugInfo.ClientMonitorLatency; - DeviceInfo->ClientMonitorConnectionId = debugInfo.ClientMonitorConnectionId; - - DeviceInfo->Inbound.InterruptMask = debugInfo.Inbound.CurrentInterruptMask; - DeviceInfo->Inbound.ReadIndex = debugInfo.Inbound.CurrentReadIndex; - DeviceInfo->Inbound.WriteIndex = debugInfo.Inbound.CurrentWriteIndex; - DeviceInfo->Inbound.BytesAvailToRead = debugInfo.Inbound.BytesAvailToRead; - DeviceInfo->Inbound.BytesAvailToWrite = debugInfo.Inbound.BytesAvailToWrite; - - DeviceInfo->Outbound.InterruptMask = debugInfo.Outbound.CurrentInterruptMask; - DeviceInfo->Outbound.ReadIndex = debugInfo.Outbound.CurrentReadIndex; - DeviceInfo->Outbound.WriteIndex = debugInfo.Outbound.CurrentWriteIndex; - DeviceInfo->Outbound.BytesAvailToRead = debugInfo.Outbound.BytesAvailToRead; - DeviceInfo->Outbound.BytesAvailToWrite = debugInfo.Outbound.BytesAvailToWrite; - } -} +/* + * + * 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 + * Hank Janssen + * + */ +#include +#include +#include "osd.h" +#include "VmbusPrivate.h" + +static int IVmbusChannelOpen(struct hv_device *device, u32 SendBufferSize, + u32 RecvRingBufferSize, void *UserData, + u32 UserDataLen, + VMBUS_CHANNEL_CALLBACK ChannelCallback, + void *Context) +{ + return VmbusChannelOpen(device->context, SendBufferSize, + RecvRingBufferSize, UserData, UserDataLen, + ChannelCallback, Context); +} + +static void IVmbusChannelClose(struct hv_device *device) +{ + VmbusChannelClose(device->context); +} + +static int IVmbusChannelSendPacket(struct hv_device *device, const void *Buffer, + u32 BufferLen, u64 RequestId, u32 Type, + u32 Flags) +{ + return VmbusChannelSendPacket(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) +{ + return VmbusChannelSendPacketPageBuffer(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) +{ + return VmbusChannelSendPacketMultiPageBuffer(device->context, + MultiPageBuffer, Buffer, + BufferLen, RequestId); +} + +static int IVmbusChannelRecvPacket(struct hv_device *device, void *Buffer, + u32 BufferLen, u32 *BufferActualLen, + u64 *RequestId) +{ + return VmbusChannelRecvPacket(device->context, Buffer, BufferLen, + BufferActualLen, RequestId); +} + +static int IVmbusChannelRecvPacketRaw(struct hv_device *device, void *Buffer, + u32 BufferLen, u32 *BufferActualLen, + u64 *RequestId) +{ + return VmbusChannelRecvPacketRaw(device->context, Buffer, BufferLen, + BufferActualLen, RequestId); +} + +static int IVmbusChannelEstablishGpadl(struct hv_device *device, void *Buffer, + u32 BufferLen, u32 *GpadlHandle) +{ + return VmbusChannelEstablishGpadl(device->context, Buffer, BufferLen, + GpadlHandle); +} + +static int IVmbusChannelTeardownGpadl(struct hv_device *device, u32 GpadlHandle) +{ + return VmbusChannelTeardownGpadl(device->context, GpadlHandle); + +} + +void GetChannelInterface(struct vmbus_channel_interface *iface) +{ + iface->Open = IVmbusChannelOpen; + iface->Close = IVmbusChannelClose; + iface->SendPacket = IVmbusChannelSendPacket; + iface->SendPacketPageBuffer = IVmbusChannelSendPacketPageBuffer; + iface->SendPacketMultiPageBuffer = + IVmbusChannelSendPacketMultiPageBuffer; + iface->RecvPacket = IVmbusChannelRecvPacket; + iface->RecvPacketRaw = IVmbusChannelRecvPacketRaw; + iface->EstablishGpadl = IVmbusChannelEstablishGpadl; + iface->TeardownGpadl = IVmbusChannelTeardownGpadl; + iface->GetInfo = GetChannelInfo; +} + +void GetChannelInfo(struct hv_device *device, struct hv_device_info *info) +{ + struct vmbus_channel_debug_info debugInfo; + + if (!device->context) + return; + + VmbusChannelGetDebugInfo(device->context, &debugInfo); + + info->ChannelId = debugInfo.RelId; + info->ChannelState = debugInfo.State; + memcpy(&info->ChannelType, &debugInfo.InterfaceType, + sizeof(struct hv_guid)); + memcpy(&info->ChannelInstance, &debugInfo.InterfaceInstance, + sizeof(struct hv_guid)); + + info->MonitorId = debugInfo.MonitorId; + + info->ServerMonitorPending = debugInfo.ServerMonitorPending; + info->ServerMonitorLatency = debugInfo.ServerMonitorLatency; + info->ServerMonitorConnectionId = debugInfo.ServerMonitorConnectionId; + + info->ClientMonitorPending = debugInfo.ClientMonitorPending; + info->ClientMonitorLatency = debugInfo.ClientMonitorLatency; + info->ClientMonitorConnectionId = debugInfo.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->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; +} -- 2.11.4.GIT