xnu-517.3.15.tar.gz

[apple/xnu.git] / bsd / miscfs / devfs / devfsdefs.h

diff --git a/bsd/miscfs/devfs/devfsdefs.h b/bsd/miscfs/devfs/devfsdefs.h
index 630795bb4650abc7138af84394e84b3296bd6e5d..6056ca7d5875d10c85504d8d0d50ddd01428e521 100644 (file)
--- a/bsd/miscfs/devfs/devfsdefs.h
+++ b/bsd/miscfs/devfs/devfsdefs.h
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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@
  */
@@ -55,7 +58,12 @@
  *     Renamed structures/elements to clarify usage in code.
  */
 
+#ifndef __DEVFS_DEVFSDEFS_H__
+#define __DEVFS_DEVFSDEFS_H__
+
+#include  <sys/appleapiopts.h>
 
+#ifdef __APPLE_API_PRIVATE
 #define DEVMAXNAMESIZE         32              /* XXX */
 #define DEVMAXPATHSIZE         128             /* XXX */
 
@@ -63,7 +71,7 @@ typedef enum {
     DEV_DIR,
     DEV_BDEV,
     DEV_CDEV,
-    DEV_SLNK,
+    DEV_SLNK
 } devfstype_t;
 
 extern int (**devfs_vnodeop_p)(void *);        /* our own vector array for dirs */
@@ -107,8 +115,8 @@ struct devnode
     devfstype_t                dn_type;
     int                        dn_flags;
     u_short            dn_mode;
-    u_short            dn_uid; 
-    u_short            dn_gid;
+    uid_t              dn_uid; 
+    gid_t              dn_gid;
     struct timespec    dn_atime;/* time of last access */
     struct timespec    dn_mtime;/* time of last modification */
     struct timespec    dn_ctime;/* time file changed */
@@ -172,19 +180,7 @@ struct devfsmount
 #define M_DEVFSNODE    M_DEVFS
 #define M_DEVFSMNT     M_DEVFS
 
-static __inline__ void
-getnanotime(struct timespec * t_p)
-{
-    struct timeval tv;
-
-    microtime(&tv);
-    t_p->tv_sec = tv.tv_sec;
-    t_p->tv_nsec = tv.tv_usec * 1000;
-    return;
-}
-
 #define VTODN(vp)      ((devnode_t *)(vp)->v_data)
-extern void cache_purge(struct vnode *vp); /* vfs_cache.c */
 
 static __inline__ int
 DEVFS_LOCK(struct proc * p)
@@ -280,3 +276,5 @@ dn_copy_times(devnode_t * target, devnode_t * source)
     target->dn_ctime = source->dn_ctime;
     return;
 }
+#endif /* __APPLE_API_PRIVATE */
+#endif /* __DEVFS_DEVFSDEFS_H__ */