xnu-1504.15.3.tar.gz

[apple/xnu.git] / osfmk / kern / etimer.h

diff --git a/osfmk/kern/etimer.h b/osfmk/kern/etimer.h
index 84674a9901df498de5daaab1cb0b15665e288b30..de66f9749753282e642a513b7fd9ee3c6eb83247 100644 (file)
--- a/osfmk/kern/etimer.h
+++ b/osfmk/kern/etimer.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2004-2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -37,36 +37,27 @@
  *                             real-time clock.
  */
 
-#ifndef _ETIMER_H_
-#define _ETIMER_H_
+#ifdef KERNEL_PRIVATE
+
+#ifndef _KERN_ETIMER_H_
+#define _KERN_ETIMER_H_
 
 #define EndOfAllTime   0xFFFFFFFFFFFFFFFFULL
 
-/* extern void rtclock_intr(int inuser, uint64_t iaddr);  - this is currently MD */
 typedef        void (*etimer_intr_t)(int, uint64_t);
 
 extern int setTimerReq(void);
 extern void etimer_intr(int inuser, uint64_t iaddr);
 
 extern void etimer_set_deadline(uint64_t deadline);
+#if defined(i386) || defined(x86_64)
+extern uint64_t setPop(uint64_t time);
+#else
 extern int setPop(uint64_t time);
+#endif
 
 extern void etimer_resync_deadlines(void);
 
-extern uint32_t rtclock_tick_interval;
-
-#if 0 /* this is currently still MD */
-#pragma pack(push,4)
-struct rtclock_timer_t  {
-       uint64_t                deadline;
-       uint32_t
-       /*boolean_t*/   is_set:1,
-                                       has_expired:1,
-                                       :0;
-};
-#pragma pack(pop)
-typedef struct rtclock_timer_t rtclock_timer_t;
-#endif /* MD */
-
+#endif /* _KERN_ETIMER_H_ */
 
-#endif /* _ETIMER_H_ */
+#endif /* KERNEL_PRIVATE */