xnu-1228.tar.gz

[apple/xnu.git] / osfmk / kern / simple_lock.h

diff --git a/osfmk/kern/simple_lock.h b/osfmk/kern/simple_lock.h
index ad451134efc9d9872aee91fca10de6f231c2d0c5..57621217596d9780a7f9790a7c1d1c52ad1ce4e7 100644 (file)
--- a/osfmk/kern/simple_lock.h
+++ b/osfmk/kern/simple_lock.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000-2005 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,
- * 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@
  */
 /* 
  * Copyright (C) 1998 Apple Computer
@@ -96,25 +102,41 @@ extern unsigned int                hw_lock_held(
 __BEGIN_DECLS
 
 extern uint32_t                        hw_atomic_add(
-                                       uint32_t        *dest,
+                                       volatile uint32_t       *dest,
                                        uint32_t        delt);
 
 extern uint32_t                        hw_atomic_sub(
-                                       uint32_t        *dest,
+                                       volatile uint32_t       *dest,
                                        uint32_t        delt);
 
 extern uint32_t                        hw_atomic_or(
-                                       uint32_t        *dest,
+                                       volatile uint32_t       *dest,
                                        uint32_t        mask);
 
 extern uint32_t                        hw_atomic_and(
-                                       uint32_t        *dest,
+                                       volatile uint32_t       *dest,
+                                       uint32_t        mask);
+
+/*
+ * Variant of hw_atomic_or which doesn't return a value; potentially
+ * more efficient on some platforms.
+ */
+extern void                    hw_atomic_or_noret(
+                                       volatile uint32_t       *dest,
+                                       uint32_t        mask);
+/*
+ * Variant of hw_atomic_and which doesn't return a value; potentially
+ * more efficient on some platforms.
+ */
+
+extern void                    hw_atomic_and_noret(
+                                       volatile uint32_t       *dest,
                                        uint32_t        mask);
 
 extern uint32_t                        hw_compare_and_store(
                                        uint32_t        oldval,
                                        uint32_t        newval,
-                                       uint32_t        *dest);
+                                       volatile uint32_t       *dest);
 
 extern void                    hw_queue_atomic(
                                        unsigned int *anchor,