From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 27 Jul 2010 06:48:47 +0000 (-0700)
Subject: Refresh of sge
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=793edb3f73552f6330d3537c7b7e2d8b7968b20e;p=~shefty%2Frdma-win.git

Refresh of sge
---

diff --git a/trunk/ulp/netdirect2/user/nd_adapter.cpp b/trunk/ulp/netdirect2/user/nd_adapter.cpp
index 891741eb..736c649c 100644
--- a/trunk/ulp/netdirect2/user/nd_adapter.cpp
+++ b/trunk/ulp/netdirect2/user/nd_adapter.cpp
@@ -136,9 +136,9 @@ Query(ND_ADAPTER_INFO* pInfo, SIZE_T* pcbInfo)
 	pInfo->AdapterId				= m_DeviceGuid;
 	pInfo->MaxRegistrationSize		= attr.MaxMrSize;
 	pInfo->MaxWindowSize			= attr.MaxMrSize;
-    pInfo->MaxReceiveSGE			= (DWORD) attr.MaxSge;
-    pInfo->MaxInitiatorSGE			= (DWORD) attr.MaxSge;
-    pInfo->MaxReadSGE				= (DWORD) attr.MaxSge;
+    pInfo->MaxReceiveSge			= (DWORD) attr.MaxSge;
+    pInfo->MaxInitiatorSge			= (DWORD) attr.MaxSge;
+    pInfo->MaxReadSge				= (DWORD) attr.MaxSge;
     pInfo->MaxTransferLength		= 1 << 31;
 	pInfo->MaxInboundReadLimit		= (DWORD) attr.MaxQpResponderResources;
 	pInfo->MaxOutboundReadLimit		= (DWORD) attr.MaxQpInitiatorDepth;
diff --git a/trunk/ulp/netdirect2/user/nd_qp.cpp b/trunk/ulp/netdirect2/user/nd_qp.cpp
index 64735404..d045d120 100644
--- a/trunk/ulp/netdirect2/user/nd_qp.cpp
+++ b/trunk/ulp/netdirect2/user/nd_qp.cpp
@@ -173,21 +173,21 @@ ConvertSendFlags(DWORD Flags)
 }
 
 STDMETHODIMP CNDQueuePair::
-Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags)
+Send(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, DWORD flags)
 {
 	HRESULT hr;
 
-	hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,
+	hr = m_pWvQp->Send((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,
 					   ConvertSendFlags(flags), 0);
 	return NDConvertWVStatus(hr);
 }
 
 STDMETHODIMP CNDQueuePair::
-Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)
+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
 {
 	HRESULT hr;
 
-	hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE);
+	hr = m_pWvQp->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);
 	return NDConvertWVStatus(hr);
 }
 
@@ -224,25 +224,25 @@ Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags)
 }
 
 STDMETHODIMP CNDQueuePair::
-Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,
+Read(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,
 	 UINT64 remoteAddress, UINT32 remoteToken, DWORD flags)
 {
 	DWORD opts;
 	HRESULT hr;
 
-	hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,
+	hr = m_pWvQp->Read((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,
 					   ConvertSendFlags(flags), htonll(remoteAddress), remoteToken);
 	return NDConvertWVStatus(hr);
 }
 
 STDMETHODIMP CNDQueuePair::
-Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,
+Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,
 	  UINT64 remoteAddress, UINT32 remoteToken, DWORD flags)
 {
 	DWORD opts;
 	HRESULT hr;
 
-	hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE,
+	hr = m_pWvQp->Write((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge,
 					    ConvertSendFlags(flags), 0, htonll(remoteAddress), remoteToken);
 	return NDConvertWVStatus(hr);
 }
diff --git a/trunk/ulp/netdirect2/user/nd_qp.h b/trunk/ulp/netdirect2/user/nd_qp.h
index 3ce320ff..48adc805 100644
--- a/trunk/ulp/netdirect2/user/nd_qp.h
+++ b/trunk/ulp/netdirect2/user/nd_qp.h
@@ -50,15 +50,15 @@ public:
 
 	// INDQueuePair methods
 	STDMETHODIMP Flush();
-	STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE, DWORD flags);
-	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);
+	STDMETHODIMP Send(VOID* requestContext, const ND_SGE* pSge, DWORD nSge, DWORD flags);
+	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge);
 	STDMETHODIMP Bind(VOID* requestContext, INDMemoryRegion* pMemoryRegion,
 					  INDMemoryWindow* pMemoryWindow, const VOID* pBuffer, SIZE_T cbBuffer,
 					  DWORD flags);
 	STDMETHODIMP Invalidate(VOID* requestContext, INDMemoryWindow* pMemoryWindow, DWORD flags);
-	STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,
+	STDMETHODIMP Read(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,
 					  UINT64 remoteAddress, UINT32 remoteToken, DWORD flags);
-	STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE,
+	STDMETHODIMP Write(VOID* requestContext, const ND_SGE* pSge, DWORD nSge,
 					   UINT64 remoteAddress, UINT32 remoteToken, DWORD flags);
 	
 	CNDQueuePair(CNDAdapter *pAdapter);
@@ -70,7 +70,7 @@ public:
 				   CNDCompletionQueue* pInitiatorCompletionQueue,
 				   CNDSharedReceiveQueue *pSharedReceiveQueue,
 				   VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,
-				   DWORD maxReceiveRequestSGE, DWORD maxInitiatorRequestSGE,
+				   DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge,
 				   VOID** ppQueuePair)
 	{
 		HRESULT hr;
@@ -84,7 +84,7 @@ public:
 
 		hr = qp->Init(pReceiveCompletionQueue, pInitiatorCompletionQueue,
 					  pSharedReceiveQueue, context, receiveQueueDepth,
-					  initiatorQueueDepth, maxReceiveRequestSGE, maxInitiatorRequestSGE);
+					  initiatorQueueDepth, maxReceiveRequestSge, maxInitiatorRequestSge);
 		if (FAILED(hr)) {
 			goto err2;
 		}
@@ -111,7 +111,7 @@ protected:
 					  CNDCompletionQueue* pInitiatorCompletionQueue,
 					  CNDSharedReceiveQueue *pSharedReceiveQueue,
 					  VOID* context, DWORD receiveQueueDepth, DWORD initiatorQueueDepth,
-					  DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSGE);
+					  DWORD maxReceiveRequestSge, DWORD maxInitiatorRequestSge);
 	STDMETHODIMP_(DWORD) ConvertSendFlags(DWORD Flags);
 };
 
diff --git a/trunk/ulp/netdirect2/user/nd_srq.cpp b/trunk/ulp/netdirect2/user/nd_srq.cpp
index 28567637..c64b9af1 100644
--- a/trunk/ulp/netdirect2/user/nd_srq.cpp
+++ b/trunk/ulp/netdirect2/user/nd_srq.cpp
@@ -118,10 +118,10 @@ Notify(OVERLAPPED* pOverlapped)
 }
 
 STDMETHODIMP CNDSharedReceiveQueue::
-Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE)
+Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge)
 {
 	HRESULT hr;
 
-	hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSGE, nSGE);
+	hr = m_pWvSrq->PostReceive((UINT64) (ULONG_PTR) requestContext, (WV_SGE *) pSge, nSge);
 	return NDConvertWVStatus(hr);
 }
diff --git a/trunk/ulp/netdirect2/user/nd_srq.h b/trunk/ulp/netdirect2/user/nd_srq.h
index c35cc97e..b4f2058f 100644
--- a/trunk/ulp/netdirect2/user/nd_srq.h
+++ b/trunk/ulp/netdirect2/user/nd_srq.h
@@ -53,13 +53,13 @@ public:
 	// INDSharedReceiveQueue methods
 	STDMETHODIMP Modify(DWORD queueDepth, DWORD notifyThreshold);
 	STDMETHODIMP Notify(OVERLAPPED* pOverlapped);
-	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSGE, DWORD nSGE);
+	STDMETHODIMP Receive(VOID* requestContext, const ND_SGE* pSge, DWORD nSge);
 
 	CNDSharedReceiveQueue(CNDAdapter *pAdapter);
 	~CNDSharedReceiveQueue();
 	void Delete() {delete this;}
 	static STDMETHODIMP
-	CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSGE,
+	CreateInstance(CNDAdapter *pAdapter, DWORD queueDepth, DWORD maxSge,
 				   DWORD notifyThreshold, KAFFINITY affinity,
 				   VOID** ppSharedReceiveQueue)
 	{
@@ -72,7 +72,7 @@ public:
 			goto err1;
 		}
 
-		hr = srq->Init(queueDepth, maxSGE, notifyThreshold, affinity);
+		hr = srq->Init(queueDepth, maxSge, notifyThreshold, affinity);
 		if (FAILED(hr)) {
 			goto err2;
 		}
@@ -92,7 +92,7 @@ public:
 protected:
 	CNDAdapter				*m_pAdapter;
 
-	STDMETHODIMP Init(DWORD queueDepth, DWORD maxSGE, DWORD notifyThreshold,
+	STDMETHODIMP Init(DWORD queueDepth, DWORD maxSge, DWORD notifyThreshold,
 					  KAFFINITY affinity);
 };