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 <sean.hefty@intel.com>
git-svn-id: svn://openib.tc.cornell.edu/gen1@1407 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/branches/winverbs/core/winverbs/kernel/wv_driver.h b/branches/winverbs/core/winverbs/kernel/wv_driver.h
index 2a590f3088dda77c7f4fd9835dc04cbccc3eb8be..ea209c0ea30fbbbb243853877476ac89b2fd95da 100644 (file)
--- 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;\r
        pVerbsData->input_size = (UINT32) InputLength;\r
        pVerbsData->output_size = (UINT32) OutputLength;\r
-       pVerbsData->p_inout_buf = pBuffer;\r
+       pVerbsData->p_inout_buf = (ULONG_PTR) pBuffer;\r
        pVerbsData->status = 0;\r
 }\r
 \r

diff --git a/branches/winverbs/core/winverbs/user/wv_cq.cpp b/branches/winverbs/core/winverbs/user/wv_cq.cpp
index 7ad9f01c509c0801bbdbf0352f022ffce55d4571..fafce977886620ec3e3273f751579967c086a08b 100644 (file)
--- 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;\r
        pId->VerbInfo = verbsData.command;\r
        pId->Data = (UINT32) *pEntries;\r
-       RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_CQ_CREATE,\r
                                                  pId, sizeof WV_IO_ID + verbsData.input_size,\r
@@ -83,7 +84,8 @@ Create(SIZE_T *pEntries)
        }\r
 \r
        verbsData.status = pId->VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r
@@ -175,7 +177,8 @@ Resize(SIZE_T* pEntries)
        pId->Id = m_Id;\r
        pId->VerbInfo = verbsData.command;\r
        pId->Data = (UINT32) *pEntries;\r
-       RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_CQ_RESIZE,\r
                                                  pId, sizeof WV_IO_ID + verbsData.input_size,\r
@@ -188,7 +191,8 @@ Resize(SIZE_T* pEntries)
        }\r
 \r
        verbsData.status = pId->VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r

diff --git a/branches/winverbs/core/winverbs/user/wv_device.cpp b/branches/winverbs/core/winverbs/user/wv_device.cpp
index d52d56f3cea7b70cb83c070df2394f5db04446b7..70f63ea7cf837e40cf2e0da8b5ee1e3d7a9402c3 100644 (file)
--- 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)
 \r
        pId->Id = m_Guid;\r
        pId->VerbInfo = verbsData.command;\r
-       RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_DEVICE_OPEN,\r
                                                  pId, sizeof WV_IO_ID + verbsData.input_size,\r
@@ -108,7 +109,8 @@ Open(UINT64 Guid)
        }\r
 \r
        verbsData.status = pId->VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r

diff --git a/branches/winverbs/core/winverbs/user/wv_pd.cpp b/branches/winverbs/core/winverbs/user/wv_pd.cpp
index 93238fd5c90bfcabd64da61988730850fada7cad..5063e54e809b5005be2008fcff8eb40c7e35e1b2 100644 (file)
--- a/branches/winverbs/core/winverbs/user/wv_pd.cpp
+++ b/branches/winverbs/core/winverbs/user/wv_pd.cpp
@@ -68,7 +68,8 @@ Allocate(void)
 \r
        pId->Id = m_pDevice->m_Id;\r
        pId->VerbInfo = verbsData.command;\r
-       RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_PD_ALLOCATE,\r
                                                  pId, sizeof WV_IO_ID + verbsData.input_size,\r
@@ -81,7 +82,8 @@ Allocate(void)
        }\r
 \r
        verbsData.status = pId->VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r
@@ -239,7 +241,8 @@ Allocate(void)
 \r
        pId->Id = m_pPd->m_Id;\r
        pId->VerbInfo = verbsData.command;\r
-       RtlCopyMemory(pId + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pId + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_MW_ALLOCATE,\r
                                                  pId, sizeof WV_IO_ID + verbsData.input_size,\r
@@ -253,7 +256,8 @@ Allocate(void)
        }\r
 \r
        verbsData.status = pId->VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pId + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pId + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r
@@ -394,7 +398,8 @@ Create(WV_ADDRESS_VECTOR* pAddress)
        pav->Id.Id = m_pPd->m_Id;\r
        pav->Id.VerbInfo = verbsData.command;\r
        WvIoConvertAv(&pav->AddressVector, pAddress);\r
-       RtlCopyMemory(pav + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pav + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_AH_CREATE,\r
                                                  pav, sizeof WV_IO_AH_CREATE + verbsData.input_size,\r
@@ -407,7 +412,8 @@ Create(WV_ADDRESS_VECTOR* pAddress)
        }\r
 \r
        verbsData.status = pav->Id.VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pav + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pav + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r

diff --git a/branches/winverbs/core/winverbs/user/wv_qp.cpp b/branches/winverbs/core/winverbs/user/wv_qp.cpp
index 3d7af3dc1d30e7d66ec90cafdf77dda9f9d9522d..3f9a9eb44232fa7d31c8abd34c0696f1b0baf313 100644 (file)
--- 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;\r
        pattr->Id.VerbInfo = verbsData.command;\r
        WvIoConvertQpCreate(pattr, pAttributes);\r
-       RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_QP_CREATE,\r
                                                  pattr, sizeof WV_IO_QP_CREATE + verbsData.input_size,\r
@@ -278,7 +279,8 @@ Create(WV_QP_CREATE* pAttributes)
        }\r
 \r
        verbsData.status = pattr->Id.VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r

diff --git a/branches/winverbs/core/winverbs/user/wv_srq.cpp b/branches/winverbs/core/winverbs/user/wv_srq.cpp
index 3796b967c342733f6f3b69d245c95ba35641e8a5..0c9650f3d96a49be9f19995fa66754a0538b67f8 100644 (file)
--- 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;\r
        pattr->MaxWr = attr.max_wr;\r
        pattr->SrqLimit = attr.srq_limit;\r
-       RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_CREATE,\r
                                                  pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size,\r
@@ -86,7 +87,8 @@ Create(SIZE_T MaxWr, SIZE_T MaxSge, SIZE_T SrqLimit)
        }\r
 \r
        verbsData.status = pattr->Id.VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r
@@ -178,7 +180,8 @@ Query(SIZE_T* pMaxWr, SIZE_T* pMaxSge, SIZE_T* pSrqLimit)
 \r
        pattr->Id.Id = m_Id;\r
        pattr->Id.VerbInfo = verbsData.command;\r
-       RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_QUERY,\r
                                                  pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size,\r
@@ -193,7 +196,8 @@ Query(SIZE_T* pMaxWr, SIZE_T* pMaxSge, SIZE_T* pSrqLimit)
        }\r
 \r
        verbsData.status = pattr->Id.VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r
@@ -237,7 +241,8 @@ Modify(SIZE_T MaxWr, SIZE_T SrqLimit)
        pattr->Id.VerbInfo = verbsData.command;\r
        pattr->MaxWr = attr.max_wr;\r
        pattr->SrqLimit = attr.srq_limit;\r
-       RtlCopyMemory(pattr + 1, verbsData.p_inout_buf, verbsData.input_size);\r
+       RtlCopyMemory(pattr + 1, (void *) (ULONG_PTR) verbsData.p_inout_buf,\r
+                                 verbsData.input_size);\r
 \r
        if (WvDeviceIoControl(m_hFile, WV_IOCTL_SRQ_MODIFY,\r
                                                  pattr, sizeof WV_IO_SRQ_ATTRIBUTES + verbsData.input_size,\r
@@ -249,7 +254,8 @@ Modify(SIZE_T MaxWr, SIZE_T SrqLimit)
        }\r
 \r
        verbsData.status = pattr->Id.VerbInfo;\r
-       RtlCopyMemory(verbsData.p_inout_buf, pattr + 1, verbsData.output_size);\r
+       RtlCopyMemory((void *) (ULONG_PTR) verbsData.p_inout_buf, pattr + 1,\r
+                                 verbsData.output_size);\r
        buf.Put();\r
 \r
 post:\r