xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / misc.c

diff --git a/osfmk/ppc/misc.c b/osfmk/ppc/misc.c
index 5ed36d0e77864839abcd5cfe855b59fc73322bdd..807c035129cf38bde85a93822037e96de277e211 100644 (file)
--- a/osfmk/ppc/misc.c
+++ b/osfmk/ppc/misc.c
@@ -1,27 +1,34 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
  */
 /*
  * @OSF_COPYRIGHT@
  */

+#if 0  // dead code

 #include <debug.h>
 #include <mach_debug.h>
 
 #include <debug.h>
 #include <mach_debug.h>
 


@@ -67,14 +74,14 @@ boolean_t copyin_multiple(const char *src,
        midpoint = (const char*) ((vm_offset_t)(src + count) & 0xF0000000);
        first_count = (midpoint - src);
 
        midpoint = (const char*) ((vm_offset_t)(src + count) & 0xF0000000);
        first_count = (midpoint - src);
 

-       first_result = copyin(src, dst, first_count);
+       first_result = copyin(CAST_USER_ADDR_T(src), dst, first_count);

        
        /* If there was an error, stop now and return error */
        if (first_result != 0)
                return first_result;
 
        /* otherwise finish the job and return result */
        
        /* If there was an error, stop now and return error */
        if (first_result != 0)
                return first_result;
 
        /* otherwise finish the job and return result */

-       return copyin(midpoint, dst + first_count, count-first_count);
+       return copyin(CAST_USER_ADDR_T(midpoint), dst + first_count, count-first_count);

 }
 
 extern int copyout_multiple(const char *src, char *dst, vm_size_t count);
 }
 
 extern int copyout_multiple(const char *src, char *dst, vm_size_t count);


@@ -99,7 +106,7 @@ int copyout_multiple(const char *src, char *dst, vm_size_t count)
        midpoint = (char *) ((vm_offset_t)(dst + count) & 0xF0000000);
        first_count = (midpoint - dst);
 
        midpoint = (char *) ((vm_offset_t)(dst + count) & 0xF0000000);
        first_count = (midpoint - dst);
 

-       first_result = copyout(src, dst, first_count);
+       first_result = copyout(src, CAST_USER_ADDR_T(dst), first_count);

        
        /* If there was an error, stop now and return error */
        if (first_result != 0)
        
        /* If there was an error, stop now and return error */
        if (first_result != 0)


@@ -107,6 +114,7 @@ int copyout_multiple(const char *src, char *dst, vm_size_t count)
 
        /* otherwise finish the job and return result */
 
 
        /* otherwise finish the job and return result */
 

-       return copyout(src + first_count, midpoint, count-first_count);
+       return copyout(src + first_count, CAST_USER_ADDR_T(midpoint), count-first_count);

 }
 }

+#endif // dead code