xnu-2782.1.97.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 37fe67747e26bcf4e7ee1a917d185071836b3729..c1a191adbdf6152e568b474bd8f4a455362a2b94 100644 (file)
--- a/osfmk/kern/simple_lock.h
+++ b/osfmk/kern/simple_lock.h
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* 
  * Copyright (C) 1998 Apple Computer
@@ -104,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,
@@ -168,8 +182,6 @@ __END_DECLS
 #define        simple_unlock(l)        usimple_unlock(l)
 #define simple_lock_try(l)     usimple_lock_try(l)
 #define simple_lock_addr(l)    (&(l))
-#define thread_sleep_simple_lock(l, e, i) \
-                               thread_sleep_usimple_lock((l), (e), (i))
 #endif /* !defined(simple_lock_init) */
 
 #endif /*!_KERN_SIMPLE_LOCK_H_*/