xnu-1699.24.23.tar.gz

[apple/xnu.git] / bsd / net / devtimer.c

diff --git a/bsd/net/devtimer.c b/bsd/net/devtimer.c
index 9a9a786cdd415f9147acdfef62841bfcbe9d932f..d0b55d2519b770885b3d0b038d20a7bd1ec368e5 100644 (file)
--- a/bsd/net/devtimer.c
+++ b/bsd/net/devtimer.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004,2007-2008 Apple 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@
  */
 
 /*
@@ -48,12 +46,12 @@
 
 #ifdef DEVTIMER_DEBUG
 #define _devtimer_printf       printf
-#else DEVTIMER_DEBUG
+#else /* !DEVTIMER_DEBUG */
 static __inline__ void
 _devtimer_printf(__unused const char * fmt, ...)
 {
 }
-#endif DEVTIMER_DEBUG
+#endif /* !DEVTIMER_DEBUG */
 
 struct devtimer_s {
     void *                     dt_callout;
@@ -144,7 +142,7 @@ devtimer_release(devtimer_ref timer)
 static void
 devtimer_process(void * param0, void * param1)
 {
-    int                                generation = (int)param1;
+    int                                generation = *(int*)param1;
     devtimer_process_func      process_func;
     devtimer_timeout_func      timeout_func;
     devtimer_ref               timer = (devtimer_ref)param0;
@@ -217,7 +215,7 @@ devtimer_set_absolute(devtimer_ref timer,
     timer->dt_generation++;
     devtimer_retain(timer);
     thread_call_enter1_delayed(timer->dt_callout, 
-                              (thread_call_param_t)timer->dt_generation,
+                              &timer->dt_generation,
                               timeval_to_absolutetime(abs_time));
     return;
 }
@@ -274,8 +272,8 @@ __private_extern__ struct timeval
 devtimer_current_time(void)
 {
     struct timeval     tv;
-    uint32_t sec;
-    uint32_t usec;
+    clock_sec_t sec;
+    clock_usec_t usec;
 
     clock_get_system_microtime(&sec, &usec);
     tv.tv_sec = sec;