AcessNative - Reworked protocol to be simpler

[tpg/acess2.git] / AcessNative / acesskernel_src / syscalls.c

diff --git a/AcessNative/acesskernel_src/syscalls.c b/AcessNative/acesskernel_src/syscalls.c
index 7e8d1ec..85a8232 100644 (file)
--- a/AcessNative/acesskernel_src/syscalls.c
+++ b/AcessNative/acesskernel_src/syscalls.c
@@ -42,7 +42,7 @@ int Syscall_Null(const char *Format, void *Args)
        return 0;
 }
 
-SYSCALL2(Syscall_Open, VFS_Open, "di", const char *, int);
+SYSCALL2(Syscall_Open, VFS_Open, "si", const char *, int);
 SYSCALL1V(Syscall_Close, VFS_Close, "i", int);
 SYSCALL3(Syscall_Read, VFS_Read, "iid", int, int, void *);
 SYSCALL3(Syscall_Write, VFS_Write, "iid", int, int, const void *);
@@ -59,13 +59,18 @@ const int   ciNumSyscalls = sizeof(caSyscalls)/sizeof(caSyscalls[0]);
 /**
  * \brief Recieve a syscall structure from the server code
  */
-tRequestHeader *SyscallRecieve(tRequestHeader *Request)
+tRequestHeader *SyscallRecieve(tRequestHeader *Request, int *ReturnLength)
 {
        char    formatString[Request->NParams+1];
-       char    *inData = (char*)&Request->Params[Request->NParams+Request->NReturn];
+       char    *inData = (char*)&Request->Params[Request->NParams];
         int    argListLen = 0;
         int    i, retVal;
+       tRequestHeader  *ret;
+        int    retValueCount = 1;
+        int    retDataLen = sizeof(Uint64);
+       void    *mallocdData[Request->NParams];
        
+       // Sanity check
        if( Request->CallID > ciNumSyscalls ) {
                return NULL;
        }
@@ -90,6 +95,10 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request)
                        formatString[i] = 'd';
                        argListLen += sizeof(void*);
                        break;
+               case ARG_TYPE_STRING:
+                       formatString[i] = 's';
+                       argListLen += sizeof(char*);
+                       break;
                default:
                        return NULL;    // ERROR!
                }
@@ -115,11 +124,36 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request)
                                argListLen += sizeof(Uint64);
                                inData += sizeof(Uint64);
                                break;
-                       case ARG_TYPE_DATA:
                        case ARG_TYPE_STRING:
                                *(void**)&argListData[argListLen] = *(void**)inData;
                                argListLen += sizeof(void*);
-                               inData += sizeof(void*);
+                               inData += Request->Params[i].Length;
+                               break;
+                       
+                       // Data gets special handling, because only it can be returned to the user
+                       // (ARG_TYPE_DATA is a pointer)
+                       case ARG_TYPE_DATA:
+                               // Prepare the return values
+                               if( Request->Params[i].Flags & ARG_FLAG_RETURN )
+                               {
+                                       retDataLen += Request->Params[i].Length;
+                                       retValueCount ++;
+                               }
+                               
+                               // Check for non-resident data
+                               if( Request->Params[i].Flags & ARG_FLAG_ZEROED )
+                               {
+                                       // Allocate and zero the buffer
+                                       mallocdData[i] = calloc(1, Request->Params[i].Length);
+                                       *(void**)&argListData[argListLen] = mallocdData[i];
+                                       argListLen += sizeof(void*);
+                               }
+                               else
+                               {
+                                       *(void**)&argListData[argListLen] = (void*)inData;
+                                       argListLen += sizeof(void*);
+                                       inData += Request->Params[i].Length;
+                               }
                                break;
                        }
                }
@@ -127,5 +161,35 @@ tRequestHeader *SyscallRecieve(tRequestHeader *Request)
                retVal = caSyscalls[Request->CallID](formatString, argListData);
        }
        
-       return NULL;
+       // Allocate the return
+       ret = malloc(sizeof(tRequestHeader) + retValueCount * sizeof(tRequestValue)
+               + retDataLen);
+       ret->ClientID = Request->ClientID;
+       ret->CallID = Request->CallID;
+       ret->NParams = retValueCount;
+       inData = &ret->Params[ ret->NParams ];
+       
+       // Static Uint64 return value
+       ret->Params[0].Type = ARG_TYPE_INT64;
+       ret->Params[0].Flags = 0;
+       ret->Params[0].Length = sizeof(Uint64);
+       *(Uint64*)inData = retVal;
+       inData += sizeof(Uint64);
+       
+       for( i = 0; i < Request->NParams; i ++ )
+       {
+               if( Request->Params[i].Type != ARG_TYPE_DATA )  continue;
+               if( !(Request->Params[i].Flags & ARG_FLAG_RETURN) )     continue;
+               
+               ret->Params[1 + i].Type = Request->Params[i].Type;
+               ret->Params[1 + i].Flags = 0;
+               ret->Params[1 + i].Length = Request->Params[i].Length;
+               
+               memcpy(inData, mallocdData[i], Request->Params[i].Length);
+               inData += Request->Params[i].Length;
+               
+               free( mallocdData[i] ); // Free temp buffer from above
+       }
+       
+       return ret;
 }