X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Fsys%2Ftypes.h;h=4e38de37ada12fe90a513fbba79f904c1fe2318f;hb=54ee7218058b4285be6b02195cba4e90c4e12a2d;hp=0d53cf03deac2f81d02a0d84b1560beeecb2eb86;hpb=ac01ae9668972f7fc8223d8fd68168f27c7baec0;p=tpg%2Facess2.git

diff --git a/Usermode/include/sys/types.h b/Usermode/include/sys/types.h
index 0d53cf03..4e38de37 100644
--- a/Usermode/include/sys/types.h
+++ b/Usermode/include/sys/types.h
@@ -2,21 +2,10 @@
  */
 #ifndef _SYS_TYPES_H
 #define _SYS_TYPES_H
-//#include <stdint.h>
 
-typedef struct {
-	int		st_dev;		//dev_t
-	int		st_ino;		//ino_t
-	int		st_mode;	//mode_t
-	unsigned int	st_nlink;
-	unsigned int	st_uid;
-	unsigned int	st_gid;
-	int		st_rdev;	//dev_t
-	unsigned int	st_size;
-	long	st_atime;	//time_t
-	long	st_mtime;
-	long	st_ctime;
-} t_fstat;
+#include "../acess/intdefs.h"
+
+typedef struct stat	t_fstat;
 
 #define FD_SETSIZE	128
 
@@ -25,7 +14,8 @@ typedef struct {
 
 typedef unsigned long	pid_t;
 typedef unsigned long	tid_t;
-typedef signed long long	time_t;
+typedef signed long long int	time_t;
+typedef long long int	off_t;
 
 typedef unsigned int	uint;
 
@@ -40,10 +30,12 @@ typedef struct
 }	fd_set;
 
 struct s_sysACL {
-	unsigned long	object;	//!< Group or user (bit 31 determines)
-	unsigned long	rawperms;	//!< Inverted by bit 31
+	unsigned long	object;	/*!< Group or user (bit 31 determines) */
+	unsigned long	perms;	/*!< Inverted by bit 31 */
 };
 struct s_sysFInfo {
+	unsigned int	mount;
+	unsigned long long	inode;
 	unsigned int	uid;
 	unsigned int	gid;
 	unsigned int	flags;
@@ -53,22 +45,19 @@ struct s_sysFInfo {
 	time_t	ctime;
 	 int	numacls;
 	struct s_sysACL	acls[];
-};
+} __attribute__((packed));
 typedef struct s_sysFInfo	t_sysFInfo;
 typedef struct s_sysACL	t_sysACL;
 
-static inline void FD_ZERO(fd_set *fdsetp) {int i=FD_SETSIZE/16;while(i--)fdsetp->flags[i]=0; }
-static inline void FD_CLR(int fd, fd_set *fdsetp) {
-	if(fd < 0 || fd > FD_SETSIZE)	return;
-	fdsetp->flags[fd/16] &= (fd_set_ent_t) ((~1 << (fd%16))) & 0xFFFF;
-}
-static inline void FD_SET(int fd, fd_set *fdsetp) {
-	if(fd < 0 || fd > FD_SETSIZE)	return;
-	fdsetp->flags[fd/16] |= (fd_set_ent_t) (1 << (fd%16));
-}
-static inline int FD_ISSET(int fd, fd_set *fdsetp) {
-	if(fd < 0 || fd > FD_SETSIZE)	return 0;
-	return !!( fdsetp->flags[fd/16] & (1<<(fd%16)) );
-}
+extern void	FD_ZERO(fd_set *fdsetp);
+extern void	FD_CLR(int fd, fd_set *fdsetp);
+extern void	FD_SET(int fd, fd_set *fdsetp);
+extern int	FD_ISSET(int fd, fd_set *fdsetp);
+
+typedef __uint8_t	u_int8_t;
+typedef __uint16_t	u_int16_t;
+typedef __uint32_t	u_int32_t;
+
+#include "../sys/stat.h"
 
 #endif