Merge pull request vitasdk#686 from Princess-of-Sleeping/master

Fixed some syscall function
SonicMastr · Feb 23, 2022 · 1d1b886 · 1d1b886
2 parents f5b4868 + 2d9b4b3
commit 1d1b886
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 67 deletions.
diff --git a/db/360/SceDriverUser.yml b/db/360/SceDriverUser.yml
@@ -8,10 +8,10 @@ modules:
         kernel: false
         nid: 0x91AFEB43
         functions:
-          _sceDrmBridgeGetCurrentSecureTick: 0x7C994327
-          _sceDrmBridgeIsAllowRemotePlayDebug: 0x1F82FF68
-          _sceDrmBridgeMlnpsnlAuth1: 0x7D0DB83F
-          _sceDrmBridgeMlnpsnlAuth2: 0x6471937D
+          sceDrmBridgeGetCurrentSecureTick: 0x7C994327
+          sceDrmBridgeIsAllowRemotePlayDebug: 0x1F82FF68
+          sceDrmBridgeMlnpsnlAuth1: 0x7D0DB83F
+          sceDrmBridgeMlnpsnlAuth2: 0x6471937D
       SceErrorUser:
         kernel: false
         nid: 0xD401318D

diff --git a/db/360/SceVshBridge.yml b/db/360/SceVshBridge.yml
@@ -8,10 +8,10 @@ modules:
         kernel: false
         nid: 0xFF4CD67F
         functions:
-          sceDrmBridgeGetCurrentSecureTick: 0xFFB164E2
-          sceDrmBridgeIsAllowRemotePlayDebug: 0x1BBB62E9
-          sceDrmBridgeMlnpsnlAuth1: 0xE04F767B
-          sceDrmBridgeMlnpsnlAuth2: 0x6D483DFC
+          _sceDrmBridgeGetCurrentSecureTick: 0xFFB164E2
+          _sceDrmBridgeIsAllowRemotePlayDebug: 0x1BBB62E9
+          _sceDrmBridgeMlnpsnlAuth1: 0xE04F767B
+          _sceDrmBridgeMlnpsnlAuth2: 0x6D483DFC
       SceVshBridge:
         kernel: false
         nid: 0x35C5ACD4

diff --git a/include/psp2/appmgr.h b/include/psp2/appmgr.h
@@ -563,14 +563,13 @@ typedef struct SceAppMgrCoredumpState {
  *
  * @return 0 on success, < 0 on error.
  */
-int _sceAppMgrGetCoredumpStateForShell(SceAppMgrCoredumpState *state);
+int sceAppMgrGetCoredumpStateForShell(SceAppMgrCoredumpState *state);
 
 // missing structs
 typedef struct SceAppMgrDrmOpenParam SceAppMgrDrmOpenParam;
 typedef struct SceAppMgrAppInfo SceAppMgrAppInfo;
 
-SceInt32 __sceAppMgrGetAppState(SceAppMgrAppState *state, SceSize state_size, SceUInt32 build_version);
-SceInt32 _sceAppMgrDrmOpen(const SceAppMgrDrmOpenParam *param, SceSize *syscall_validity);
+SceInt32 sceAppMgrDrmOpen(const SceAppMgrDrmOpenParam *param);
 
 /**
  * Get AppInfo via syscall directly
@@ -581,8 +580,7 @@ SceInt32 _sceAppMgrDrmOpen(const SceAppMgrDrmOpenParam *param, SceSize *syscall_
  *
  * @return 0 on success, < 0 on error.
  */
-SceInt32 _sceAppMgrGetAppInfo(const char *unk, SceAppMgrAppState *state, SceUInt64 *syscall_validity);
-SceInt32 _sceAppMgrReceiveSystemEvent(SceAppMgrSystemEvent *system_event);
+SceInt32 sceAppMgrGetAppInfo(const char *unk, SceAppMgrAppState *state);
 
 #ifdef __cplusplus
 }

diff --git a/include/psp2/io/devctl.h b/include/psp2/io/devctl.h
@@ -65,9 +65,6 @@ int sceIoIoctl(SceUID fd, unsigned int cmd, void *indata, int inlen, void *outda
   */
 int sceIoIoctlAsync(SceUID fd, unsigned int cmd, void *indata, int inlen, void *outdata, int outlen);
 
-int _sceIoDevctl(const char *devname, int cmd, const void *arg, SceSize arglen);
-int _sceIoIoctl(SceUID fd, int cmd, const void *argp, SceSize arglen);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/psp2/io/dirent.h b/include/psp2/io/dirent.h
@@ -58,9 +58,6 @@ int sceIoDread(SceUID fd, SceIoDirent *dir);
   */
 int sceIoDclose(SceUID fd);
 
-SceUID _sceIoDopen(const char *dirname);
-int _sceIoDread(SceUID fd, SceIoDirent *buf);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/psp2/io/fcntl.h b/include/psp2/io/fcntl.h
@@ -291,35 +291,6 @@ int sceIoSetPriority(SceUID fd, int priority);
 int sceIoSetProcessDefaultPriority(int priority);
 int sceIoSetThreadDefaultPriority(int priority);
 
-typedef struct SceIoLseekSyscallArgs {
-	SceOff offset;
-	int whence;
-	int padding;
-} SceIoLseekSyscallArgs;
-
-SceOff _sceIoLseek(SceUID fd, SceIoLseekSyscallArgs *args);
-
-typedef struct SceIoPreadSyscallArgs {
-	void *buf;
-	SceSize nbyte;
-	SceOff offset;
-} SceIoPreadSyscallArgs;
-
-SceSSize _sceIoPread(SceUID fd, SceIoPreadSyscallArgs *args);
-
-typedef struct SceIoPwriteSyscallArgs {
-	const void *buf;
-	SceSize nbyte;
-	SceOff offset;
-} SceIoPwriteSyscallArgs;
-
-SceSSize _sceIoPwrite(SceUID fd, SceIoPwriteSyscallArgs *args);
-
-SceUID _sceIoOpen(const char *filename, int flag, SceIoMode mode, SceUInt64 *syscall_validity);
-int _sceIoSync(const char *devname, int flag, SceUInt64 *syscall_validity);
-int _sceIoRemove(const char *filename, SceUInt64 *syscall_validity);
-int _sceIoRename(const char *oldname, const char *newname, void *syscall_validity);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/psp2/io/stat.h b/include/psp2/io/stat.h
@@ -139,13 +139,6 @@ int sceIoChstat(const char *file, SceIoStat *stat, int bits);
   */
 int sceIoChstatByFd(SceUID fd, const SceIoStat *buf, unsigned int cbit);
 
-int _sceIoMkdir(const char *dirname, SceIoMode mode);
-int _sceIoRmdir(const char *dirname);
-int _sceIoChstat(const char *name, const SceIoStat *buf, unsigned int cbit);
-int _sceIoChstatByFd(SceUID fd, const SceIoStat *buf, unsigned int cbit);
-int _sceIoGetstat(const char *name, SceIoStat *buf);
-int _sceIoGetstatByFd(SceUID fd, SceIoStat *buf);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/psp2/kernel/processmgr.h b/include/psp2/kernel/processmgr.h
@@ -101,7 +101,6 @@ SceUInt64 sceKernelGetProcessTimeWide(void);
 
 SceUID sceKernelGetCurrentProcess(void);
 SceInt32 sceKernelGetRemoteProcessTime(SceUID processId, SceKernelSysClock *pClock);
-int _sceKernelExitProcessForUser(SceInt32 stat);
 
 SceUID sceKernelGetStderr(void);
 SceUID sceKernelGetStdin(void);

diff --git a/include/psp2/rtc.h b/include/psp2/rtc.h
@@ -305,16 +305,12 @@ int _sceRtcFormatRFC3339(char *datetime, const SceRtcTick *utc, int offset, SceU
  */
 int _sceRtcFormatRFC3339LocalTime(char *datetime, const SceRtcTick *utc, SceUInt64 *a3);
 
-int _sceRtcGetCurrentAdNetworkTick(SceRtcTick *tick);
-int _sceRtcGetCurrentClock(SceDateTime *time, int time_zone);
-int _sceRtcGetCurrentClockLocalTime(SceDateTime *time);
-int _sceRtcGetCurrentDebugNetworkTick(SceRtcTick *tick);
-int _sceRtcGetCurrentGpsTick(SceRtcTick *tick);
-int _sceRtcGetCurrentNetworkTick(SceRtcTick *tick);
-int _sceRtcGetCurrentRetainedNetworkTick(SceRtcTick *tick);
-int _sceRtcGetCurrentTick(SceRtcTick *tick);
-int _sceRtcGetLastAdjustedTick(SceRtcTick *tick);
-int _sceRtcGetLastReincarnatedTick(SceRtcTick *tick);
+int sceRtcGetCurrentAdNetworkTick(SceRtcTick *tick);
+int sceRtcGetCurrentDebugNetworkTick(SceRtcTick *tick);
+int sceRtcGetCurrentGpsTick(SceRtcTick *tick);
+int sceRtcGetCurrentRetainedNetworkTick(SceRtcTick *tick);
+int sceRtcGetLastAdjustedTick(SceRtcTick *tick);
+int sceRtcGetLastReincarnatedTick(SceRtcTick *tick);
 SceULong64 sceRtcGetAccumulativeTime(void);
 
 #ifdef __cplusplus

diff --git a/include/psp2/sblacmgr.h b/include/psp2/sblacmgr.h
@@ -13,7 +13,7 @@
 extern "C" {
 #endif
 
-int _sceSblACMgrIsGameProgram(void);
+SceInt32 sceSblACMgrIsGameProgram(SceBool *result);
 
 #ifdef __cplusplus
 }