[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

diff --git a/branches/Ndi/core/complib/kernel/cl_driver.c b/branches/Ndi/core/complib/kernel/cl_driver.c
index d587cdeef46b1d95d5cbd689e8ed1881517add92..61359a775e22c18a78a850b92b9d589f579d5dec 100644 (file)
--- 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(\r
        IN      cl_status_t     status )\r
 {\r
-       switch( status )\r
-       {\r
-       case CL_SUCCESS:\r
-               return STATUS_SUCCESS;\r
-       case CL_ERROR:\r
-               return STATUS_DRIVER_INTERNAL_ERROR;\r
-       case CL_INVALID_STATE:\r
-               return STATUS_INVALID_DEVICE_STATE;\r
-       case CL_INVALID_OPERATION:\r
-               return STATUS_NOT_SUPPORTED;\r
-       case CL_INVALID_SETTING:\r
-               return STATUS_INVALID_PARAMETER_MIX;\r
-       case CL_INVALID_PARAMETER:\r
-               return STATUS_INVALID_PARAMETER;\r
-       case CL_INSUFFICIENT_RESOURCES:\r
-               return STATUS_INSUFFICIENT_RESOURCES;\r
-       case CL_INSUFFICIENT_MEMORY:\r
-               return STATUS_NO_MEMORY;\r
-       case CL_INVALID_PERMISSION:\r
-               return STATUS_ACCESS_DENIED;\r
-       case CL_COMPLETED:\r
-               return STATUS_EVENT_DONE;\r
-       case CL_NOT_DONE:\r
-               return STATUS_ABANDONED;\r
-       case CL_PENDING:\r
-               return STATUS_PENDING;\r
-       case CL_TIMEOUT:\r
-               return STATUS_TIMEOUT;\r
-       case CL_CANCELED:\r
-               return STATUS_CANCELLED;\r
-       case CL_REJECT:\r
-               return STATUS_REQUEST_NOT_ACCEPTED;\r
-       case CL_OVERRUN:\r
-               return STATUS_DATA_OVERRUN;\r
-       case CL_NOT_FOUND:\r
-               return STATUS_NOT_FOUND;\r
-       case CL_UNAVAILABLE:\r
-               return STATUS_DEVICE_NOT_READY;\r
-       case CL_BUSY:\r
-               return STATUS_DEVICE_BUSY;\r
-       case CL_DISCONNECT:\r
-               return STATUS_LOCAL_DISCONNECT;\r
-       case CL_DUPLICATE:\r
-               return STATUS_DUPLICATE_NAME;\r
-       case CL_INVALID_REQUEST:\r
-               return STATUS_INVALID_DEVICE_REQUEST;\r
-       default:\r
-               return STATUS_UNSUCCESSFUL;\r
-       }\r
+       return (NTSTATUS)status;\r
 }\r
 \r
 \r
@@ -95,50 +47,18 @@ cl_from_ntstatus(
 {\r
        switch( status )\r
        {\r
-       case STATUS_SUCCESS:\r
-               return CL_SUCCESS;\r
-       case STATUS_DRIVER_INTERNAL_ERROR:\r
-               return CL_ERROR;\r
-       case STATUS_INVALID_DEVICE_STATE:\r
-               return CL_INVALID_STATE;\r
-       case STATUS_NOT_SUPPORTED:\r
-               return CL_INVALID_OPERATION;\r
-       case STATUS_INVALID_PARAMETER_1:\r
-               return CL_INVALID_SETTING;\r
-       case STATUS_INVALID_PARAMETER:\r
-               return CL_INVALID_PARAMETER;\r
-       case STATUS_INSUFFICIENT_RESOURCES:\r
-               return CL_INSUFFICIENT_RESOURCES;\r
-       case STATUS_NO_MEMORY:\r
-               return CL_INSUFFICIENT_MEMORY;\r
-       case STATUS_ACCESS_DENIED:\r
-               return CL_INVALID_PERMISSION;\r
-       case STATUS_EVENT_DONE:\r
-               return CL_COMPLETED;\r
-       case STATUS_ABANDONED:\r
-               return CL_NOT_DONE;\r
-       case STATUS_PENDING:\r
-               return CL_PENDING;\r
-       case STATUS_TIMEOUT:\r
-               return CL_TIMEOUT;\r
-       case STATUS_CANCELLED:\r
-               return CL_CANCELED;\r
-       case STATUS_REQUEST_NOT_ACCEPTED:\r
-               return CL_REJECT;\r
-       case STATUS_DATA_OVERRUN:\r
-               return CL_OVERRUN;\r
-       case STATUS_NOT_FOUND:\r
-               return CL_NOT_FOUND;\r
-       case STATUS_DEVICE_NOT_READY:\r
-               return CL_UNAVAILABLE;\r
-       case STATUS_DEVICE_BUSY:\r
-               return CL_BUSY;\r
-       case STATUS_LOCAL_DISCONNECT:\r
-               return CL_DISCONNECT;\r
-       case STATUS_DUPLICATE_NAME:\r
-               return CL_DUPLICATE;\r
-       case STATUS_INVALID_DEVICE_REQUEST:\r
-               return CL_INVALID_REQUEST;\r
+       case STATUS_SUCCESS:                            case STATUS_DRIVER_INTERNAL_ERROR:\r
+       case STATUS_INVALID_DEVICE_STATE:       case STATUS_NOT_SUPPORTED:\r
+       case STATUS_INVALID_PARAMETER_1:        case STATUS_INVALID_PARAMETER:\r
+       case STATUS_INSUFFICIENT_RESOURCES:     case STATUS_NO_MEMORY:\r
+       case STATUS_ACCESS_DENIED:                      case STATUS_EVENT_DONE:\r
+       case STATUS_ABANDONED:                          case STATUS_PENDING:\r
+       case STATUS_TIMEOUT:                            case STATUS_CANCELLED:\r
+       case STATUS_REQUEST_NOT_ACCEPTED:       case STATUS_DATA_OVERRUN:\r
+       case STATUS_NOT_FOUND:                          case STATUS_DEVICE_NOT_READY:\r
+       case STATUS_DEVICE_BUSY:                        case STATUS_LOCAL_DISCONNECT:\r
+       case STATUS_DUPLICATE_NAME:                     case STATUS_INVALID_DEVICE_REQUEST:\r
+               return (cl_status_t)status;\r
        default:\r
                return CL_ERROR;\r
        }\r

diff --git a/branches/Ndi/inc/complib/cl_types.h b/branches/Ndi/inc/complib/cl_types.h
index fa4e4df1707b9c19517792de7c550878d9987c9a..74d746c363217fab592c9456fdfb62f8ecc1e63a 100644 (file)
--- a/branches/Ndi/inc/complib/cl_types.h
+++ b/branches/Ndi/inc/complib/cl_types.h
@@ -393,8 +393,10 @@ cl_panic(
 * SEE ALSO\r
 *      cl_status_t\r
 *********/\r
+#ifndef CL_KERNEL\r
 #define CL_STATUS_MSG( errcode ) \\r
        ((errcode < CL_STATUS_COUNT)?cl_status_text[errcode]:"invalid status code")\r
+#endif \r
 \r
 \r
 #if !defined( FALSE )\r

diff --git a/branches/Ndi/inc/kernel/complib/cl_types_osd.h b/branches/Ndi/inc/kernel/complib/cl_types_osd.h
index 7a6dd643a42a4bd70582d11da0334ac9c18d2e94..608a8668abfb19721e4470aaf23424f7dea0a989 100644 (file)
--- 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(\r
        IN      enum _cl_status status );\r
 \r
-enum _cl_status\r
+DECLSPEC_DEPRECATED enum _cl_status\r
 cl_from_ntstatus(\r
        IN      NTSTATUS status );\r
 \r