X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2Finclude%2Facess%2Fsys.h;h=cdd01879e5fd5028f66e8a843194b4d5d4f26a82;hb=a41f3e5efdf853726d078dc03550de40e9d63bdd;hp=f9334866ccaa6970cdd2c0e5fae8f1e94027bf13;hpb=df7ea67ff0aa02ec50cee1f9635f989bad1bf90d;p=tpg%2Facess2.git

diff --git a/Usermode/include/acess/sys.h b/Usermode/include/acess/sys.h
index f9334866..cdd01879 100644
--- a/Usermode/include/acess/sys.h
+++ b/Usermode/include/acess/sys.h
@@ -1,72 +1,86 @@
 /*
  * Acess2 System Interface Header
  */
-#ifndef _SYS_SYS_H_
-#define _SYS_SYS_H_
+#ifndef _ACESS_SYS_H_
+#define _ACESS_SYS_H_
 
 #include <stdint.h>
+#include "../sys/types.h"
 
 // === CONSTANTS ===
+#ifndef NULL
+# define NULL	((void*)0)
+#endif
+
+#define THREAD_EVENT_VFS	0x0001
+#define THREAD_EVENT_IPCMSG	0x0002
+#define THREAD_EVENT_SIGNAL	0x0004
+
 #define OPENFLAG_EXEC	0x01
 #define OPENFLAG_READ	0x02
 #define OPENFLAG_WRITE	0x04
 #define	OPENFLAG_NOLINK	0x40
-#define SEEK_SET	1
-#define SEEK_CUR	0
-#define SEEK_END	-1
-#define CLONE_VM	0x10
+#define	OPENFLAG_CREATE	0x80
+#ifndef SEEK_CUR
+# define SEEK_SET	1
+# define SEEK_CUR	0
+# define SEEK_END	-1
+#endif
+#define GETMSG_IGNORE	((void*)-1)
 #define FILEFLAG_DIRECTORY	0x10
 #define FILEFLAG_SYMLINK	0x20
 
 // === TYPES ===
-struct s_sysACL {
-	union {
-		struct {
-			unsigned	group: 1;
-			unsigned	id:	31;
-		};
-		uint32_t	object;
-	};
-	union {
-		struct {
-			unsigned	invert: 1;
-			unsigned	perms:	31;
-		};
-		uint32_t	rawperms;
-	};
-};
-struct s_sysFInfo {
-	uint	uid, gid;
-	uint	flags;
-	uint64_t	size;
-	uint64_t	atime;
-	uint64_t	mtime;
-	uint64_t	ctime;
-	 int	numacls;
-	struct s_sysACL	acls[];
-};
-typedef struct s_sysFInfo	t_sysFInfo;
-typedef struct s_sysACL	t_sysACL;
+
+// === VARIABLES ===
+extern int	_errno;
 
 // === FUNCTIONS ===
-void	_SysDebug(char *str, ...);
+extern void	_SysDebug(const char *format, ...);
 // --- Proc ---
-void	sleep();
-void	wait(int miliseconds);
- int	waittid(int id, int *status);
- int	clone(int flags, void *stack);
- int	execve(char *path, char **argv, char **envp);
+extern void	_exit(int status)	__attribute__((noreturn));
+extern void	sleep(void);
+extern void	yield(void);
+extern int	kill(int pid, int sig);
+//extern void	wait(int miliseconds);
+extern int	_SysWaitEvent(int EventMask);
+extern int	waittid(int id, int *status);
+extern int	clone(int flags, void *stack);
+extern int	execve(char *path, char **argv, char **envp);
+extern int	_SysSpawn(const char *Path, const char **argv, const char **envp, int nFDs, int *FDs);
+extern int	gettid(void);
+extern int	getpid(void);
+extern int	_SysSetFaultHandler(int (*Handler)(int));
+extern void	SysSetName(const char *Name);
+//extern int	SysGetName(const char *Name);
+
+// --- Permissions ---
+extern int	getuid(void);
+extern int	getgid(void);
+extern void	setuid(int id);
+extern void	setgid(int id);
+
 // --- VFS ---
- int	open(char *path, int flags);
- int	reopen(int fd, char *path, int flags);
-void	close(int fd);
-uint64_t	read(int fd, uint64_t length, void *buffer);
-uint64_t	write(int fd, uint64_t length, void *buffer);
- int	seek(int fd, uint64_t offset, int whence);
- int	ioctl(int fd, int id, void *data);
- int	finfo(int fd, t_sysFInfo *info, int maxacls);
- int	readdir(int fd, char *dest);
- int	_SysGetACL(int fd, t_sysACL *dest);
+extern int	chdir(const char *dir);
+extern int	open(const char *path, int flags, ...);
+extern int	reopen(int fd, const char *path, int flags);
+extern int	close(int fd);
+extern uint	read(int fd, void *buffer, uint length);
+extern uint	write(int fd, const void *buffer, uint length);
+extern int	seek(int fd, int64_t offset, int whence);
+extern uint64_t	tell(int fd);
+extern int	ioctl(int fd, int id, void *data);
+extern int	finfo(int fd, t_sysFInfo *info, int maxacls);
+extern int	readdir(int fd, char *dest);
+extern int	_SysOpenChild(int fd, char *name, int flags);
+extern int	_SysGetACL(int fd, t_sysACL *dest);
+extern int	_SysMount(const char *Device, const char *Directory, const char *Type, const char *Options);
+extern int	_SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *err, time_t *timeout, int extraevents);
+#define select(nfs, rdfds, wrfds, erfds, timeout)	_SysSelect(nfs, rdfds, wrfds, erfds, timeout, 0)
+
+// --- IPC ---
+extern int	SysSendMessage(pid_t dest, uint length, const void *Data);
+extern int	SysGetMessage(pid_t *src, void *Data);
 
 // --- MEMORY ---
 uint64_t	_SysGetPhys(uint vaddr);