X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/6601e61aa18bf4f09af135ff61fc7f4771d23b06..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/osfmk/UserNotification/KUNCUserNotifications.c?ds=sidebyside

diff --git a/osfmk/UserNotification/KUNCUserNotifications.c b/osfmk/UserNotification/KUNCUserNotifications.c
index 21ef970a0..740b8f125 100644
--- a/osfmk/UserNotification/KUNCUserNotifications.c
+++ b/osfmk/UserNotification/KUNCUserNotifications.c
@@ -1,23 +1,29 @@
 /*
- * 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@
  * 
- * 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@
  */
 
 #include <mach/port.h>
@@ -48,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(
@@ -110,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;
@@ -139,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);
@@ -180,9 +189,10 @@ UNDNotificationCreated_rpc (
  * KUNC Functions
 */
 
+extern lck_grp_t LockCompatGroup;
 
 KUNCUserNotificationID
-KUNCGetNotificationID()
+KUNCGetNotificationID(void)
 {
 	UNDReplyRef reply;
 
@@ -193,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,