iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Staging: hv: remove ULONG_PTR typedef

Browse Source 
The ULONG_PTR typedef is now removed from the Hyper-V driver code.

Cc: Hank Janssen <hjanssen@microsoft.com>
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2009-07-14 15:12:46 -07:00
parent b509bf5bad
commit c4b0bc9482
9 changed files with 52 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/hv/Channel.c
View File

@ -228,9 +228,9 @@ VmbusChannelOpen(
out = PageAlloc((SendRingBufferSize + RecvRingBufferSize) >> PAGE_SHIFT); out = PageAlloc((SendRingBufferSize + RecvRingBufferSize) >> PAGE_SHIFT);
//out = MemAllocZeroed(sendRingBufferSize + recvRingBufferSize); //out = MemAllocZeroed(sendRingBufferSize + recvRingBufferSize);
ASSERT(out); ASSERT(out);
ASSERT(((ULONG_PTR)out & (PAGE_SIZE-1)) == 0); ASSERT(((unsigned long)out & (PAGE_SIZE-1)) == 0);
in = (void*)((ULONG_PTR)out + SendRingBufferSize); in = (void*)((unsigned long)out + SendRingBufferSize);
NewChannel->RingBufferPages = out; NewChannel->RingBufferPages = out;
NewChannel->RingBufferPageCount = (SendRingBufferSize + RecvRingBufferSize) >> PAGE_SHIFT; NewChannel->RingBufferPageCount = (SendRingBufferSize + RecvRingBufferSize) >> PAGE_SHIFT;

8
drivers/staging/hv/Connection.c
View File

@ -79,7 +79,7 @@ VmbusConnect(
} }
gVmbusConnection.RecvInterruptPage = gVmbusConnection.InterruptPage; gVmbusConnection.RecvInterruptPage = gVmbusConnection.InterruptPage;
gVmbusConnection.SendInterruptPage = (void*)((ULONG_PTR)gVmbusConnection.InterruptPage + (PAGE_SIZE >> 1)); gVmbusConnection.SendInterruptPage = (void*)((unsigned long)gVmbusConnection.InterruptPage + (PAGE_SIZE >> 1));
// Setup the monitor notification facility. The 1st page for parent->child and the 2nd page for child->parent // Setup the monitor notification facility. The 1st page for parent->child and the 2nd page for child->parent
gVmbusConnection.MonitorPages = PageAlloc(2); gVmbusConnection.MonitorPages = PageAlloc(2);
@ -103,7 +103,7 @@ VmbusConnect(
msg->VMBusVersionRequested = VMBUS_REVISION_NUMBER; msg->VMBusVersionRequested = VMBUS_REVISION_NUMBER;
msg->InterruptPage = GetPhysicalAddress(gVmbusConnection.InterruptPage); msg->InterruptPage = GetPhysicalAddress(gVmbusConnection.InterruptPage);
msg->MonitorPage1 = GetPhysicalAddress(gVmbusConnection.MonitorPages); msg->MonitorPage1 = GetPhysicalAddress(gVmbusConnection.MonitorPages);
msg->MonitorPage2 = GetPhysicalAddress((void *)((ULONG_PTR)gVmbusConnection.MonitorPages + PAGE_SIZE)); msg->MonitorPage2 = GetPhysicalAddress((void *)((unsigned long)gVmbusConnection.MonitorPages + PAGE_SIZE));
// Add to list before we send the request since we may receive the response // Add to list before we send the request since we may receive the response
// before returning from this routine // before returning from this routine
@ -294,7 +294,7 @@ VmbusProcessChannelEvent(
) )
{ {
VMBUS_CHANNEL* channel; VMBUS_CHANNEL* channel;
u32 relId = (u32)(ULONG_PTR)context; u32 relId = (u32)(unsigned long)context;
ASSERT(relId > 0); ASSERT(relId > 0);
@ -362,7 +362,7 @@ VmbusOnEvents(
{ {
//QueueWorkItem(VmbusProcessEvent, (void*)relid); //QueueWorkItem(VmbusProcessEvent, (void*)relid);
//ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid); //ret = WorkQueueQueueWorkItem(gVmbusConnection.workQueue, VmbusProcessChannelEvent, (void*)relid);
VmbusProcessChannelEvent((void*)(ULONG_PTR)relid); VmbusProcessChannelEvent((void*)(unsigned long)relid);
} }
} }
} }

8
drivers/staging/hv/Hv.c
View File

@ -233,7 +233,7 @@ HvInit (
int maxLeaf; int maxLeaf;
HV_X64_MSR_HYPERCALL_CONTENTS hypercallMsr; HV_X64_MSR_HYPERCALL_CONTENTS hypercallMsr;
void* virtAddr=0; void* virtAddr=0;
ULONG_PTR physAddr=0; unsigned long physAddr=0;
DPRINT_ENTER(VMBUS); DPRINT_ENTER(VMBUS);
@ -311,7 +311,7 @@ HvInit (
goto Cleanup; goto Cleanup;
} }
gHvContext.SignalEventParam = (PHV_INPUT_SIGNAL_EVENT)(ALIGN_UP((ULONG_PTR)gHvContext.SignalEventBuffer, HV_HYPERCALL_PARAM_ALIGN)); gHvContext.SignalEventParam = (PHV_INPUT_SIGNAL_EVENT)(ALIGN_UP((unsigned long)gHvContext.SignalEventBuffer, HV_HYPERCALL_PARAM_ALIGN));
gHvContext.SignalEventParam->ConnectionId.Asu32 = 0; gHvContext.SignalEventParam->ConnectionId.Asu32 = 0;
gHvContext.SignalEventParam->ConnectionId.u.Id = VMBUS_EVENT_CONNECTION_ID; gHvContext.SignalEventParam->ConnectionId.u.Id = VMBUS_EVENT_CONNECTION_ID;
gHvContext.SignalEventParam->FlagNumber = 0; gHvContext.SignalEventParam->FlagNumber = 0;
@ -407,14 +407,14 @@ HvPostMessage(
PHV_INPUT_POST_MESSAGE alignedMsg; PHV_INPUT_POST_MESSAGE alignedMsg;
HV_STATUS status; HV_STATUS status;
ULONG_PTR addr; unsigned long addr;
if (payloadSize > HV_MESSAGE_PAYLOAD_BYTE_COUNT) if (payloadSize > HV_MESSAGE_PAYLOAD_BYTE_COUNT)
{ {
return -1; return -1;
} }
addr = (ULONG_PTR)MemAllocAtomic(sizeof(struct alignedInput)); addr = (unsigned long)MemAllocAtomic(sizeof(struct alignedInput));
if (!addr) if (!addr)
{ {

34
drivers/staging/hv/NetVsc.c
View File

@ -298,7 +298,7 @@ NetVscInitializeReceiveBufferWithNetVsp(
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
ASSERT(((ULONG_PTR)netDevice->ReceiveBuffer & (PAGE_SIZE-1)) == 0); // page-aligned buffer ASSERT(((unsigned long)netDevice->ReceiveBuffer & (PAGE_SIZE-1)) == 0); // page-aligned buffer
DPRINT_INFO(NETVSC, "Establishing receive buffer's GPADL..."); DPRINT_INFO(NETVSC, "Establishing receive buffer's GPADL...");
@ -333,7 +333,7 @@ NetVscInitializeReceiveBufferWithNetVsp(
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
initPacket, initPacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)initPacket, (unsigned long)initPacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) if (ret != 0)
@ -425,7 +425,7 @@ NetVscInitializeSendBufferWithNetVsp(
ret = -1; ret = -1;
goto Cleanup; goto Cleanup;
} }
ASSERT(((ULONG_PTR)netDevice->SendBuffer & (PAGE_SIZE-1)) == 0); // page-aligned buffer ASSERT(((unsigned long)netDevice->SendBuffer & (PAGE_SIZE-1)) == 0); // page-aligned buffer
DPRINT_INFO(NETVSC, "Establishing send buffer's GPADL..."); DPRINT_INFO(NETVSC, "Establishing send buffer's GPADL...");
@ -460,7 +460,7 @@ NetVscInitializeSendBufferWithNetVsp(
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
initPacket, initPacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)initPacket, (unsigned long)initPacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) if (ret != 0)
@ -521,7 +521,7 @@ NetVscDestroyReceiveBuffer(
ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(NetDevice->Device, ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(NetDevice->Device,
revokePacket, revokePacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)revokePacket, (unsigned long)revokePacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
0); 0);
// If we failed here, we might as well return and have a leak rather than continue and a bugchk // If we failed here, we might as well return and have a leak rather than continue and a bugchk
@ -602,7 +602,7 @@ NetVscDestroySendBuffer(
ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(NetDevice->Device, ret = NetDevice->Device->Driver->VmbusChannelInterface.SendPacket(NetDevice->Device,
revokePacket, revokePacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)revokePacket, (unsigned long)revokePacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
0); 0);
// If we failed here, we might as well return and have a leak rather than continue and a bugchk // If we failed here, we might as well return and have a leak rather than continue and a bugchk
@ -681,7 +681,7 @@ NetVscConnectToVsp(
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
initPacket, initPacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)initPacket, (unsigned long)initPacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
@ -728,7 +728,7 @@ NetVscConnectToVsp(
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
initPacket, initPacket,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)initPacket, (unsigned long)initPacket,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
0); 0);
if (ret != 0) if (ret != 0)
@ -1000,7 +1000,7 @@ NetVscOnSendCompletion(
return; return;
} }
nvspPacket = (NVSP_MESSAGE*)((ULONG_PTR)Packet + (Packet->DataOffset8 << 3)); nvspPacket = (NVSP_MESSAGE*)((unsigned long)Packet + (Packet->DataOffset8 << 3));
DPRINT_DBG(NETVSC, "send completion packet - type %d", nvspPacket->Header.MessageType); DPRINT_DBG(NETVSC, "send completion packet - type %d", nvspPacket->Header.MessageType);
@ -1015,7 +1015,7 @@ NetVscOnSendCompletion(
else if (nvspPacket->Header.MessageType == NvspMessage1TypeSendRNDISPacketComplete) else if (nvspPacket->Header.MessageType == NvspMessage1TypeSendRNDISPacketComplete)
{ {
// Get the send context // Get the send context
nvscPacket = (NETVSC_PACKET *)(ULONG_PTR)Packet->TransactionId; nvscPacket = (NETVSC_PACKET *)(unsigned long)Packet->TransactionId;
ASSERT(nvscPacket); ASSERT(nvscPacket);
// Notify the layer above us // Notify the layer above us
@ -1072,14 +1072,14 @@ NetVscOnSend(
Packet->PageBufferCount, Packet->PageBufferCount,
&sendMessage, &sendMessage,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)Packet); (unsigned long)Packet);
} }
else else
{ {
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
&sendMessage, &sendMessage,
sizeof(NVSP_MESSAGE), sizeof(NVSP_MESSAGE),
(ULONG_PTR)Packet, (unsigned long)Packet,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
@ -1109,8 +1109,8 @@ NetVscOnReceive(
NVSP_MESSAGE *nvspPacket; NVSP_MESSAGE *nvspPacket;
NETVSC_PACKET *netvscPacket=NULL; NETVSC_PACKET *netvscPacket=NULL;
LIST_ENTRY* entry; LIST_ENTRY* entry;
ULONG_PTR start; unsigned long start;
ULONG_PTR end, endVirtual; unsigned long end, endVirtual;
//NETVSC_DRIVER_OBJECT *netvscDriver; //NETVSC_DRIVER_OBJECT *netvscDriver;
XFERPAGE_PACKET *xferpagePacket=NULL; XFERPAGE_PACKET *xferpagePacket=NULL;
LIST_ENTRY listHead; LIST_ENTRY listHead;
@ -1136,7 +1136,7 @@ NetVscOnReceive(
return; return;
} }
nvspPacket = (NVSP_MESSAGE*)((ULONG_PTR)Packet + (Packet->DataOffset8 << 3)); nvspPacket = (NVSP_MESSAGE*)((unsigned long)Packet + (Packet->DataOffset8 << 3));
// Make sure this is a valid nvsp packet // Make sure this is a valid nvsp packet
if (nvspPacket->Header.MessageType != NvspMessage1TypeSendRNDISPacket ) if (nvspPacket->Header.MessageType != NvspMessage1TypeSendRNDISPacket )
@ -1230,10 +1230,10 @@ NetVscOnReceive(
netvscPacket->PageBuffers[0].Length = vmxferpagePacket->Ranges[i].ByteCount; netvscPacket->PageBuffers[0].Length = vmxferpagePacket->Ranges[i].ByteCount;
start = GetPhysicalAddress((void*)((ULONG_PTR)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset)); start = GetPhysicalAddress((void*)((unsigned long)netDevice->ReceiveBuffer + vmxferpagePacket->Ranges[i].ByteOffset));
netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT; netvscPacket->PageBuffers[0].Pfn = start >> PAGE_SHIFT;
endVirtual = (ULONG_PTR)netDevice->ReceiveBuffer endVirtual = (unsigned long)netDevice->ReceiveBuffer
+ vmxferpagePacket->Ranges[i].ByteOffset + vmxferpagePacket->Ranges[i].ByteOffset
+ vmxferpagePacket->Ranges[i].ByteCount -1; + vmxferpagePacket->Ranges[i].ByteCount -1;
end = GetPhysicalAddress((void*)endVirtual); end = GetPhysicalAddress((void*)endVirtual);

16
drivers/staging/hv/RndisFilter.c
View File

@ -362,11 +362,11 @@ RndisFilterSendRequest(
packet->PageBuffers[0].Pfn = GetPhysicalAddress(&Request->RequestMessage) >> PAGE_SHIFT; packet->PageBuffers[0].Pfn = GetPhysicalAddress(&Request->RequestMessage) >> PAGE_SHIFT;
packet->PageBuffers[0].Length = Request->RequestMessage.MessageLength; packet->PageBuffers[0].Length = Request->RequestMessage.MessageLength;
packet->PageBuffers[0].Offset = (ULONG_PTR)&Request->RequestMessage & (PAGE_SIZE -1); packet->PageBuffers[0].Offset = (unsigned long)&Request->RequestMessage & (PAGE_SIZE -1);
packet->Completion.Send.SendCompletionContext = Request;//packet; packet->Completion.Send.SendCompletionContext = Request;//packet;
packet->Completion.Send.OnSendCompletion = RndisFilterOnSendRequestCompletion; packet->Completion.Send.OnSendCompletion = RndisFilterOnSendRequestCompletion;
packet->Completion.Send.SendCompletionTid = (ULONG_PTR)Device; packet->Completion.Send.SendCompletionTid = (unsigned long)Device;
ret = gRndisFilter.InnerDriver.OnSend(Device->NetDevice->Device, packet); ret = gRndisFilter.InnerDriver.OnSend(Device->NetDevice->Device, packet);
DPRINT_EXIT(NETVSC); DPRINT_EXIT(NETVSC);
@ -523,7 +523,7 @@ RndisFilterOnReceive(
rndisHeader = (RNDIS_MESSAGE*)PageMapVirtualAddress(Packet->PageBuffers[0].Pfn); rndisHeader = (RNDIS_MESSAGE*)PageMapVirtualAddress(Packet->PageBuffers[0].Pfn);
rndisHeader = (void*)((ULONG_PTR)rndisHeader + Packet->PageBuffers[0].Offset); rndisHeader = (void*)((unsigned long)rndisHeader + Packet->PageBuffers[0].Offset);
// Make sure we got a valid rndis message // Make sure we got a valid rndis message
// FIXME: There seems to be a bug in set completion msg where its MessageLength is 16 bytes but // FIXME: There seems to be a bug in set completion msg where its MessageLength is 16 bytes but
@ -531,7 +531,7 @@ RndisFilterOnReceive(
#if 0 #if 0
if ( Packet->TotalDataBufferLength != rndisHeader->MessageLength ) if ( Packet->TotalDataBufferLength != rndisHeader->MessageLength )
{ {
PageUnmapVirtualAddress((void*)(ULONG_PTR)rndisHeader - Packet->PageBuffers[0].Offset); PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset);
DPRINT_ERR(NETVSC, "invalid rndis message? (expected %u bytes got %u)...dropping this message!", DPRINT_ERR(NETVSC, "invalid rndis message? (expected %u bytes got %u)...dropping this message!",
rndisHeader->MessageLength, Packet->TotalDataBufferLength); rndisHeader->MessageLength, Packet->TotalDataBufferLength);
@ -548,7 +548,7 @@ RndisFilterOnReceive(
memcpy(&rndisMessage, rndisHeader, (rndisHeader->MessageLength > sizeof(RNDIS_MESSAGE))?sizeof(RNDIS_MESSAGE):rndisHeader->MessageLength); memcpy(&rndisMessage, rndisHeader, (rndisHeader->MessageLength > sizeof(RNDIS_MESSAGE))?sizeof(RNDIS_MESSAGE):rndisHeader->MessageLength);
PageUnmapVirtualAddress((void*)(ULONG_PTR)rndisHeader - Packet->PageBuffers[0].Offset); PageUnmapVirtualAddress((void*)(unsigned long)rndisHeader - Packet->PageBuffers[0].Offset);
DumpRndisMessage(&rndisMessage); DumpRndisMessage(&rndisMessage);
@ -633,7 +633,7 @@ RndisFilterQueryDevice(
} }
memcpy(Result, memcpy(Result,
(void*)((ULONG_PTR)queryComplete + queryComplete->InformationBufferOffset), (void*)((unsigned long)queryComplete + queryComplete->InformationBufferOffset),
queryComplete->InformationBufferLength); queryComplete->InformationBufferLength);
*ResultSize = queryComplete->InformationBufferLength; *ResultSize = queryComplete->InformationBufferLength;
@ -703,7 +703,7 @@ RndisFilterSetPacketFilter(
set->InformationBufferLength = sizeof(u32); set->InformationBufferLength = sizeof(u32);
set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST); set->InformationBufferOffset = sizeof(RNDIS_SET_REQUEST);
memcpy((void*)(ULONG_PTR)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(u32)); memcpy((void*)(unsigned long)set + sizeof(RNDIS_SET_REQUEST), &NewFilter, sizeof(u32));
ret = RndisFilterSendRequest(Device, request); ret = RndisFilterSendRequest(Device, request);
if (ret != 0) if (ret != 0)
@ -1113,7 +1113,7 @@ RndisFilterOnSend(
Packet->IsDataPacket = TRUE; Packet->IsDataPacket = TRUE;
Packet->PageBuffers[0].Pfn = GetPhysicalAddress(rndisMessage) >> PAGE_SHIFT; Packet->PageBuffers[0].Pfn = GetPhysicalAddress(rndisMessage) >> PAGE_SHIFT;
Packet->PageBuffers[0].Offset = (ULONG_PTR)rndisMessage & (PAGE_SIZE-1); Packet->PageBuffers[0].Offset = (unsigned long)rndisMessage & (PAGE_SIZE-1);
Packet->PageBuffers[0].Length = rndisMessageSize; Packet->PageBuffers[0].Length = rndisMessageSize;
// Save the packet send completion and context // Save the packet send completion and context

16
drivers/staging/hv/StorVsc.c
View File

@ -388,7 +388,7 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)request, (unsigned long)request,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0) if ( ret != 0)
@ -418,7 +418,7 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)request, (unsigned long)request,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if ( ret != 0) if ( ret != 0)
@ -447,7 +447,7 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)request, (unsigned long)request,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
@ -481,7 +481,7 @@ static int StorVscChannelInit(DEVICE_OBJECT *Device)
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)request, (unsigned long)request,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
@ -650,7 +650,7 @@ StorVscOnHostReset(
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)&storDevice->ResetRequest, (unsigned long)&storDevice->ResetRequest,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
if (ret != 0) if (ret != 0)
@ -752,14 +752,14 @@ StorVscOnIORequest(
&requestExtension->Request->DataBuffer, &requestExtension->Request->DataBuffer,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)requestExtension); (unsigned long)requestExtension);
} }
else else
{ {
ret = Device->Driver->VmbusChannelInterface.SendPacket(Device, ret = Device->Driver->VmbusChannelInterface.SendPacket(Device,
vstorPacket, vstorPacket,
sizeof(VSTOR_PACKET), sizeof(VSTOR_PACKET),
(ULONG_PTR)requestExtension, (unsigned long)requestExtension,
VmbusPacketTypeDataInBand, VmbusPacketTypeDataInBand,
VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED);
} }
@ -938,7 +938,7 @@ StorVscOnChannelCallback(
//ASSERT(bytesRecvd == sizeof(VSTOR_PACKET)); //ASSERT(bytesRecvd == sizeof(VSTOR_PACKET));
request = (STORVSC_REQUEST_EXTENSION*)(ULONG_PTR)requestId; request = (STORVSC_REQUEST_EXTENSION*)(unsigned long)requestId;
ASSERT(request); ASSERT(request);
//if (vstorPacket.Flags & SYNTHETIC_FLAG) //if (vstorPacket.Flags & SYNTHETIC_FLAG)

8
drivers/staging/hv/include/osd.h
View File

@ -115,8 +115,6 @@ typedef void* HANDLE;
typedef u32 DWORD; typedef u32 DWORD;
typedef unsigned char BYTE; typedef unsigned char BYTE;
typedef unsigned long ULONG_PTR;
typedef struct { typedef struct {
unsigned char Data[16]; unsigned char Data[16];
} GUID; } GUID;
@ -217,12 +215,12 @@ extern void SpinlockRelease(HANDLE hSpin);
#define GetVirtualAddress Physical2LogicalAddr #define GetVirtualAddress Physical2LogicalAddr
void* Physical2LogicalAddr(ULONG_PTR PhysAddr); void* Physical2LogicalAddr(unsigned long PhysAddr);
#define GetPhysicalAddress Logical2PhysicalAddr #define GetPhysicalAddress Logical2PhysicalAddr
ULONG_PTR Logical2PhysicalAddr(void * LogicalAddr); unsigned long Logical2PhysicalAddr(void * LogicalAddr);
ULONG_PTR Virtual2Physical(void * VirtAddr); unsigned long Virtual2Physical(void * VirtAddr);
void* PageMapVirtualAddress(unsigned long Pfn); void* PageMapVirtualAddress(unsigned long Pfn);
void PageUnmapVirtualAddress(void* VirtAddr); void PageUnmapVirtualAddress(void* VirtAddr);

4
drivers/staging/hv/netvsc_drv.c
View File

@ -386,7 +386,7 @@ Desc: Send completion processing
static void netvsc_xmit_completion(void *context) static void netvsc_xmit_completion(void *context)
{ {
NETVSC_PACKET *packet = (NETVSC_PACKET *)context; NETVSC_PACKET *packet = (NETVSC_PACKET *)context;
struct sk_buff *skb = (struct sk_buff *)(ULONG_PTR)packet->Completion.Send.SendCompletionTid; struct sk_buff *skb = (struct sk_buff *)(unsigned long)packet->Completion.Send.SendCompletionTid;
struct net_device* net; struct net_device* net;
DPRINT_ENTER(NETVSC_DRV); DPRINT_ENTER(NETVSC_DRV);
@ -478,7 +478,7 @@ static int netvsc_start_xmit (struct sk_buff *skb, struct net_device *net)
// Set the completion routine // Set the completion routine
packet->Completion.Send.OnSendCompletion = netvsc_xmit_completion; packet->Completion.Send.OnSendCompletion = netvsc_xmit_completion;
packet->Completion.Send.SendCompletionContext = packet; packet->Completion.Send.SendCompletionContext = packet;
packet->Completion.Send.SendCompletionTid = (ULONG_PTR)skb; packet->Completion.Send.SendCompletionTid = (unsigned long)skb;
retry_send: retry_send:
ret = net_drv_obj->OnSend(&net_device_ctx->device_ctx->device_obj, packet); ret = net_drv_obj->OnSend(&net_device_ctx->device_ctx->device_obj, packet);

8
drivers/staging/hv/osd.c
View File

@ -407,23 +407,23 @@ void SpinlockClose(HANDLE hSpin)
kfree(spin); kfree(spin);
} }
void* Physical2LogicalAddr(ULONG_PTR PhysAddr) void* Physical2LogicalAddr(unsigned long PhysAddr)
{ {
void* logicalAddr = phys_to_virt(PhysAddr); void* logicalAddr = phys_to_virt(PhysAddr);
BUG_ON(!virt_addr_valid(logicalAddr)); BUG_ON(!virt_addr_valid(logicalAddr));
return logicalAddr; return logicalAddr;
} }
ULONG_PTR Logical2PhysicalAddr(void * LogicalAddr) unsigned long Logical2PhysicalAddr(void * LogicalAddr)
{ {
BUG_ON(!virt_addr_valid(LogicalAddr)); BUG_ON(!virt_addr_valid(LogicalAddr));
return virt_to_phys(LogicalAddr); return virt_to_phys(LogicalAddr);
} }
ULONG_PTR Virtual2Physical(void * VirtAddr) unsigned long Virtual2Physical(void * VirtAddr)
{ {
ULONG_PTR pfn = vmalloc_to_pfn(VirtAddr); unsigned long pfn = vmalloc_to_pfn(VirtAddr);
return pfn << PAGE_SHIFT; return pfn << PAGE_SHIFT;
} }