From b7f52782ae04d4c4384e1c964ab574ed67805027 Mon Sep 17 00:00:00 2001 From: shefty Date: Thu, 17 Jul 2008 06:28:11 +0000 Subject: [PATCH] winverbs: update to account for changes to ci_umv_buf p_inout_buf was changed from void * to uint64_t Signed-off-by: Sean Hefty git-svn-id: svn://openib.tc.cornell.edu/gen1@1407 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- .../winverbs/core/winverbs/kernel/wv_driver.h | 2 +- branches/winverbs/core/winverbs/user/wv_cq.cpp | 12 ++++++++---- .../winverbs/core/winverbs/user/wv_device.cpp | 6 ++++-- branches/winverbs/core/winverbs/user/wv_pd.cpp | 18 ++++++++++++------ branches/winverbs/core/winverbs/user/wv_qp.cpp | 6 ++++-- .../winverbs/core/winverbs/user/wv_srq.cpp | 18 ++++++++++++------ 6 files changed, 41 insertions(+), 21 deletions(-) diff --git a/branches/winverbs/core/winverbs/kernel/wv_driver.h b/branches/winverbs/core/winverbs/kernel/wv_driver.h index 2a590f30..ea209c0e 100644 --- a/branches/winverbs/core/winverbs/kernel/wv_driver.h +++ b/branches/winverbs/core/winverbs/kernel/wv_driver.h @@ -62,7 +62,7 @@ static inline void WvInitVerbsData(ci_umv_buf_t *pVerbsData, UINT32 Command, pVerbsData->command = Command; pVerbsData->input_size = (UINT32) InputLength; pVerbsData->output_size = (UINT32) OutputLength; - pVerbsData->p_inout_buf = pBuffer; + pVerbsData->p_inout_buf = (ULONG_PTR) pBuffer; pVerbsData->status = 0; } diff --git a/branches/winverbs/core/winverbs/user/wv_cq.cpp b/branches/winverbs/core/winverbs/user/wv_cq.cpp index 7ad9f01c..fafce977 100644 --- a/branches/winverbs/core/winverbs/user/wv_cq.cpp +++ b/branches/winverbs/core/winverbs/user/wv_cq.cpp @@ -69,7 +69,8 @@ Create(SIZE_T *pEntries) pId->Id = m_pDevice->m_Id; pId->VerbInfo = verbsData.command; pId->Data = (UINT32) *pEntries; - RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_CQ_CREATE, pId, sizeof WV_IO_ID + verbsData.input_size, @@ -83,7 +84,8 @@ Create(SIZE_T *pEntries) } verbsData.status = pId->VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1, + verbsData.output_size); buf.Put(); post: @@ -175,7 +177,8 @@ Resize(SIZE_T* pEntries) pId->Id = m_Id; pId->VerbInfo = verbsData.command; pId->Data = (UINT32) *pEntries; - RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_CQ_RESIZE, pId, sizeof WV_IO_ID + verbsData.input_size, @@ -188,7 +191,8 @@ Resize(SIZE_T* pEntries) } verbsData.status = pId->VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1, + verbsData.output_size); buf.Put(); post: diff --git a/branches/winverbs/core/winverbs/user/wv_device.cpp b/branches/winverbs/core/winverbs/user/wv_device.cpp index d52d56f3..70f63ea7 100644 --- a/branches/winverbs/core/winverbs/user/wv_device.cpp +++ b/branches/winverbs/core/winverbs/user/wv_device.cpp @@ -96,7 +96,8 @@ Open(UINT64 Guid) pId->Id = m_Guid; pId->VerbInfo = verbsData.command; - RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_DEVICE_OPEN, pId, sizeof WV_IO_ID + verbsData.input_size, @@ -108,7 +109,8 @@ Open(UINT64 Guid) } verbsData.status = pId->VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1, + verbsData.output_size); buf.Put(); post: diff --git a/branches/winverbs/core/winverbs/user/wv_pd.cpp b/branches/winverbs/core/winverbs/user/wv_pd.cpp index 93238fd5..5063e54e 100644 --- a/branches/winverbs/core/winverbs/user/wv_pd.cpp +++ b/branches/winverbs/core/winverbs/user/wv_pd.cpp @@ -68,7 +68,8 @@ Allocate(void) pId->Id = m_pDevice->m_Id; pId->VerbInfo = verbsData.command; - RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_PD_ALLOCATE, pId, sizeof WV_IO_ID + verbsData.input_size, @@ -81,7 +82,8 @@ Allocate(void) } verbsData.status = pId->VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1, + verbsData.output_size); buf.Put(); post: @@ -239,7 +241,8 @@ Allocate(void) pId->Id = m_pPd->m_Id; pId->VerbInfo = verbsData.command; - RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_MW_ALLOCATE, pId, sizeof WV_IO_ID + verbsData.input_size, @@ -253,7 +256,8 @@ Allocate(void) } verbsData.status = pId->VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1, + verbsData.output_size); buf.Put(); post: @@ -394,7 +398,8 @@ Create(WV_ADDRESS_VECTOR* pAddress) pav->Id.Id = m_pPd->m_Id; pav->Id.VerbInfo = verbsData.command; WvIoConvertAv(&pav->AddressVector, pAddress); - RtlCopyMemory(pav + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pav + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_AH_CREATE, pav, sizeof WV_IO_AH_CREATE + verbsData.input_size, @@ -407,7 +412,8 @@ Create(WV_ADDRESS_VECTOR* pAddress) } verbsData.status = pav->Id.VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pav + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pav + 1, + verbsData.output_size); buf.Put(); post: diff --git a/branches/winverbs/core/winverbs/user/wv_qp.cpp b/branches/winverbs/core/winverbs/user/wv_qp.cpp index 3d7af3dc..3f9a9eb4 100644 --- a/branches/winverbs/core/winverbs/user/wv_qp.cpp +++ b/branches/winverbs/core/winverbs/user/wv_qp.cpp @@ -265,7 +265,8 @@ Create(WV_QP_CREATE* pAttributes) pattr->Id.Id = m_pPd->m_Id; pattr->Id.VerbInfo = verbsData.command; WvIoConvertQpCreate(pattr, pAttributes); - RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_QP_CREATE, pattr, sizeof WV_IO_QP_CREATE + verbsData.input_size, @@ -278,7 +279,8 @@ Create(WV_QP_CREATE* pAttributes) } verbsData.status = pattr->Id.VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1, + verbsData.output_size); buf.Put(); post: diff --git a/branches/winverbs/core/winverbs/user/wv_srq.cpp b/branches/winverbs/core/winverbs/user/wv_srq.cpp index 3796b967..0c9650f3 100644 --- a/branches/winverbs/core/winverbs/user/wv_srq.cpp +++ b/branches/winverbs/core/winverbs/user/wv_srq.cpp @@ -73,7 +73,8 @@ Create(SIZE_T MaxWr, SIZE_T MaxSge, SIZE_T SrqLimit) pattr->MaxSge = attr.max_sge; pattr->MaxWr = attr.max_wr; pattr->SrqLimit = attr.srq_limit; - RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_CREATE, pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size, @@ -86,7 +87,8 @@ Create(SIZE_T MaxWr, SIZE_T MaxSge, SIZE_T SrqLimit) } verbsData.status = pattr->Id.VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1, + verbsData.output_size); buf.Put(); post: @@ -178,7 +180,8 @@ Query(SIZE_T* pMaxWr, SIZE_T* pMaxSge, SIZE_T* pSrqLimit) pattr->Id.Id = m_Id; pattr->Id.VerbInfo = verbsData.command; - RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_QUERY, pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size, @@ -193,7 +196,8 @@ Query(SIZE_T* pMaxWr, SIZE_T* pMaxSge, SIZE_T* pSrqLimit) } verbsData.status = pattr->Id.VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1, + verbsData.output_size); buf.Put(); post: @@ -237,7 +241,8 @@ Modify(SIZE_T MaxWr, SIZE_T SrqLimit) pattr->Id.VerbInfo = verbsData.command; pattr->MaxWr = attr.max_wr; pattr->SrqLimit = attr.srq_limit; - RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size); + RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf, + verbsData.input_size); if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_MODIFY, pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size, @@ -249,7 +254,8 @@ Modify(SIZE_T MaxWr, SIZE_T SrqLimit) } verbsData.status = pattr->Id.VerbInfo; - RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size); + RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1, + verbsData.output_size); buf.Put(); post: -- 2.46.0