From 79eb62b0f8f14dfdf7b792e5b8ef42e9be3b32a3 Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Sun, 16 Sep 2007 15:02:30 +0000
Subject: [PATCH] [COMPLIB] improvements to 779 (mapping of cl_status_t type to
 NTSTATUS type)

git-svn-id: svn://openib.tc.cornell.edu/gen1@799 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 branches/Ndi/core/complib/kernel/cl_driver.c  | 106 +++---------------
 branches/Ndi/inc/complib/cl_types.h           |   2 +
 .../Ndi/inc/kernel/complib/cl_types_osd.h     |   2 +-
 3 files changed, 16 insertions(+), 94 deletions(-)

diff --git a/branches/Ndi/core/complib/kernel/cl_driver.c b/branches/Ndi/core/complib/kernel/cl_driver.c
index d587cdee..61359a77 100644
--- a/branches/Ndi/core/complib/kernel/cl_driver.c
+++ b/branches/Ndi/core/complib/kernel/cl_driver.c
@@ -37,55 +37,7 @@ CL_EXPORT NTSTATUS
 cl_to_ntstatus(
 	IN	cl_status_t	status )
 {
-	switch( status )
-	{
-	case CL_SUCCESS:
-		return STATUS_SUCCESS;
-	case CL_ERROR:
-		return STATUS_DRIVER_INTERNAL_ERROR;
-	case CL_INVALID_STATE:
-		return STATUS_INVALID_DEVICE_STATE;
-	case CL_INVALID_OPERATION:
-		return STATUS_NOT_SUPPORTED;
-	case CL_INVALID_SETTING:
-		return STATUS_INVALID_PARAMETER_MIX;
-	case CL_INVALID_PARAMETER:
-		return STATUS_INVALID_PARAMETER;
-	case CL_INSUFFICIENT_RESOURCES:
-		return STATUS_INSUFFICIENT_RESOURCES;
-	case CL_INSUFFICIENT_MEMORY:
-		return STATUS_NO_MEMORY;
-	case CL_INVALID_PERMISSION:
-		return STATUS_ACCESS_DENIED;
-	case CL_COMPLETED:
-		return STATUS_EVENT_DONE;
-	case CL_NOT_DONE:
-		return STATUS_ABANDONED;
-	case CL_PENDING:
-		return STATUS_PENDING;
-	case CL_TIMEOUT:
-		return STATUS_TIMEOUT;
-	case CL_CANCELED:
-		return STATUS_CANCELLED;
-	case CL_REJECT:
-		return STATUS_REQUEST_NOT_ACCEPTED;
-	case CL_OVERRUN:
-		return STATUS_DATA_OVERRUN;
-	case CL_NOT_FOUND:
-		return STATUS_NOT_FOUND;
-	case CL_UNAVAILABLE:
-		return STATUS_DEVICE_NOT_READY;
-	case CL_BUSY:
-		return STATUS_DEVICE_BUSY;
-	case CL_DISCONNECT:
-		return STATUS_LOCAL_DISCONNECT;
-	case CL_DUPLICATE:
-		return STATUS_DUPLICATE_NAME;
-	case CL_INVALID_REQUEST:
-		return STATUS_INVALID_DEVICE_REQUEST;
-	default:
-		return STATUS_UNSUCCESSFUL;
-	}
+	return (NTSTATUS)status;
 }
 
 
@@ -95,50 +47,18 @@ cl_from_ntstatus(
 {
 	switch( status )
 	{
-	case STATUS_SUCCESS:
-		return CL_SUCCESS;
-	case STATUS_DRIVER_INTERNAL_ERROR:
-		return CL_ERROR;
-	case STATUS_INVALID_DEVICE_STATE:
-		return CL_INVALID_STATE;
-	case STATUS_NOT_SUPPORTED:
-		return CL_INVALID_OPERATION;
-	case STATUS_INVALID_PARAMETER_1:
-		return CL_INVALID_SETTING;
-	case STATUS_INVALID_PARAMETER:
-		return CL_INVALID_PARAMETER;
-	case STATUS_INSUFFICIENT_RESOURCES:
-		return CL_INSUFFICIENT_RESOURCES;
-	case STATUS_NO_MEMORY:
-		return CL_INSUFFICIENT_MEMORY;
-	case STATUS_ACCESS_DENIED:
-		return CL_INVALID_PERMISSION;
-	case STATUS_EVENT_DONE:
-		return CL_COMPLETED;
-	case STATUS_ABANDONED:
-		return CL_NOT_DONE;
-	case STATUS_PENDING:
-		return CL_PENDING;
-	case STATUS_TIMEOUT:
-		return CL_TIMEOUT;
-	case STATUS_CANCELLED:
-		return CL_CANCELED;
-	case STATUS_REQUEST_NOT_ACCEPTED:
-		return CL_REJECT;
-	case STATUS_DATA_OVERRUN:
-		return CL_OVERRUN;
-	case STATUS_NOT_FOUND:
-		return CL_NOT_FOUND;
-	case STATUS_DEVICE_NOT_READY:
-		return CL_UNAVAILABLE;
-	case STATUS_DEVICE_BUSY:
-		return CL_BUSY;
-	case STATUS_LOCAL_DISCONNECT:
-		return CL_DISCONNECT;
-	case STATUS_DUPLICATE_NAME:
-		return CL_DUPLICATE;
-	case STATUS_INVALID_DEVICE_REQUEST:
-		return CL_INVALID_REQUEST;
+	case STATUS_SUCCESS:				case STATUS_DRIVER_INTERNAL_ERROR:
+	case STATUS_INVALID_DEVICE_STATE:	case STATUS_NOT_SUPPORTED:
+	case STATUS_INVALID_PARAMETER_1:	case STATUS_INVALID_PARAMETER:
+	case STATUS_INSUFFICIENT_RESOURCES:	case STATUS_NO_MEMORY:
+	case STATUS_ACCESS_DENIED:			case STATUS_EVENT_DONE:
+	case STATUS_ABANDONED:				case STATUS_PENDING:
+	case STATUS_TIMEOUT:				case STATUS_CANCELLED:
+	case STATUS_REQUEST_NOT_ACCEPTED:	case STATUS_DATA_OVERRUN:
+	case STATUS_NOT_FOUND:				case STATUS_DEVICE_NOT_READY:
+	case STATUS_DEVICE_BUSY:			case STATUS_LOCAL_DISCONNECT:
+	case STATUS_DUPLICATE_NAME:			case STATUS_INVALID_DEVICE_REQUEST:
+		return (cl_status_t)status;
 	default:
 		return CL_ERROR;
 	}
diff --git a/branches/Ndi/inc/complib/cl_types.h b/branches/Ndi/inc/complib/cl_types.h
index fa4e4df1..74d746c3 100644
--- a/branches/Ndi/inc/complib/cl_types.h
+++ b/branches/Ndi/inc/complib/cl_types.h
@@ -393,8 +393,10 @@ cl_panic(
 * SEE ALSO
 *	cl_status_t
 *********/
+#ifndef CL_KERNEL
 #define CL_STATUS_MSG( errcode ) \
 	((errcode < CL_STATUS_COUNT)?cl_status_text[errcode]:"invalid status code")
+#endif	
 
 
 #if !defined( FALSE )
diff --git a/branches/Ndi/inc/kernel/complib/cl_types_osd.h b/branches/Ndi/inc/kernel/complib/cl_types_osd.h
index 7a6dd643..608a8668 100644
--- a/branches/Ndi/inc/kernel/complib/cl_types_osd.h
+++ b/branches/Ndi/inc/kernel/complib/cl_types_osd.h
@@ -127,7 +127,7 @@ NTSTATUS
 cl_to_ntstatus(
 	IN	enum _cl_status	status );
 
-enum _cl_status
+DECLSPEC_DEPRECATED enum _cl_status
 cl_from_ntstatus(
 	IN	NTSTATUS status );
 
-- 
2.41.0