xnu-1486.2.11.tar.gz

[apple/xnu.git] / bsd / sys / ev.h

diff --git a/bsd/sys/ev.h b/bsd/sys/ev.h
index 1dae858fa32cc0070cadf951fef9904559d72ef7..8000e9900aaac41525f054d013c6565efe9038e0 100644 (file)
--- a/bsd/sys/ev.h
+++ b/bsd/sys/ev.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -30,7 +30,6 @@
 #ifndef _SYS_EV_H_
 #define _SYS_EV_H_
 
-#if !defined(__LP64__)
 
 #include <sys/appleapiopts.h>
 
@@ -68,12 +67,46 @@ typedef struct eventreq *er_t;
 #define EV_TIMEOUT 0x20000
 #define EV_DMASK   0xffffff00
 
+
+#ifndef KERNEL
+
+__BEGIN_DECLS
+int    modwatch(er_t, int);
+int    watchevent(er_t, int);
+int    waitevent(er_t, struct timeval *);
+__END_DECLS
+
+#endif
+
+
 #ifdef BSD_KERNEL_PRIVATE
 
+
+
+struct eventreq32 {
+  int      er_type;
+  int      er_handle;
+  uint32_t er_data;
+  int      er_rcnt;
+  int      er_wcnt;
+  int      er_ecnt;
+  int      er_eventbits;
+};
+
+struct eventreq64 {
+  int      er_type;
+  int      er_handle;
+  user_addr_t er_data;
+  int      er_rcnt;
+  int      er_wcnt;
+  int      er_ecnt;
+  int      er_eventbits;
+};
+
 struct eventqelt {
   TAILQ_ENTRY(eventqelt)  ee_slist;
   TAILQ_ENTRY(eventqelt)  ee_plist;
-  struct eventreq  ee_req;
+  struct eventreq64  ee_req;
   struct proc *    ee_proc;
   u_int            ee_flags;
 #define EV_QUEUED      0x01
@@ -83,6 +116,4 @@ struct eventqelt {
 int waitevent_close(struct proc *p, struct fileproc *);
 #endif /* BSD_KERNEL_PRIVATE */
 
-#endif /* !defined(__LP64__) */
-
 #endif /* _SYS_EV_H_ */