xnu-1699.32.7.tar.gz

[apple/xnu.git] / osfmk / UserNotification / KUNCUserNotifications.c

diff --git a/osfmk/UserNotification/KUNCUserNotifications.c b/osfmk/UserNotification/KUNCUserNotifications.c
index 8ad946ec3c1c8613445a66c32ba2ac32b0381ca1..740b8f12571b3bb26963d86a91f3eb86685065f5 100644 (file)
--- a/osfmk/UserNotification/KUNCUserNotifications.c
+++ b/osfmk/UserNotification/KUNCUserNotifications.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 #include <mach/port.h>
@@ -49,16 +54,15 @@
  */
 
 struct UNDReply {
-       decl_mutex_data(,lock)                          /* UNDReply lock */
+       decl_lck_mtx_data(,lock)                                /* UNDReply lock */
        int                             userLandNotificationKey;
        KUNCUserNotificationCallBack    callback;
        boolean_t                       inprogress;
        ipc_port_t                      self_port;      /* Our port */
 };
 
-#define UNDReply_lock(reply)           mutex_lock(&reply->lock)
-#define UNDReply_lock_try(reply)       mutex_lock_try(&(reply)->lock)
-#define UNDReply_unlock(reply)         mutex_unlock(&(reply)->lock)
+#define UNDReply_lock(reply)           lck_mtx_lock(&reply->lock)
+#define UNDReply_unlock(reply)         lck_mtx_lock(&reply->lock)
 
 /* forward declarations */
 void UNDReply_deallocate(
@@ -111,7 +115,11 @@ UNDAlertCompletedWithResult_rpc (
         UNDReplyRef            reply,
         int                    result,
         xmlData_t              keyRef,         /* raw XML bytes */
+#ifdef KERNEL_CF
         mach_msg_type_number_t keyLen)
+#else
+        __unused mach_msg_type_number_t        keyLen)
+#endif
 {
 #ifdef KERNEL_CF
        CFStringRef             xmlError = NULL;
@@ -140,7 +148,7 @@ UNDAlertCompletedWithResult_rpc (
 #endif /* KERNEL_CF */
 
        if (reply->callback) {
-               (reply->callback)((KUNCUserNotificationID) reply, result, dict);
+               (reply->callback)((int)(KUNCUserNotificationID)reply, result, dict);
        }
 
        UNDReply_lock(reply);
@@ -181,9 +189,10 @@ UNDNotificationCreated_rpc (
  * KUNC Functions
 */
 
+extern lck_grp_t LockCompatGroup;
 
 KUNCUserNotificationID
-KUNCGetNotificationID()
+KUNCGetNotificationID(void)
 {
        UNDReplyRef reply;
 
@@ -194,7 +203,7 @@ KUNCGetNotificationID()
                        kfree(reply, sizeof(struct UNDReply));
                        reply = UND_REPLY_NULL;
                } else {
-                       mutex_init(&reply->lock, 0);
+                       lck_mtx_init(&reply->lock, &LockCompatGroup, LCK_ATTR_NULL);
                        reply->userLandNotificationKey = -1;
                        reply->inprogress = FALSE;
                        ipc_kobject_set(reply->self_port,