xnu-4903.221.2.tar.gz

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

diff --git a/bsd/net/devtimer.c b/bsd/net/devtimer.c
index 0a4af488ee97ef2c0de37bbef9d0540cce8a1bbb..45eb31f473cbd8bd50eb5f19b36798e2cd30b98e 100644 (file)
--- a/bsd/net/devtimer.c
+++ b/bsd/net/devtimer.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004,2007-2008 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -46,12 +46,12 @@
 
 #ifdef DEVTIMER_DEBUG
 #define _devtimer_printf       printf
 
 #ifdef DEVTIMER_DEBUG
 #define _devtimer_printf       printf

-#else DEVTIMER_DEBUG
+#else /* !DEVTIMER_DEBUG */

 static __inline__ void
 _devtimer_printf(__unused const char * fmt, ...)
 {
 }
 static __inline__ void
 _devtimer_printf(__unused const char * fmt, ...)
 {
 }

-#endif DEVTIMER_DEBUG
+#endif /* !DEVTIMER_DEBUG */

 
 struct devtimer_s {
     void *                     dt_callout;
 
 struct devtimer_s {
     void *                     dt_callout;


@@ -142,7 +142,7 @@ devtimer_release(devtimer_ref timer)
 static void
 devtimer_process(void * param0, void * param1)
 {
 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;
     devtimer_process_func      process_func;
     devtimer_timeout_func      timeout_func;
     devtimer_ref               timer = (devtimer_ref)param0;


@@ -176,11 +176,10 @@ devtimer_create(devtimer_process_func process_func, void * arg0)
 {
     devtimer_ref       timer;
 
 {
     devtimer_ref       timer;
 

-    timer = _MALLOC(sizeof(*timer), M_DEVTIMER, M_WAITOK);
+    timer = _MALLOC(sizeof(*timer), M_DEVTIMER, M_WAITOK | M_ZERO);

     if (timer == NULL) {
        return (timer);
     }
     if (timer == NULL) {
        return (timer);
     }

-    bzero(timer, sizeof(*timer));

     devtimer_retain(timer);
     timer->dt_callout = thread_call_allocate(devtimer_process, timer);
     if (timer->dt_callout == NULL) {
     devtimer_retain(timer);
     timer->dt_callout = thread_call_allocate(devtimer_process, timer);
     if (timer->dt_callout == NULL) {


@@ -215,7 +214,7 @@ devtimer_set_absolute(devtimer_ref timer,
     timer->dt_generation++;
     devtimer_retain(timer);
     thread_call_enter1_delayed(timer->dt_callout, 
     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;
 }
                               timeval_to_absolutetime(abs_time));
     return;
 }


@@ -272,8 +271,8 @@ __private_extern__ struct timeval
 devtimer_current_time(void)
 {
     struct timeval     tv;
 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;
 
     clock_get_system_microtime(&sec, &usec);
     tv.tv_sec = sec;