Changeset 8288 in vbox for trunk/src/VBox/Runtime/darwin

Timestamp:

Apr 22, 2008 1:25:55 PM (17 years ago)

Author:

vboxsync

Message:

Added RTErrConvertFromDarwin() as a merge of the IO, Kern and COM versions.

Location:

trunk/src/VBox/Runtime/darwin

Files:

• RTErrConvertFromDarwin.cpp (copied) (copied from trunk/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp ) (6 diffs)
• RTErrConvertFromDarwinCOM.cpp (modified) (2 diffs)
• RTErrConvertFromDarwinIO.cpp (modified) (2 diffs)
• RTErrConvertFromDarwinKern.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp

@@ -1 @@
-/* $Id $ */
+/* $Id:$ */
 /** @file
  * IPRT - Convert Darwin Mach returns codes to iprt status codes.
@@ -33 +33 @@
 *******************************************************************************/
 #include <mach/kern_return.h>
+#include <IOKit/IOReturn.h>
 
 #include <iprt/err.h>
@@ -38 +39 @@
 
 
-RTDECL(int) RTErrConvertFromDarwinKern(int iNativeCode)
+RTDECL(int) RTErrConvertFromDarwin(int iNativeCode)
 {
     /*
@@ -48 +49 @@
     switch (iNativeCode)
     {
+        /*
+         * Mach.
+         */
         case KERN_INVALID_ADDRESS:      return VERR_INVALID_POINTER;
         //case KERN_PROTECTION_FAILURE:
@@ -97 +101 @@
         //case KERN_NOT_WAITING:
         case KERN_OPERATION_TIMED_OUT:  return VERR_TIMEOUT;
+
+
+        /*
+         * I/O Kit.
+         */
+        case kIOReturnNoDevice:         return VERR_IO_BAD_UNIT;
+        case kIOReturnUnsupported:      return VERR_NOT_SUPPORTED;
+
+#ifdef IN_RING3
+        /*
+         * CoreFoundation COM (may overlap with I/O Kit and Mach).
+         */
+        default:
+            if (    iNativeCode >= 0x80000000
+                &&  iNativeCode >= 0x8000FFFFL)
+                return RTErrConvertFromDarwinCOM(iNativeCode);
+            break;
+#endif /* IN_RING3 */
     }
 
@@ -104 +126 @@
 }
 
-

trunk/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp

@@ -1 @@
-/* $Id $ */
+/* $Id:$ */
 /** @file
  * IPRT - Convert Darwin COM returns codes to iprt status codes.
@@ -37 +37 @@
 #include <iprt/assert.h>
 
+
 RTDECL(int) RTErrConvertFromDarwinCOM(int32_t iNativeCode)
 {

trunk/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp

@@ -1 @@
-/* $Id $ */
+/* $Id:$ */
 /** @file
  * IPRT - Convert Darwin IOKit returns codes to iprt status codes.
@@ -45 +45 @@
     if (iNativeCode == kIOReturnSuccess)
         return VINF_SUCCESS;
-
-    switch (iNativeCode)
-    {
-        case kIOReturnNoDevice:     return VERR_IO_BAD_UNIT;
-        case kIOReturnUnsupported:  return VERR_NOT_SUPPORTED;
-    }
-
-    /* unknown error. */
-    AssertMsgFailed(("Unhandled error %#x\n", iNativeCode));
-    return VERR_UNRESOLVED_ERROR;
+    return RTErrConvertFromDarwin(iNativeCode);
 }
 

trunk/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp

@@ -1 @@
-/* $Id $ */
+/* $Id:$ */
 /** @file
  * IPRT - Convert Darwin Mach returns codes to iprt status codes.
@@ -45 +45 @@
     if (iNativeCode == KERN_SUCCESS)
         return VINF_SUCCESS;
-
-    switch (iNativeCode)
-    {
-        case KERN_INVALID_ADDRESS:      return VERR_INVALID_POINTER;
-        //case KERN_PROTECTION_FAILURE:
-        //case KERN_NO_SPACE:
-        case KERN_INVALID_ARGUMENT:     return VERR_INVALID_PARAMETER;
-        //case KERN_FAILURE:
-        //case KERN_RESOURCE_SHORTAGE:
-        //case KERN_NOT_RECEIVER:
-        case KERN_NO_ACCESS:            return VERR_ACCESS_DENIED;
-        //case KERN_MEMORY_FAILURE:
-        //case KERN_MEMORY_ERROR:
-        //case KERN_ALREADY_IN_SET:
-        //case KERN_NOT_IN_SET:
-        //case KERN_NAME_EXISTS:
-        //case KERN_ABORTED:
-        //case KERN_INVALID_NAME:
-        //case KERN_INVALID_TASK:
-        //case KERN_INVALID_RIGHT:
-        //case KERN_INVALID_VALUE:
-        //case KERN_UREFS_OVERFLOW:
-        //case KERN_INVALID_CAPABILITY:
-        //case KERN_RIGHT_EXISTS:
-        //case KERN_INVALID_HOST:
-        //case KERN_MEMORY_PRESENT:
-        //case KERN_MEMORY_DATA_MOVED:
-        //case KERN_MEMORY_RESTART_COPY:
-        //case KERN_INVALID_PROCESSOR_SET:
-        //case KERN_POLICY_LIMIT:
-        //case KERN_INVALID_POLICY:
-        //case KERN_INVALID_OBJECT:
-        //case KERN_ALREADY_WAITING:
-        //case KERN_DEFAULT_SET:
-        //case KERN_EXCEPTION_PROTECTED:
-        //case KERN_INVALID_LEDGER:
-        //case KERN_INVALID_MEMORY_CONTROL:
-        //case KERN_INVALID_SECURITY:
-        //case KERN_NOT_DEPRESSED:
-        //case KERN_TERMINATED:
-        //case KERN_LOCK_SET_DESTROYED:
-        //case KERN_LOCK_UNSTABLE:
-        case KERN_LOCK_OWNED:           return VERR_SEM_BUSY;
-        //case KERN_LOCK_OWNED_SELF:
-        case KERN_SEMAPHORE_DESTROYED:  return VERR_SEM_DESTROYED;
-        //case KERN_RPC_SERVER_TERMINATED:
-        //case KERN_RPC_TERMINATE_ORPHAN:
-        //case KERN_RPC_CONTINUE_ORPHAN:
-        case KERN_NOT_SUPPORTED:        return VERR_NOT_SUPPORTED;
-        //case KERN_NODE_DOWN:
-        //case KERN_NOT_WAITING:
-        case KERN_OPERATION_TIMED_OUT:  return VERR_TIMEOUT;
-    }
-
-    /* unknown error. */
-    AssertMsgFailed(("Unhandled error %#x\n", iNativeCode));
-    return VERR_UNRESOLVED_ERROR;
+    return RTErrConvertFromDarwin(iNativeCode);
 }