X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=AcessNative%2Fld-acess_src%2Fexports.c;h=406e55f99d1b507ed7eb1f72c8f3c5aab6393215;hb=695800da5d26cd12d5dfa0a93d0ef1eed0533c78;hp=0c87bda674ef882eae453f55e7928a90d797fd8a;hpb=a41f3e5efdf853726d078dc03550de40e9d63bdd;p=tpg%2Facess2.git

diff --git a/AcessNative/ld-acess_src/exports.c b/AcessNative/ld-acess_src/exports.c
index 0c87bda6..406e55f9 100644
--- a/AcessNative/ld-acess_src/exports.c
+++ b/AcessNative/ld-acess_src/exports.c
@@ -12,6 +12,7 @@
 #include <stddef.h>
 
 #define DEBUG(v...)	Debug(v)
+#define PAGE_SIZE	4096
 
 typedef struct sFILE	FILE;
 
@@ -93,9 +94,14 @@ uint64_t acess_tell(int FD) {
 }
 
 int acess_ioctl(int fd, int id, void *data) {
+	 int	len;
 	// NOTE: 1024 byte size is a hack
 	DEBUG("ioctl(%i, %i, %p)", fd, id, data);
-	return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, 1024, data);
+	if( data == NULL )
+		len = 0;
+	else
+		len = PAGE_SIZE - ((uintptr_t)data % PAGE_SIZE);
+	return _Syscall(SYS_IOCTL, ">i >i ?d", fd, id, len, data);
 }
 int acess_finfo(int fd, t_sysFInfo *info, int maxacls) {
 //	DEBUG("offsetof(size, t_sysFInfo) = %i", offsetof(t_sysFInfo, size));
@@ -257,10 +263,19 @@ int acess_SysSendMessage(int DestTID, int Length, void *Data)
 
 int acess_SysGetMessage(int *SourceTID, void *Data)
 {
-	return _Syscall(SYS_GETMSG, "<d <d",
+//	static __thread int lastlen = 1024;
+	int lastlen;
+
+	lastlen = _Syscall(SYS_GETMSG, "<d <d",
 		SourceTID ? sizeof(int) : 0, SourceTID,
-		Data ? 4096 : 0, Data
+		Data ? 1024 : 0, Data
 		);
+	return lastlen;
+}
+
+int acess__SysWaitEvent(int Mask)
+{
+	return _Syscall(SYS_WAITEVENT, ">i", Mask);
 }
 
 // --- Logging
@@ -321,7 +336,8 @@ const tSym	caBuiltinSymbols[] = {
 	
 	DEFSYM(_SysAllocate),
 	DEFSYM(_SysDebug),
-	DEFSYM(_SysSetFaultHandler)
+	DEFSYM(_SysSetFaultHandler),
+	DEFSYM(_SysWaitEvent)
 };
 
 const int	ciNumBuiltinSymbols = sizeof(caBuiltinSymbols)/sizeof(caBuiltinSymbols[0]);