Version: 1
-Previous: 6f966fe51a702d5cab705ed1fa095a3c56fed4fd
-Head: 3b424fc3af13833bc4e5ba559793974e6527845c
+Previous: aeb630c936469fc74b45f12b7e330e0a956fb5f1
+Head: c221b6562caccbb23e593e88c480bb3534dd150d
Applied:
rm-build: 6ece22f911fcfc6fceeb779a3cb16702ab4ba386
dapl-cleanup: ad55d4913247fe33cfe9752a538c62bb760413de
libibverbs-release: f31dfae054abd22d7afd822f68c0f57ee2d344c5
- debug-wv: be4f00208dd5b903791286dd69d9f3ff7b6b6573
- refresh-temp: 3b424fc3af13833bc4e5ba559793974e6527845c
+ debug-wv: c221b6562caccbb23e593e88c480bb3534dd150d
Unapplied:
dapl-debug: e13c7a46d1fab529c3008c37bac955a1d7738195
dapl-close: 81beb1f83c87c85a473f9cc153ec564e6d832f57
Bottom: b57f60cfc3fc1ea3881329f1abced3d99528a53b
-Top: b57f60cfc3fc1ea3881329f1abced3d99528a53b
+Top: c911bc754b21d6caabc33ee7ad126ee0e3056952
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2010-02-03 16:57:05 -0800
---
-
+diff --git a/trunk/core/winverbs/user/SOURCES b/trunk/core/winverbs/user/SOURCES
+index 6939d1e..61e30e7 100644
+--- a/trunk/core/winverbs/user/SOURCES
++++ b/trunk/core/winverbs/user/SOURCES
+@@ -1,39 +1,39 @@
+-!if $(FREEBUILD)\r
+-TARGETNAME = winverbs\r
+-!else\r
+-TARGETNAME = winverbsd\r
+-!endif\r
+-\r
+-TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
+-TARGETTYPE = DYNLINK\r
+-\r
+-!if $(_NT_TOOLS_VERSION) == 0x700\r
+-DLLDEF = $O\wv_exports.def\r
+-!else\r
+-DLLDEF = $(OBJ_PATH)\$O\wv_exports.def\r
+-!endif\r
+-\r
+-DLLENTRY = DllMain\r
+-USE_NTDLL = 1\r
+-\r
+-SOURCES = \\r
+- winverbs.rc \\r
+- wv_main.cpp \\r
+- wv_base.cpp \\r
+- wv_cq.cpp \\r
+- wv_device.cpp \\r
+- wv_ep.cpp \\r
+- wv_pd.cpp \\r
+- wv_provider.cpp \\r
+- wv_qp.cpp \\r
+- wv_srq.cpp \\r
+- wv_uverbs.cpp\r
+-\r
+-INCLUDES = ..;..\..\..\inc;..\..\..\inc\user;\r
+-\r
+-USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_WV_SYMBOLS\r
+-\r
+-TARGETLIBS = \\r
+- $(SDK_LIB_PATH)\kernel32.lib \\r
+- $(SDK_LIB_PATH)\uuid.lib \\r
+- $(SDK_LIB_PATH)\ws2_32.lib\r
++!if $(FREEBUILD)
++TARGETNAME = winverbs
++!else
++TARGETNAME = winverbsd
++!endif
++
++TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR)
++TARGETTYPE = DYNLINK
++
++!if $(_NT_TOOLS_VERSION) == 0x700
++DLLDEF = $O\wv_exports.def
++!else
++DLLDEF = $(OBJ_PATH)\$O\wv_exports.def
++!endif
++
++DLLENTRY = DllMain
++USE_MSVCRT = 1
++
++SOURCES = \
++ winverbs.rc \
++ wv_main.cpp \
++ wv_base.cpp \
++ wv_cq.cpp \
++ wv_device.cpp \
++ wv_ep.cpp \
++ wv_pd.cpp \
++ wv_provider.cpp \
++ wv_qp.cpp \
++ wv_srq.cpp \
++ wv_uverbs.cpp
++
++INCLUDES = ..;..\..\..\inc;..\..\..\inc\user;
++
++USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_WV_SYMBOLS
++
++TARGETLIBS = \
++ $(SDK_LIB_PATH)\kernel32.lib \
++ $(SDK_LIB_PATH)\uuid.lib \
++ $(SDK_LIB_PATH)\ws2_32.lib
+diff --git a/trunk/core/winverbs/user/wv_base.h b/trunk/core/winverbs/user/wv_base.h
+index f37cf96..c789371 100644
+--- a/trunk/core/winverbs/user/wv_base.h
++++ b/trunk/core/winverbs/user/wv_base.h
+@@ -1,86 +1,87 @@
+-/*\r
+- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
+- *\r
+- * This software is available to you under the OpenIB.org BSD license\r
+- * below:\r
+- *\r
+- * Redistribution and use in source and binary forms, with or\r
+- * without modification, are permitted provided that the following\r
+- * conditions are met:\r
+- *\r
+- * - Redistributions of source code must retain the above\r
+- * copyright notice, this list of conditions and the following\r
+- * disclaimer.\r
+- *\r
+- * - Redistributions in binary form must reproduce the above\r
+- * copyright notice, this list of conditions and the following\r
+- * disclaimer in the documentation and/or other materials\r
+- * provided with the distribution.\r
+- *\r
+- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
+- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
+- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV\r
+- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
+- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
+- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
+- * SOFTWARE.\r
+- */\r
+-\r
+-#pragma once\r
+-\r
+-#ifndef _WV_BASE_H_\r
+-#define _WV_BASE_H_\r
+-\r
+-#include <windows.h>\r
+-#include <rdma\winverbs.h>\r
+-#include <winioctl.h>\r
+-\r
+-#include <iba\ib_types.h>\r
+-#include <iba\ib_uvp.h>\r
+-\r
+-HRESULT WvConvertIbStatus(ib_api_status_t status);\r
+-HRESULT WvConvertWSAStatus(int status);\r
+-HRESULT WvGetUserVerbs(HMODULE hLib, uvp_interface_t *pVerbs);\r
+-\r
+-\r
+-class CWVBase\r
+-{\r
+-public:\r
+- CWVBase();\r
+- ~CWVBase();\r
+- STDMETHODIMP_(ULONG) AddRef();\r
+- STDMETHODIMP_(ULONG) Release();\r
+-\r
+- STDMETHODIMP Init();\r
+- virtual void Delete() {};\r
+- BOOL WvDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,\r
+- LPVOID lpInBuffer, DWORD nInBufferSize,\r
+- LPVOID lpOutBuffer, DWORD nOutBufferSize,\r
+- LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);\r
+-\r
+- HANDLE m_hFile;\r
+- volatile LONG m_nRef;\r
+- UINT64 m_Id;\r
+-\r
+-protected:\r
+- OVERLAPPED m_Overlap;\r
+- CRITICAL_SECTION m_CritSec;\r
+-};\r
+-\r
+-\r
+-#if defined(_WIN64)\r
+- #define WvConvertSgl(pSgl, nSge) ((ib_local_ds_t *) pSgl)\r
+-#else\r
+- static inline ib_local_ds_t *WvConvertSgl(WV_SGE* pSgl, SIZE_T nSge)\r
+- {\r
+- SIZE_T n;\r
+-\r
+- for (n = 0; n < nSge; n++) {\r
+- pSgl[n].Reserved = 0;\r
+- }\r
+- return (ib_local_ds_t *) pSgl;\r
+- }\r
+-#endif (_WIN64)\r
+-\r
+-#endif // _WV_BASE_H_\r
++/*
++ * Copyright (c) 2008 Intel Corporation. All rights reserved.
++ *
++ * This software is available to you under the OpenIB.org BSD license
++ * below:
++ *
++ * Redistribution and use in source and binary forms, with or
++ * without modification, are permitted provided that the following
++ * conditions are met:
++ *
++ * - Redistributions of source code must retain the above
++ * copyright notice, this list of conditions and the following
++ * disclaimer.
++ *
++ * - Redistributions in binary form must reproduce the above
++ * copyright notice, this list of conditions and the following
++ * disclaimer in the documentation and/or other materials
++ * provided with the distribution.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
++ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV
++ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
++ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
++ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
++ * SOFTWARE.
++ */
++
++#pragma once
++
++#ifndef _WV_BASE_H_
++#define _WV_BASE_H_
++
++#include <windows.h>
++#include <rdma\winverbs.h>
++#include <winioctl.h>
++#include <stdio.h>
++
++#include <iba\ib_types.h>
++#include <iba\ib_uvp.h>
++
++HRESULT WvConvertIbStatus(ib_api_status_t status);
++HRESULT WvConvertWSAStatus(int status);
++HRESULT WvGetUserVerbs(HMODULE hLib, uvp_interface_t *pVerbs);
++
++
++class CWVBase
++{
++public:
++ CWVBase();
++ ~CWVBase();
++ STDMETHODIMP_(ULONG) AddRef();
++ STDMETHODIMP_(ULONG) Release();
++
++ STDMETHODIMP Init();
++ virtual void Delete() {};
++ BOOL WvDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
++ LPVOID lpInBuffer, DWORD nInBufferSize,
++ LPVOID lpOutBuffer, DWORD nOutBufferSize,
++ LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
++
++ HANDLE m_hFile;
++ volatile LONG m_nRef;
++ UINT64 m_Id;
++
++protected:
++ OVERLAPPED m_Overlap;
++ CRITICAL_SECTION m_CritSec;
++};
++
++
++#if defined(_WIN64)
++ #define WvConvertSgl(pSgl, nSge) ((ib_local_ds_t *) pSgl)
++#else
++ static inline ib_local_ds_t *WvConvertSgl(WV_SGE* pSgl, SIZE_T nSge)
++ {
++ SIZE_T n;
++
++ for (n = 0; n < nSge; n++) {
++ pSgl[n].Reserved = 0;
++ }
++ return (ib_local_ds_t *) pSgl;
++ }
++#endif (_WIN64)
++
++#endif // _WV_BASE_H_
+++ /dev/null
-Bottom: b57f60cfc3fc1ea3881329f1abced3d99528a53b
-Top: c911bc754b21d6caabc33ee7ad126ee0e3056952
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2010-02-03 16:58:14 -0800
-
-Refresh of debug-wv
-
----
-
-diff --git a/trunk/core/winverbs/user/SOURCES b/trunk/core/winverbs/user/SOURCES
-index 6939d1e..61e30e7 100644
---- a/trunk/core/winverbs/user/SOURCES
-+++ b/trunk/core/winverbs/user/SOURCES
-@@ -1,39 +1,39 @@
--!if $(FREEBUILD)\r
--TARGETNAME = winverbs\r
--!else\r
--TARGETNAME = winverbsd\r
--!endif\r
--\r
--TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR)\r
--TARGETTYPE = DYNLINK\r
--\r
--!if $(_NT_TOOLS_VERSION) == 0x700\r
--DLLDEF = $O\wv_exports.def\r
--!else\r
--DLLDEF = $(OBJ_PATH)\$O\wv_exports.def\r
--!endif\r
--\r
--DLLENTRY = DllMain\r
--USE_NTDLL = 1\r
--\r
--SOURCES = \\r
-- winverbs.rc \\r
-- wv_main.cpp \\r
-- wv_base.cpp \\r
-- wv_cq.cpp \\r
-- wv_device.cpp \\r
-- wv_ep.cpp \\r
-- wv_pd.cpp \\r
-- wv_provider.cpp \\r
-- wv_qp.cpp \\r
-- wv_srq.cpp \\r
-- wv_uverbs.cpp\r
--\r
--INCLUDES = ..;..\..\..\inc;..\..\..\inc\user;\r
--\r
--USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_WV_SYMBOLS\r
--\r
--TARGETLIBS = \\r
-- $(SDK_LIB_PATH)\kernel32.lib \\r
-- $(SDK_LIB_PATH)\uuid.lib \\r
-- $(SDK_LIB_PATH)\ws2_32.lib\r
-+!if $(FREEBUILD)
-+TARGETNAME = winverbs
-+!else
-+TARGETNAME = winverbsd
-+!endif
-+
-+TARGETPATH = ..\..\..\bin\user\obj$(BUILD_ALT_DIR)
-+TARGETTYPE = DYNLINK
-+
-+!if $(_NT_TOOLS_VERSION) == 0x700
-+DLLDEF = $O\wv_exports.def
-+!else
-+DLLDEF = $(OBJ_PATH)\$O\wv_exports.def
-+!endif
-+
-+DLLENTRY = DllMain
-+USE_MSVCRT = 1
-+
-+SOURCES = \
-+ winverbs.rc \
-+ wv_main.cpp \
-+ wv_base.cpp \
-+ wv_cq.cpp \
-+ wv_device.cpp \
-+ wv_ep.cpp \
-+ wv_pd.cpp \
-+ wv_provider.cpp \
-+ wv_qp.cpp \
-+ wv_srq.cpp \
-+ wv_uverbs.cpp
-+
-+INCLUDES = ..;..\..\..\inc;..\..\..\inc\user;
-+
-+USER_C_FLAGS = $(USER_C_FLAGS) -DEXPORT_WV_SYMBOLS
-+
-+TARGETLIBS = \
-+ $(SDK_LIB_PATH)\kernel32.lib \
-+ $(SDK_LIB_PATH)\uuid.lib \
-+ $(SDK_LIB_PATH)\ws2_32.lib
-diff --git a/trunk/core/winverbs/user/wv_base.h b/trunk/core/winverbs/user/wv_base.h
-index f37cf96..c789371 100644
---- a/trunk/core/winverbs/user/wv_base.h
-+++ b/trunk/core/winverbs/user/wv_base.h
-@@ -1,86 +1,87 @@
--/*\r
-- * Copyright (c) 2008 Intel Corporation. All rights reserved.\r
-- *\r
-- * This software is available to you under the OpenIB.org BSD license\r
-- * below:\r
-- *\r
-- * Redistribution and use in source and binary forms, with or\r
-- * without modification, are permitted provided that the following\r
-- * conditions are met:\r
-- *\r
-- * - Redistributions of source code must retain the above\r
-- * copyright notice, this list of conditions and the following\r
-- * disclaimer.\r
-- *\r
-- * - Redistributions in binary form must reproduce the above\r
-- * copyright notice, this list of conditions and the following\r
-- * disclaimer in the documentation and/or other materials\r
-- * provided with the distribution.\r
-- *\r
-- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV\r
-- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
-- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
-- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
-- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
-- * SOFTWARE.\r
-- */\r
--\r
--#pragma once\r
--\r
--#ifndef _WV_BASE_H_\r
--#define _WV_BASE_H_\r
--\r
--#include <windows.h>\r
--#include <rdma\winverbs.h>\r
--#include <winioctl.h>\r
--\r
--#include <iba\ib_types.h>\r
--#include <iba\ib_uvp.h>\r
--\r
--HRESULT WvConvertIbStatus(ib_api_status_t status);\r
--HRESULT WvConvertWSAStatus(int status);\r
--HRESULT WvGetUserVerbs(HMODULE hLib, uvp_interface_t *pVerbs);\r
--\r
--\r
--class CWVBase\r
--{\r
--public:\r
-- CWVBase();\r
-- ~CWVBase();\r
-- STDMETHODIMP_(ULONG) AddRef();\r
-- STDMETHODIMP_(ULONG) Release();\r
--\r
-- STDMETHODIMP Init();\r
-- virtual void Delete() {};\r
-- BOOL WvDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,\r
-- LPVOID lpInBuffer, DWORD nInBufferSize,\r
-- LPVOID lpOutBuffer, DWORD nOutBufferSize,\r
-- LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);\r
--\r
-- HANDLE m_hFile;\r
-- volatile LONG m_nRef;\r
-- UINT64 m_Id;\r
--\r
--protected:\r
-- OVERLAPPED m_Overlap;\r
-- CRITICAL_SECTION m_CritSec;\r
--};\r
--\r
--\r
--#if defined(_WIN64)\r
-- #define WvConvertSgl(pSgl, nSge) ((ib_local_ds_t *) pSgl)\r
--#else\r
-- static inline ib_local_ds_t *WvConvertSgl(WV_SGE* pSgl, SIZE_T nSge)\r
-- {\r
-- SIZE_T n;\r
--\r
-- for (n = 0; n < nSge; n++) {\r
-- pSgl[n].Reserved = 0;\r
-- }\r
-- return (ib_local_ds_t *) pSgl;\r
-- }\r
--#endif (_WIN64)\r
--\r
--#endif // _WV_BASE_H_\r
-+/*
-+ * Copyright (c) 2008 Intel Corporation. All rights reserved.
-+ *
-+ * This software is available to you under the OpenIB.org BSD license
-+ * below:
-+ *
-+ * Redistribution and use in source and binary forms, with or
-+ * without modification, are permitted provided that the following
-+ * conditions are met:
-+ *
-+ * - Redistributions of source code must retain the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer.
-+ *
-+ * - Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following
-+ * disclaimer in the documentation and/or other materials
-+ * provided with the distribution.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AWV
-+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-+ * SOFTWARE.
-+ */
-+
-+#pragma once
-+
-+#ifndef _WV_BASE_H_
-+#define _WV_BASE_H_
-+
-+#include <windows.h>
-+#include <rdma\winverbs.h>
-+#include <winioctl.h>
-+#include <stdio.h>
-+
-+#include <iba\ib_types.h>
-+#include <iba\ib_uvp.h>
-+
-+HRESULT WvConvertIbStatus(ib_api_status_t status);
-+HRESULT WvConvertWSAStatus(int status);
-+HRESULT WvGetUserVerbs(HMODULE hLib, uvp_interface_t *pVerbs);
-+
-+
-+class CWVBase
-+{
-+public:
-+ CWVBase();
-+ ~CWVBase();
-+ STDMETHODIMP_(ULONG) AddRef();
-+ STDMETHODIMP_(ULONG) Release();
-+
-+ STDMETHODIMP Init();
-+ virtual void Delete() {};
-+ BOOL WvDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
-+ LPVOID lpInBuffer, DWORD nInBufferSize,
-+ LPVOID lpOutBuffer, DWORD nOutBufferSize,
-+ LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
-+
-+ HANDLE m_hFile;
-+ volatile LONG m_nRef;
-+ UINT64 m_Id;
-+
-+protected:
-+ OVERLAPPED m_Overlap;
-+ CRITICAL_SECTION m_CritSec;
-+};
-+
-+
-+#if defined(_WIN64)
-+ #define WvConvertSgl(pSgl, nSge) ((ib_local_ds_t *) pSgl)
-+#else
-+ static inline ib_local_ds_t *WvConvertSgl(WV_SGE* pSgl, SIZE_T nSge)
-+ {
-+ SIZE_T n;
-+
-+ for (n = 0; n < nSge; n++) {
-+ pSgl[n].Reserved = 0;
-+ }
-+ return (ib_local_ds_t *) pSgl;
-+ }
-+#endif (_WIN64)
-+
-+#endif // _WV_BASE_H_
projects / ~shefty / rdma-win.git / commitdiff