Conform syscall names to syslibtrace

These names are guessed:

sceUsbdRegisterCallbackForUser
sceUsbdUnregisterCallbackForUser
sceSblUsVerifyPupAdditionalSignForUser

5 files changed, 67 insertions, 65 deletions

diff --git a/include/user/libsysmodule.h b/include/user/libsysmodule.h
index e7d7dc2..ad2fda0 100644
--- a/include/user/libsysmodule.h
+++ b/include/user/libsysmodule.h
@@ -112,7 +112,8 @@ int sceSysmoduleIsLoadedInternal(SceUInt32 id);
  *
  * @return 0 on success, <0 otherwise.
  */
-int sceSysmoduleLoadModuleInternalWithArg(SceUInt32 id, SceSize args, void *argp, void *unk);
+#define sceSysmoduleLoadModuleInternalWithArg _sceSysmoduleLoadModuleInternalWithArg
+int _sceSysmoduleLoadModuleInternalWithArg(SceUInt32 id, SceSize args, void *argp, void *unk);
 
 /**
  * Unload an internal module with custom arguments.
@@ -124,7 +125,8 @@ int sceSysmoduleLoadModuleInternalWithArg(SceUInt32 id, SceSize args, void *argp
  *
  * @return 0 on success, <0 otherwise.
  */
-int sceSysmoduleUnloadModuleInternalWithArg(SceUInt32 id, SceSize args, void *argp, void *unk);
+#define sceSysmoduleUnloadModuleInternalWithArg _sceSysmoduleUnloadModuleInternalWithArg
+int _sceSysmoduleUnloadModuleInternalWithArg(SceUInt32 id, SceSize args, void *argp, void *unk);
 
 #ifdef __cplusplus
 }
diff --git a/include/user/usbd.h b/include/user/usbd.h
index e066230..fa5a6d2 100644
--- a/include/user/usbd.h
+++ b/include/user/usbd.h
@@ -56,35 +56,35 @@ typedef struct SceUsbdReceiveEvent {
 	unsigned int transfer_id;
 } SceUsbdReceiveEvent; /* size = 0x1C */
 
-int sceUsbdInit(SceUID *uid);
-int sceUsbdEnd(SceUID uid);
-
-int sceUsbdRegisterCallback(SceUID cbid, int);
-int sceUsbdUnregisterCallback(SceUID cbid);
-
-int sceUsbdResetDevice(SceUID uid, unsigned int device_id);
-int sceUsbdAttach(SceUID uid, int, int, int);
-
-int sceUsbdGetDeviceList(SceUID uid, unsigned int num, SceUsbdDeviceInfo *info);
-int sceUsbdGetDescriptor(SceUID uid, unsigned int device_id, unsigned char *descriptor, unsigned int size);
-int sceUsbdGetDescriptorSize(SceUID uid, unsigned int device_id);
-int sceUsbdGetDeviceAddress(SceUID uid, unsigned int device_id, SceUsbdDeviceAddress *addr);
-int sceUsbdGetDeviceSpeed(SceUID uid, unsigned int device_id, unsigned int *speed);
-int sceUsbdGetTransferStatus(SceUID uid, unsigned char buff[0x10]);
-int sceUsbdGetIsochTransferStatus(SceUID uid, unsigned char buff[0x10]);
-
-int sceUsbdOpenDefaultPipe(SceUID uid, unsigned int device_id);
-int sceUsbdOpenPipe(SceUID uid, unsigned char unk[0x18]);
-int sceUsbdClosePipe(SceUID uid, unsigned int device_id);
-
-int sceUsbdTransferData(SceUID uid, SceUsbdTransferData *data);
-int sceUsbdIsochTransferData(SceUID uid, int unk, unsigned char buff[0x28]);
-int sceUsbdReceiveEvent(SceUID uid, SceUsbdReceiveEvent *event);
-
-int sceUsbdRegisterLdd(SceUID uid, const char str[0x100]);
-int sceUsbdUnregisterLdd(SceUID uid, const char str[0x100]);
-int sceUsbdRegisterCompositeLdd(SceUID uid, const char str[0x100]);
-int sceUsbdAttachCompositeLdd(SceUID, unsigned char unk[0x14]);
+int sceUsbdInitForUser(SceUID *uid);
+int sceUsbdEndForUser(SceUID uid);
+
+int sceUsbdRegisterCallbackForUser(SceUID cbid, int);
+int sceUsbdUnregisterCallbackForUser(SceUID cbid);
+
+int sceUsbdResetDeviceForUser(SceUID uid, unsigned int device_id);
+int sceUsbdAttachForUser(SceUID uid, int, int, int);
+
+int sceUsbdGetDeviceListForUser(SceUID uid, unsigned int num, SceUsbdDeviceInfo *info);
+int sceUsbdGetDescriptorForUser(SceUID uid, unsigned int device_id, unsigned char *descriptor, unsigned int size);
+int sceUsbdGetDescriptorSizeForUser(SceUID uid, unsigned int device_id);
+int sceUsbdGetDeviceLocationForUser(SceUID uid, unsigned int device_id, SceUsbdDeviceAddress *addr);
+int sceUsbdGetDeviceSpeedForUser(SceUID uid, unsigned int device_id, unsigned int *speed);
+int sceUsbdGetTransferStatusForUser(SceUID uid, unsigned char buff[0x10]);
+int sceUsbdGetIsochTransferStatusForUser(SceUID uid, unsigned char buff[0x10]);
+
+int sceUsbdOpenDefaultPipeForUser(SceUID uid, unsigned int device_id);
+int sceUsbdOpenPipeForUser(SceUID uid, unsigned char unk[0x18]);
+int sceUsbdClosePipeForUserForUser(SceUID uid, unsigned int device_id);
+
+int sceUsbdTransferDataForUser(SceUID uid, SceUsbdTransferData *data);
+int sceUsbdIsochTransferDataForUser(SceUID uid, int unk, unsigned char buff[0x28]);
+int sceUsbdReceiveEventForUser(SceUID uid, SceUsbdReceiveEvent *event);
+
+int sceUsbdRegisterLddForUser(SceUID uid, const char str[0x100]);
+int sceUsbdUnregisterLddForUser(SceUID uid, const char str[0x100]);
+int sceUsbdRegisterCompositeLddForUser(SceUID uid, const char str[0x100]);
+int sceUsbdAttachCompositeLddForUser(SceUID, unsigned char unk[0x14]);
 
 #ifdef __cplusplus
 }
diff --git a/nids/360/SceSblUpdateMgr.yml b/nids/360/SceSblUpdateMgr.yml
index eb778ea..4b860c9 100644
--- a/nids/360/SceSblUpdateMgr.yml
+++ b/nids/360/SceSblUpdateMgr.yml
@@ -5,12 +5,12 @@ modules:
       SceSblSsUpdateMgr:
         nid: 0x31406C49
         functions:
-          sceSblSsUpdateMgrGetBootMode: 0x8E834565
-          sceSblSsUpdateMgrGetSpkgInfo: 0x8E3EC2E1
-          sceSblSsUpdateMgrSendCommand: 0x1825D954
-          sceSblSsUpdateMgrSetBootMode: 0xC725E3F0
-          sceSblSsUpdateMgrVerifyPup: 0x6F5EDBF4
-          sceSblSsUpdateMgrVerifyPupAdditionalSign: 0xB19366CB
-          sceSblSsUpdateMgrVerifyPupHeader: 0x9BE17A06
-          sceSblSsUpdateMgrVerifyPupSegment: 0xD47FD33E
-          sceSblSsUpdateMgrVerifyPupWatermark: 0xC6CDEB8D
+          sceSblUsGetSpkgInfoForUser: 0x8E3EC2E1
+          sceSblUsGetUpdateModeForUser: 0x8E834565
+          sceSblUsPowerControlForUser: 0x1825D954
+          sceSblUsSetUpdateModeForUser: 0xC725E3F0
+          sceSblUsVerifyPupAdditionalSignForUser: 0xB19366CB
+          sceSblUsVerifyPupForUser: 0x6F5EDBF4
+          sceSblUsVerifyPupHeaderForUser: 0x9BE17A06
+          sceSblUsVerifyPupSegmentForUser: 0xD47FD33E
+          sceSblUsVerifyPupWatermarkForUser: 0xC6CDEB8D
diff --git a/nids/360/SceSysmodule.yml b/nids/360/SceSysmodule.yml
index 6340e67..0ab2137 100644
--- a/nids/360/SceSysmodule.yml
+++ b/nids/360/SceSysmodule.yml
@@ -5,11 +5,11 @@ modules:
       SceSysmodule:
         nid: 0x03FCF19D
         functions:
+          _sceSysmoduleLoadModuleInternalWithArg: 0xC3C26339
+          _sceSysmoduleUnloadModuleInternalWithArg: 0xA2F40C4C
           sceSysmoduleIsLoaded: 0x53099B7A
           sceSysmoduleIsLoadedInternal: 0x09A4AF1D
           sceSysmoduleLoadModule: 0x79A0160A
           sceSysmoduleLoadModuleInternal: 0x2399BF45
-          sceSysmoduleLoadModuleInternalWithArg: 0xC3C26339
           sceSysmoduleUnloadModule: 0x31D87805
           sceSysmoduleUnloadModuleInternal: 0xFF206B19
-          sceSysmoduleUnloadModuleInternalWithArg: 0xA2F40C4C
diff --git a/nids/360/SceUsbd.yml b/nids/360/SceUsbd.yml
index d9ea8ee..aed6c8c 100644
--- a/nids/360/SceUsbd.yml
+++ b/nids/360/SceUsbd.yml
@@ -17,26 +17,26 @@ modules:
       SceUsbdForUser:
         nid: 0xC3AEAB67
         functions:
-          sceUsbdAttach: 0xEACEAE86
-          sceUsbdAttachCompositeLdd: 0xCA8F2F59
-          sceUsbdClosePipe: 0xAA3AF5D5
-          sceUsbdEnd: 0x5736A150
-          sceUsbdGetDescriptor: 0xAE671F22
-          sceUsbdGetDescriptorSize: 0xB357AC81
-          sceUsbdGetDeviceAddress: 0xC54F9D11
-          sceUsbdGetDeviceList: 0x2DE0239E
-          sceUsbdGetDeviceSpeed: 0x6C5AACD0
-          sceUsbdGetIsochTransferStatus: 0xA0A2C826
-          sceUsbdGetTransferStatus: 0xCDF5B6E0
-          sceUsbdInit: 0x77D58B31
-          sceUsbdIsochTransferData: 0x594D82FD
-          sceUsbdOpenDefaultPipe: 0x4A26DDCC
-          sceUsbdOpenPipe: 0xF94521A6
-          sceUsbdReceiveEvent: 0x16FEE05D
-          sceUsbdRegisterCallback: 0x9A820167
-          sceUsbdRegisterCompositeLdd: 0x2A7C0263
-          sceUsbdRegisterLdd: 0x6AD28166
-          sceUsbdResetDevice: 0xDEB3BE59
-          sceUsbdTransferData: 0x716048C1
-          sceUsbdUnregisterCallback: 0x0585EA80
-          sceUsbdUnregisterLdd: 0x473692CC
+          sceUsbdAttachCompositeLddForUser: 0xCA8F2F59
+          sceUsbdAttachForUser: 0xEACEAE86
+          sceUsbdClosePipeForUser: 0xAA3AF5D5
+          sceUsbdEndForUser: 0x5736A150
+          sceUsbdGetDescriptorForUser: 0xAE671F22
+          sceUsbdGetDescriptorSizeForUser: 0xB357AC81
+          sceUsbdGetDeviceListForUser: 0x2DE0239E
+          sceUsbdGetDeviceLocationForUser: 0xC54F9D11
+          sceUsbdGetDeviceSpeedForUser: 0x6C5AACD0
+          sceUsbdGetIsochTransferStatusForUser: 0xA0A2C826
+          sceUsbdGetTransferStatusForUser: 0xCDF5B6E0
+          sceUsbdInitForUser: 0x77D58B31
+          sceUsbdIsochTransferDataForUser: 0x594D82FD
+          sceUsbdOpenDefaultPipeForUser: 0x4A26DDCC
+          sceUsbdOpenPipeForUser: 0xF94521A6
+          sceUsbdReceiveEventForUser: 0x16FEE05D
+          sceUsbdRegisterCallbackForUser: 0x9A820167
+          sceUsbdRegisterCompositeLddForUser: 0x2A7C0263
+          sceUsbdRegisterLddForUser: 0x6AD28166
+          sceUsbdResetDeviceForUser: 0xDEB3BE59
+          sceUsbdTransferDataForUser: 0x716048C1
+          sceUsbdUnregisterCallbackForUser: 0x0585EA80
+          sceUsbdUnregisterLddForUser: 0x473692CC