xnu-517.9.5.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..6b00a76c5f45d761c86edc31d258b24dfb2620ef 100644 (file)
--- a/bsd/miscfs/devfs/devfsdefs.h
+++ b/bsd/miscfs/devfs/devfsdefs.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -55,7 +55,12 @@
  *     Renamed structures/elements to clarify usage in code.
  */
 
  *     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 */
 
 #define DEVMAXNAMESIZE         32              /* XXX */
 #define DEVMAXPATHSIZE         128             /* XXX */
 


@@ -63,7 +68,7 @@ typedef enum {
     DEV_DIR,
     DEV_BDEV,
     DEV_CDEV,
     DEV_DIR,
     DEV_BDEV,
     DEV_CDEV,

-    DEV_SLNK,
+    DEV_SLNK

 } devfstype_t;
 
 extern int (**devfs_vnodeop_p)(void *);        /* our own vector array for dirs */
 } devfstype_t;
 
 extern int (**devfs_vnodeop_p)(void *);        /* our own vector array for dirs */


@@ -107,8 +112,8 @@ struct devnode
     devfstype_t                dn_type;
     int                        dn_flags;
     u_short            dn_mode;
     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 */
     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 +177,7 @@ struct devfsmount
 #define M_DEVFSNODE    M_DEVFS
 #define M_DEVFSMNT     M_DEVFS
 
 #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)
 #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)
 
 static __inline__ int
 DEVFS_LOCK(struct proc * p)


@@ -280,3 +273,5 @@ dn_copy_times(devnode_t * target, devnode_t * source)
     target->dn_ctime = source->dn_ctime;
     return;
 }
     target->dn_ctime = source->dn_ctime;
     return;
 }

+#endif /* __APPLE_API_PRIVATE */
+#endif /* __DEVFS_DEVFSDEFS_H__ */