From a3095155bce0f3d44dbf64a8f8e579105d29d7e0 Mon Sep 17 00:00:00 2001 From: Davee Date: Sun, 20 Nov 2016 16:02:42 +0000 Subject: [PATCH 1/4] begin kernel renaming. remove all ```ForDriver``` and ```ForKernel``` suffix and prefix every kernel function with ```ksce``` instead of ```sce```. Related issue #80 --- db.json | 308 +++++++++++++-------------- include/psp2kern/io/fcntl.h | 68 +++--- include/psp2kern/kernel/cpu.h | 20 +- include/psp2kern/kernel/modulemgr.h | 38 ++-- include/psp2kern/kernel/processmgr.h | 2 +- include/psp2kern/kernel/sysmem.h | 54 ++--- include/psp2kern/kernel/threadmgr.h | 230 ++++++++++---------- include/psp2kern/net/net.h | 38 ++-- include/psp2kern/sblacmgr.h | 8 +- include/psp2kern/usbserial.h | 14 +- 10 files changed, 390 insertions(+), 390 deletions(-) diff --git a/db.json b/db.json index 7ff8baef5..07a51a8df 100644 --- a/db.json +++ b/db.json @@ -595,46 +595,46 @@ }, "SceBtForDriver": { "functions": { - "sceBtSetContentProtectionForDriver": 140714118, - "sceBtSetL2capEchoResponseBufferForTestForDriver": 192777742, - "sceBtRegisterCallbackForDriver": 302694903, - "sceBtSetInquiryResultForTestForDriver": 472316024, - "sceBtPushOppForDriver": 566724834, - "sceBtGetInfoForTestForDriver": 748541883, - "sceBtSendAudioForDriver": 1207015207, - "sceBtSetInquiryScanForDriver": 1331332398, - "sceBtStartDisconnectForDriver": 1349583489, - "sceBtReadEventForDriver": 1522244253, - "sceBtStartConnectForDriver": 1616449850, - "sceBtGetDeviceNameForDriverh": 1665103948, - "sceBtStopInquiryForDriver": 1780323736, - "sceBtHfpRequestForDriver": 1850331421, - "sceBtAvrcpSendVolumeForDriver": 1988745789, - "sceBtHfpGetCurrentPhoneNumberForDriver": 2076601709, - "sceBtPushBipForDriver": 2146924434, - "sceBtRecvOppForDriver": 2148051500, - "sceBtGetStatusForTestForDriver": 2205685321, - "sceBtStartAudioForDriver": 2370292413, - "sceBtAvrcpSetTitleForDriver": 2448381357, - "sceBtSendSppForDriver": 2451840507, - "sceBtGetConfigurationForDriver": 2496031291, - "sceBtSetStatusForTestForDriver": 2618905617, - "sceBtStartInquiryForDriver": 2647123941, - "sceBtGetLastErrorForDriver": 2905711678, - "sceBtReplyUserConfirmationForDriver": 3053070620, - "sceBtReplyPinCodeForDriver": 3144263210, - "sceBtUnregisterCallbackForDriver": 3211977150, - "sceBtRecvSppForDriver": 3231555196, - "sceBtAvrcpReadVolumeForDriver": 3385262166, - "sceBtStopAudioForDriver": 3404048883, - "sceBtRecvAudioForDriver": 3447456914, - "sceBtFreqAudioForDriver": 3659586760, - "sceBtSendL2capEchoRequestForTestForDriver": 3819333652, - "sceBtDeleteRegisteredInfoForDriver": 3874904544, - "sceBtRecvBipForDriver": 3907606903, - "sceBtSetConfigurationForDriver": 3957115282, - "sceBtAvrcpSendButtonForDriver": 3965682969, - "sceBtGetRegisteredInfoForDriver": 4167902690 + "ksceBtSetContentProtection": 140714118, + "ksceBtSetL2capEchoResponseBufferForTest": 192777742, + "ksceBtRegisterCallback": 302694903, + "ksceBtSetInquiryResultForTest": 472316024, + "ksceBtPushOpp": 566724834, + "ksceBtGetInfoForTest": 748541883, + "ksceBtSendAudio": 1207015207, + "ksceBtSetInquiryScan": 1331332398, + "ksceBtStartDisconnect": 1349583489, + "ksceBtReadEvent": 1522244253, + "ksceBtStartConnect": 1616449850, + "ksceBtGetDeviceNameh": 1665103948, + "ksceBtStopInquiry": 1780323736, + "ksceBtHfpRequest": 1850331421, + "ksceBtAvrcpSendVolume": 1988745789, + "ksceBtHfpGetCurrentPhoneNumber": 2076601709, + "ksceBtPushBip": 2146924434, + "ksceBtRecvOpp": 2148051500, + "ksceBtGetStatusForTest": 2205685321, + "ksceBtStartAudio": 2370292413, + "ksceBtAvrcpSetTitle": 2448381357, + "ksceBtSendSpp": 2451840507, + "ksceBtGetConfiguration": 2496031291, + "ksceBtSetStatusForTest": 2618905617, + "ksceBtStartInquiry": 2647123941, + "ksceBtGetLastError": 2905711678, + "ksceBtReplyUserConfirmation": 3053070620, + "ksceBtReplyPinCode": 3144263210, + "ksceBtUnregisterCallback": 3211977150, + "ksceBtRecvSpp": 3231555196, + "ksceBtAvrcpReadVolume": 3385262166, + "ksceBtStopAudio": 3404048883, + "ksceBtRecvAudio": 3447456914, + "ksceBtFreqAudio": 3659586760, + "ksceBtSendL2capEchoRequestForTest": 3819333652, + "ksceBtDeleteRegisteredInfo": 3874904544, + "ksceBtRecvBip": 3907606903, + "ksceBtSetConfiguration": 3957115282, + "ksceBtAvrcpSendButton": 3965682969, + "ksceBtGetRegisteredInfo": 4167902690 }, "kernel": true, "nid": 3565987373 @@ -1779,42 +1779,42 @@ "nid": 1864753546, "variables": {}, "functions": { - "sceKernelMemcpyKernelToUser": 1837690762, - "sceKernelMemcpyUserToKernel": 3164170874, - "sceKernelStrncpyKernelToUser": 2159898603, - "sceKernelStrncpyUserToKernel": 3678323268, - "sceKernelStrlenUser": 3022640153, - "sceKernelGetPaddr": 2367032933, - "sceKernelGetPaddrList": 3867930301, - "sceKernelGetMemBlockBaseForDriver": 2822893018, - "sceKernelFindMemBlockByAddrForDriver": 2316780278, - "sceKernelRemapBlock": 3756181707, - "sceKernelMemPoolCreate": 2468929768, - "sceKernelMemPoolDestroy": 3594745399, - "sceKernelMemPoolAlloc": 2068624906, - "sceKernelMemPoolFree": 1052566339, - "sceKernelMapUserBlock": 2102365023, - "sceKernelSwitchVmaForPid": 1865076142, - "sceKernelRoMemcpyKernelToUserForPid": 1461528377, - "sceKernelFirstDifferentIntUserForPid": 2201240911, - "sceKernelStrnlenUserForPid": 2569661191, - "sceKernelStrncpyUserForPid": 1974137208, - "sceKernelMemcpyKernelToUserForPidUnchecked": 4275580717, - "sceKernelMemcpyKernelToUserForPid": 1803703417, - "sceKernelMemcpyUserToKernelForPid": 1616016888, - "sceKernelMemcpyUserToUserForPid": 2382916659, - "sceKernelKernelUidForUserUid": 1171400087, - "sceKernelCreateUserUid": 3206584409, - "sceKernelGetObjForUid": 15559700, - "sceKernelGetUidClass": 2234739228, - "sceKernelCreateClass": 1630630146, - "sceKernelDeleteUid": 75313906, - "sceKernelDeleteUserUid": 2225385310, - "sceKernelAllocMemBlockForKernel": 3376959689, - "sceKernelGetMemBlockBaseForKernel": 2822893018, - "sceKernelFreeMemBlockForKernel": 10361953, - "sceKernelGetPidContext": 785348932, - "sceKernelMapBlockUserVisible": 1490163526 + "ksceKernelMemcpyKernelToUser": 1837690762, + "ksceKernelMemcpyUserToKernel": 3164170874, + "ksceKernelStrncpyKernelToUser": 2159898603, + "ksceKernelStrncpyUserToKernel": 3678323268, + "ksceKernelStrlenUser": 3022640153, + "ksceKernelGetPaddr": 2367032933, + "ksceKernelGetPaddrList": 3867930301, + "ksceKernelGetMemBlockBase": 2822893018, + "ksceKernelFindMemBlockByAddr": 2316780278, + "ksceKernelRemapBlock": 3756181707, + "ksceKernelMemPoolCreate": 2468929768, + "ksceKernelMemPoolDestroy": 3594745399, + "ksceKernelMemPoolAlloc": 2068624906, + "ksceKernelMemPoolFree": 1052566339, + "ksceKernelMapUserBlock": 2102365023, + "ksceKernelSwitchVmaForPid": 1865076142, + "ksceKernelRoMemcpyKernelToUserForPid": 1461528377, + "ksceKernelFirstDifferentIntUserForPid": 2201240911, + "ksceKernelStrnlenUserForPid": 2569661191, + "ksceKernelStrncpyUserForPid": 1974137208, + "ksceKernelMemcpyKernelToUserForPidUnchecked": 4275580717, + "ksceKernelMemcpyKernelToUserForPid": 1803703417, + "ksceKernelMemcpyUserToKernelForPid": 1616016888, + "ksceKernelMemcpyUserToUserForPid": 2382916659, + "ksceKernelKernelUidForUserUid": 1171400087, + "ksceKernelCreateUserUid": 3206584409, + "ksceKernelGetObjForUid": 15559700, + "ksceKernelGetUidClass": 2234739228, + "ksceKernelCreateClass": 1630630146, + "ksceKernelDeleteUid": 75313906, + "ksceKernelDeleteUserUid": 2225385310, + "ksceKernelAllocMemBlock": 3376959689, + "ksceKernelGetMemBlockBase": 2822893018, + "ksceKernelFreeMemBlock": 10361953, + "ksceKernelGetPidContext": 785348932, + "ksceKernelMapBlockUserVisible": 1490163526 } }, "SceSysmemForKernel": { @@ -1822,8 +1822,8 @@ "nid": 1671764453, "variables": {}, "functions": { - "sceKernelCreateUidObj": 3741485271, - "sceKernelRxMemcpyKernelToUserForPid": 814945650 + "ksceKernelCreateUidObj": 3741485271, + "ksceKernelRxMemcpyKernelToUserForPid": 814945650 } }, "SceSysclibForDriver": { @@ -1842,7 +1842,7 @@ "strncat": 2714878764, "strtol": 2876753322, "snprintf": 2927266177, - "sceKernelStackCheckFail": 3113699645, + "ksceKernelStackCheckFail": 3113699645, "strnlen": 3444299908, "strlen": 3485903276, "memcmp": 4181321789 @@ -1853,11 +1853,11 @@ "nid": 1421814699, "variables": {}, "functions": { - "sceKernelCpuSaveContext": 555452890, - "sceKernelCpuRestoreContext": 172953529, - "sceKernelCpuIcacheAndL2Flush": 435256272, - "sceKernelCpuUnrestrictedMemcpy": 2355641836, - "sceKernelCpuDcacheFlush": 1805837596 + "ksceKernelCpuSaveContext": 555452890, + "ksceKernelCpuRestoreContext": 172953529, + "ksceKernelCpuIcacheAndL2Flush": 435256272, + "ksceKernelCpuUnrestrictedMemcpy": 2355641836, + "ksceKernelCpuDcacheFlush": 1805837596 } }, "SceCpuForDriver": { @@ -1865,10 +1865,10 @@ "nid": 1089264398, "variables": {}, "functions": { - "sceKernelCpuDisableInterrupts": 2183119086, - "sceKernelCpuEnableInterrupts": 4122661947, - "sceKernelCpuDcacheAndL2AndDMAFlush": 911108260, - "sceKernelCpuDcacheAndL2Flush": 2629431502 + "ksceKernelCpuDisableInterrupts": 2183119086, + "ksceKernelCpuEnableInterrupts": 4122661947, + "ksceKernelCpuDcacheAndL2AndDMAFlush": 911108260, + "ksceKernelCpuDcacheAndL2Flush": 2629431502 } }, "SceSysrootForKernel": { @@ -1876,8 +1876,8 @@ "nid": 915528261, "variables": {}, "functions": { - "sceKernelGetSysrootBuffer": 1044731970, - "sceKernelGetProcessTitleIdForKernel": 3962643619 + "ksceKernelGetSysrootBuffer": 1044731970, + "ksceKernelGetProcessTitleId": 3962643619 } }, "SceSysmem": { @@ -1912,11 +1912,11 @@ "nid": 2831814397, "variables": {}, "functions": { - "sceKernelCreateMutexForKernel": 4222222958, - "sceKernelDeleteMutexForKernel": 177283904, - "sceKernelLockMutexForKernel": 380403909, - "sceKernelUnlockMutexForKernel": 511894992, - "sceKernelRunWithStack": 3847214918 + "ksceKernelCreateMutex": 4222222958, + "ksceKernelDeleteMutex": 177283904, + "ksceKernelLockMutex": 380403909, + "ksceKernelUnlockMutex": 511894992, + "ksceKernelRunWithStack": 3847214918 } }, "SceThreadmgrForDriver": { @@ -1924,14 +1924,14 @@ "nid": 3804497444, "variables": {}, "functions": { - "sceKernelGetProcessId": 2647346042, - "sceKernelGetSystemTimeWideForDriver": 4109258665, - "sceKernelWaitThreadEndForKernel": 1042293103, - "sceKernelCreateThreadForKernel": 3328659069, - "sceKernelDeleteThreadForKernel": 2894286655, - "sceKernelStartThreadForKernel": 569721243, - "sceKernelCreateCallbackForDriver": 474046796, - "sceKernelDeleteCallbackForDriver": 981342198 + "ksceKernelGetProcessId": 2647346042, + "ksceKernelGetSystemTimeWide": 4109258665, + "ksceKernelWaitThreadEnd": 1042293103, + "ksceKernelCreateThread": 3328659069, + "ksceKernelDeleteThread": 2894286655, + "ksceKernelStartThread": 569721243, + "ksceKernelCreateCallback": 474046796, + "ksceKernelDeleteCallback": 981342198 } }, "SceThreadmgr": { @@ -2055,12 +2055,12 @@ "nid": 3292920419, "variables": {}, "functions": { - "sceKernelGetModuleListForKernel": 2546957134, - "sceKernelGetModuleInternal": 4264573027, - "sceKernelGetModuleInfoForKernel": 3530160405, - "sceKernelLoadModuleForPid": 4196522187, - "sceKernelStopModuleForPid": 2075446868, - "sceKernelUnloadModuleForPid": 1500701388 + "ksceKernelGetModuleList": 2546957134, + "ksceKernelGetModuleInternal": 4264573027, + "ksceKernelGetModuleInfo": 3530160405, + "ksceKernelLoadModuleForPid": 4196522187, + "ksceKernelStopModuleForPid": 2075446868, + "ksceKernelUnloadModuleForPid": 1500701388 } }, "SceModulemgrForDriver": { @@ -2068,16 +2068,16 @@ "nid": 3567651410, "variables": {}, "functions": { - "sceKernelGetSystemSwVersion": 1367532050, - "sceKernelLoadStartModuleForDriver": 412875707, - "sceKernelLoadModuleForDriver": 2262357556, - "sceKernelStartModuleForDriver": 108377730, - "sceKernelStopModuleForDriver": 269332153, - "sceKernelStopUnloadModuleForDriver": 62065534, - "sceKernelUnloadModuleForDriver": 1921938086, - "sceKernelLoadStartSharedModuleForPid": 3803049869, - "sceKernelLoadStartModuleForPid": 2643803170, - "sceKernelStopUnloadModuleForPid": 1235480007 + "ksceKernelGetSystemSwVersion": 1367532050, + "ksceKernelLoadStartModule": 412875707, + "ksceKernelLoadModule": 2262357556, + "ksceKernelStartModule": 108377730, + "ksceKernelStopModule": 269332153, + "ksceKernelStopUnloadModule": 62065534, + "ksceKernelUnloadModule": 1921938086, + "ksceKernelLoadStartSharedModuleForPid": 3803049869, + "ksceKernelLoadStartModuleForPid": 2643803170, + "ksceKernelStopUnloadModuleForPid": 1235480007 } }, "SceModulemgr": { @@ -2101,17 +2101,17 @@ "nid": 1090333127, "variables": {}, "functions": { - "sceIoDreadForDriver": 550461383, - "sceIoWriteForDriver": 569283056, - "sceIoDopenForDriver": 1178281420, - "sceIoLseekForDriver": 1644758145, - "sceIoOpenForDriver": 1964583282, - "sceIoChstatForDriver": 2101524700, - "sceIoGetstatForDriver": 1976134949, - "sceIoMkdirForDriver": 2138114853, - "sceIoReadForDriver": 3783195651, - "sceIoCloseForDriver": 4187871395, - "sceIoRenameForDriver": 3691792791 + "ksceIoDread": 550461383, + "ksceIoWrite": 569283056, + "ksceIoDopen": 1178281420, + "ksceIoLseek": 1644758145, + "ksceIoOpen": 1964583282, + "ksceIoChstat": 2101524700, + "ksceIoGetstat": 1976134949, + "ksceIoMkdir": 2138114853, + "ksceIoRead": 3783195651, + "ksceIoClose": 4187871395, + "ksceIoRename": 3691792791 } }, "SceIofilemgr": { @@ -2172,10 +2172,10 @@ }, "SceProcessmgrForKernel": { "kernel": true, - "nid": 2053758598, + "nid": 2053758598, "variables": {}, "functions": { - "sceKernelGetProcessKernelBuf": 3118891154 + "ksceKernelGetProcessKernelBuf": 3118891154 } } } @@ -3382,16 +3382,16 @@ "nid": 2997209376, "variables": {}, "functions": { - "sceNetSocketForDriver": 3952455716, - "sceNetAcceptForDriver": 2282378275, - "sceNetBindForDriver": 2225825039, - "sceNetListenForDriver": 135035282, - "sceNetRecvForDriver": 1236362908, - "sceNetRecvfromForDriver": 1236362908, - "sceNetSendForDriver": 2876532532, - "sceNetSendtoForDriver": 2876532532, - "sceNetSetsockoptForDriver": 1274411700, - "sceNetSocketCloseForDriver": 569655949 + "ksceNetSocket": 3952455716, + "ksceNetAccept": 2282378275, + "ksceNetBind": 2225825039, + "ksceNetListen": 135035282, + "ksceNetRecv": 1236362908, + "ksceNetRecvfrom": 1236362908, + "ksceNetSend": 2876532532, + "ksceNetSendto": 2876532532, + "ksceNetSetsockopt": 1274411700, + "ksceNetSocketClose": 569655949 } } } @@ -5632,7 +5632,7 @@ "nid": 1642676877, "variables": {}, "functions": { - "sceKernelGetRandomNumberForDriver": 1335622629 + "ksceKernelGetRandomNumber": 1335622629 } } } @@ -5645,10 +5645,10 @@ "nid": 2597904915, "variables": {}, "functions": { - "sceSblACMgrIsShell": 2249372227, - "sceSblACMgrIsGameProgram": 312002119, - "sceSblACMgrIsNonGameProgram": 1817882751, - "sceSblACMgrIsDevelopmentMode": 3900512119 + "ksceSblACMgrIsShell": 2249372227, + "ksceSblACMgrIsGameProgram": 312002119, + "ksceSblACMgrIsNonGameProgram": 1817882751, + "ksceSblACMgrIsDevelopmentMode": 3900512119 } } } @@ -5661,13 +5661,13 @@ "nid": 2284438259, "variables": {}, "functions":{ - "sceUsbSerialStartForKernel": 4276614330, - "sceUsbSerialSetupForKernel": 1493929879, - "sceUsbSerialStatusForKernel": 2353162502, - "sceUsbSerialCloseForKernel": 3870418511, - "sceUsbSerialGetRecvBufferSizeForKernel": 4113675694, - "sceUsbSerialSendForKernel": 204370880, - "sceUsbSerialRecvForKernel": 1801333103 + "ksceUsbSerialStart": 4276614330, + "ksceUsbSerialSetup": 1493929879, + "ksceUsbSerialStatus": 2353162502, + "ksceUsbSerialClose": 3870418511, + "ksceUsbSerialGetRecvBufferSize": 4113675694, + "ksceUsbSerialSend": 204370880, + "ksceUsbSerialRecv": 1801333103 } }, "SceUsbSerial": { diff --git a/include/psp2kern/io/fcntl.h b/include/psp2kern/io/fcntl.h index fa8d2075a..9a45b94b8 100644 --- a/include/psp2kern/io/fcntl.h +++ b/include/psp2kern/io/fcntl.h @@ -23,7 +23,7 @@ extern "C" { #endif -/* Note: Not all of these sceIoOpen() flags are not compatible with the +/* Note: Not all of these ksceIoOpen() flags are not compatible with the open() flags found in sys/unistd.h. */ enum { SCE_O_RDONLY = 0x0001, @@ -49,13 +49,13 @@ enum { * * @par Example1: Open a file for reading * @code - * if(!(fd = sceIoOpen("device:/path/to/file", SCE_O_RDONLY, 0777)) { + * if(!(fd = ksceIoOpen("device:/path/to/file", SCE_O_RDONLY, 0777)) { * // error * } * @endcode * @par Example2: Open a file for writing, creating it if it doesnt exist * @code - * if(!(fd = sceIoOpen("device:/path/to/file", SCE_O_WRONLY|SCE_O_CREAT, 0777)) { + * if(!(fd = ksceIoOpen("device:/path/to/file", SCE_O_WRONLY|SCE_O_CREAT, 0777)) { * // error * } * @endcode @@ -65,7 +65,7 @@ enum { * @param mode - File access mode. * @return A non-negative integer is a valid fd, anything else an error */ -SceUID sceIoOpenForDriver(const char *file, int flags, SceMode mode); +SceUID ksceIoOpen(const char *file, int flags, SceMode mode); /** * Open or create a file for reading or writing (asynchronous) @@ -75,19 +75,19 @@ SceUID sceIoOpenForDriver(const char *file, int flags, SceMode mode); * @param mode - File access mode. * @return A non-negative integer is a valid fd, anything else an error */ -SceUID sceIoOpenAsyncForDriver(const char *file, int flags, SceMode mode); +SceUID ksceIoOpenAsync(const char *file, int flags, SceMode mode); /** * Delete a descriptor * * @code - * sceIoClose(fd); + * ksceIoClose(fd); * @endcode * * @param fd - File descriptor to close * @return < 0 on error */ -int sceIoCloseForDriver(SceUID fd); +int ksceIoClose(SceUID fd); /** * Delete a descriptor (asynchronous) @@ -95,14 +95,14 @@ int sceIoCloseForDriver(SceUID fd); * @param fd - File descriptor to close * @return < 0 on error */ -int sceIoCloseAsyncForDriver(SceUID fd); +int ksceIoCloseAsync(SceUID fd); /** * Read input * * @par Example: * @code - * bytes_read = sceIoRead(fd, data, 100); + * bytes_read = ksceIoRead(fd, data, 100); * @endcode * * @param fd - Opened file descriptor to read from @@ -111,14 +111,14 @@ int sceIoCloseAsyncForDriver(SceUID fd); * * @return The number of bytes read */ -int sceIoReadForDriver(SceUID fd, void *data, SceSize size); +int ksceIoRead(SceUID fd, void *data, SceSize size); /** * Read input (asynchronous) * * @par Example: * @code - * bytes_read = sceIoRead(fd, data, 100); + * bytes_read = ksceIoRead(fd, data, 100); * @endcode * * @param fd - Opened file descriptor to read from @@ -127,14 +127,14 @@ int sceIoReadForDriver(SceUID fd, void *data, SceSize size); * * @return < 0 on error. */ -int sceIoReadAsyncForDriver(SceUID fd, void *data, SceSize size); +int ksceIoReadAsync(SceUID fd, void *data, SceSize size); /** * Write output * * @par Example: * @code - * bytes_written = sceIoWrite(fd, data, 100); + * bytes_written = ksceIoWrite(fd, data, 100); * @endcode * * @param fd - Opened file descriptor to write to @@ -143,7 +143,7 @@ int sceIoReadAsyncForDriver(SceUID fd, void *data, SceSize size); * * @return The number of bytes written */ -int sceIoWriteForDriver(SceUID fd, const void *data, SceSize size); +int ksceIoWrite(SceUID fd, const void *data, SceSize size); /** * Write output (asynchronous) @@ -154,14 +154,14 @@ int sceIoWriteForDriver(SceUID fd, const void *data, SceSize size); * * @return < 0 on error. */ -int sceIoWriteAsyncForDriver(SceUID fd, const void *data, SceSize size); +int ksceIoWriteAsync(SceUID fd, const void *data, SceSize size); /** * Reposition read/write file descriptor offset * * @par Example: * @code - * pos = sceIoLseek(fd, -10, SEEK_END); + * pos = ksceIoLseek(fd, -10, SEEK_END); * @endcode * * @param fd - Opened file descriptor with which to seek @@ -171,7 +171,7 @@ int sceIoWriteAsyncForDriver(SceUID fd, const void *data, SceSize size); * * @return The position in the file after the seek. */ -SceOff sceIoLseekForDriver(SceUID fd, SceOff offset, int whence); +SceOff ksceIoLseek(SceUID fd, SceOff offset, int whence); /** * Reposition read/write file descriptor offset (asynchronous) @@ -181,16 +181,16 @@ SceOff sceIoLseekForDriver(SceUID fd, SceOff offset, int whence); * @param whence - Set to SEEK_SET to seek from the start of the file, SEEK_CUR * seek from the current position and SEEK_END to seek from the end. * - * @return < 0 on error. Actual value should be passed returned by the ::sceIoWaitAsync call. + * @return < 0 on error. Actual value should be passed returned by the ::ksceIoWaitAsync call. */ -int sceIoLseekAsyncForDriver(SceUID fd, SceOff offset, int whence); +int ksceIoLseekAsync(SceUID fd, SceOff offset, int whence); /** * Reposition read/write file descriptor offset (32bit mode) * * @par Example: * @code - * pos = sceIoLseek32(fd, -10, SEEK_END); + * pos = ksceIoLseek32(fd, -10, SEEK_END); * @endcode * * @param fd - Opened file descriptor with which to seek @@ -200,7 +200,7 @@ int sceIoLseekAsyncForDriver(SceUID fd, SceOff offset, int whence); * * @return The position in the file after the seek. */ -int sceIoLseek32ForDriver(SceUID fd, int offset, int whence); +int ksceIoLseek32(SceUID fd, int offset, int whence); /** * Reposition read/write file descriptor offset (32bit mode, asynchronous) @@ -212,7 +212,7 @@ int sceIoLseek32ForDriver(SceUID fd, int offset, int whence); * * @return < 0 on error. */ -int sceIoLseek32AsyncForDriver(SceUID fd, int offset, int whence); +int ksceIoLseek32Async(SceUID fd, int offset, int whence); /** * Remove directory entry @@ -220,7 +220,7 @@ int sceIoLseek32AsyncForDriver(SceUID fd, int offset, int whence); * @param file - Path to the file to remove * @return < 0 on error */ -int sceIoRemoveForDriver(const char *file); +int ksceIoRemove(const char *file); /** * Change the name of a file @@ -229,7 +229,7 @@ int sceIoRemoveForDriver(const char *file); * @param newname - The new filename * @return < 0 on error. */ -int sceIoRenameForDriver(const char *oldname, const char *newname); +int ksceIoRename(const char *oldname, const char *newname); /** * Synchronise the file data on the device. @@ -237,7 +237,7 @@ int sceIoRenameForDriver(const char *oldname, const char *newname); * @param device - The device to synchronise (e.g. msfat0:) * @param unk - Unknown */ -int sceIoSyncForDriver(const char *device, unsigned int unk); +int ksceIoSync(const char *device, unsigned int unk); /** * Synchronize the file data for one file @@ -246,7 +246,7 @@ int sceIoSyncForDriver(const char *device, unsigned int unk); * * @return < 0 on error. */ -int sceIoSyncByFdForDriver(SceUID fd); +int ksceIoSyncByFd(SceUID fd); /** * Wait for asyncronous completion. @@ -256,7 +256,7 @@ int sceIoSyncByFdForDriver(SceUID fd); * * @return < 0 on error. */ -int sceIoWaitAsyncForDriver(SceUID fd, SceInt64 *res); +int ksceIoWaitAsync(SceUID fd, SceInt64 *res); /** * Wait for asyncronous completion (with callbacks). @@ -266,7 +266,7 @@ int sceIoWaitAsyncForDriver(SceUID fd, SceInt64 *res); * * @return < 0 on error. */ -int sceIoWaitAsyncCBForDriver(SceUID fd, SceInt64 *res); +int ksceIoWaitAsyncCB(SceUID fd, SceInt64 *res); /** * Poll for asyncronous completion. @@ -276,7 +276,7 @@ int sceIoWaitAsyncCBForDriver(SceUID fd, SceInt64 *res); * * @return < 0 on error. */ -int sceIoPollAsyncForDriver(SceUID fd, SceInt64 *res); +int ksceIoPollAsync(SceUID fd, SceInt64 *res); /** * Get the asyncronous completion status. @@ -287,7 +287,7 @@ int sceIoPollAsyncForDriver(SceUID fd, SceInt64 *res); * * @return < 0 on error. */ -int sceIoGetAsyncStatForDriver(SceUID fd, int poll, SceInt64 *res); +int ksceIoGetAsyncStat(SceUID fd, int poll, SceInt64 *res); /** * Cancel an asynchronous operation on a file descriptor. @@ -296,7 +296,7 @@ int sceIoGetAsyncStatForDriver(SceUID fd, int poll, SceInt64 *res); * * @return < 0 on error. */ -int sceIoCancelForDriver(SceUID fd); +int ksceIoCancel(SceUID fd); /** * Get the device type of the currently opened file descriptor. @@ -305,7 +305,7 @@ int sceIoCancelForDriver(SceUID fd); * * @return < 0 on error. Otherwise the device type? */ -int sceIoGetDevTypeForDriver(SceUID fd); +int ksceIoGetDevType(SceUID fd); /** * Change the priority of the asynchronous thread. @@ -315,7 +315,7 @@ int sceIoGetDevTypeForDriver(SceUID fd); * * @return < 0 on error. */ -int sceIoChangeAsyncPriorityForDriver(SceUID fd, int pri); +int ksceIoChangeAsyncPriority(SceUID fd, int pri); /** * Sets a callback for the asynchronous action. @@ -326,7 +326,7 @@ int sceIoChangeAsyncPriorityForDriver(SceUID fd, int pri); * * @return < 0 on error. */ -int sceIoSetAsyncCallbackForDriver(SceUID fd, SceUID cb, void *argp); +int ksceIoSetAsyncCallback(SceUID fd, SceUID cb, void *argp); #ifdef __cplusplus } diff --git a/include/psp2kern/kernel/cpu.h b/include/psp2kern/kernel/cpu.h index 173377eb1..5dc56e758 100644 --- a/include/psp2kern/kernel/cpu.h +++ b/include/psp2kern/kernel/cpu.h @@ -47,7 +47,7 @@ extern "C" { * * @param context The context */ -static inline void sceKernelCpuSaveContext(int context[3]) { +static inline void ksceKernelCpuSaveContext(int context[3]) { asm ("mrc p15, 0, %0, c2, c0, 1" : "=r" (context[0])); asm ("mrc p15, 0, %0, c3, c0, 0" : "=r" (context[1])); asm ("mrc p15, 0, %0, c13, c0, 1" : "=r" (context[2])); @@ -56,9 +56,9 @@ static inline void sceKernelCpuSaveContext(int context[3]) { /** * @brief Restore process context * - * @param context The context, can be from `sceKernelGetPidContext` + * @param context The context, can be from `ksceKernelGetPidContext` */ -static inline void sceKernelCpuRestoreContext(int context[3]) { +static inline void ksceKernelCpuRestoreContext(int context[3]) { int cpsr; int tmp; @@ -84,7 +84,7 @@ static inline void sceKernelCpuRestoreContext(int context[3]) { * * @return Interrupt masks before disabling */ -int sceKernelCpuDisableInterrupts(void); +int ksceKernelCpuDisableInterrupts(void); /** * @brief Enable interrupts @@ -93,7 +93,7 @@ int sceKernelCpuDisableInterrupts(void); * * @return Zero on success */ -int sceKernelCpuEnableInterrupts(int flags); +int ksceKernelCpuEnableInterrupts(int flags); /** * @brief Flush L1 dcache and L2 @@ -105,7 +105,7 @@ int sceKernelCpuEnableInterrupts(int flags); * * @return Zero on success */ -int sceKernelCpuDcacheAndL2Flush(void *ptr, size_t len); +int ksceKernelCpuDcacheAndL2Flush(void *ptr, size_t len); /** * @brief Flush L2 dcache without L2 @@ -115,7 +115,7 @@ int sceKernelCpuDcacheAndL2Flush(void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuDcacheFlush(void *ptr, size_t len); +int ksceKernelCpuDcacheFlush(void *ptr, size_t len); /** * @brief Flush L1 icache and L2 @@ -125,7 +125,7 @@ int sceKernelCpuDcacheFlush(void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuIcacheAndL2Flush(void *ptr, size_t len); +int ksceKernelCpuIcacheAndL2Flush(void *ptr, size_t len); /** * @brief Flush L1 dcache and L2 for DMA operations @@ -135,7 +135,7 @@ int sceKernelCpuIcacheAndL2Flush(void *ptr, size_t len); * * @return Zero on success */ -int sceKernelCpuDcacheAndL2AndDMAFlush(void *ptr, size_t len); +int ksceKernelCpuDcacheAndL2AndDMAFlush(void *ptr, size_t len); /** * @brief MMU permission bypassing memcpy @@ -148,7 +148,7 @@ int sceKernelCpuDcacheAndL2AndDMAFlush(void *ptr, size_t len); * * @return Zero on success. */ -int sceKernelCpuUnrestrictedMemcpy(void *dst, const void *src, size_t len); +int ksceKernelCpuUnrestrictedMemcpy(void *dst, const void *src, size_t len); #ifdef __cplusplus } diff --git a/include/psp2kern/kernel/modulemgr.h b/include/psp2kern/kernel/modulemgr.h index 80b32fe89..db7885c40 100644 --- a/include/psp2kern/kernel/modulemgr.h +++ b/include/psp2kern/kernel/modulemgr.h @@ -88,25 +88,25 @@ typedef struct SceUInt unk_24; } SceKernelFwInfo; -int sceKernelGetModuleListForKernel(SceUID pid, int flags1, int flags2, SceUID *modids, size_t *num); -int sceKernelGetModuleInfoForKernel(SceUID pid, SceUID modid, SceKernelModuleInfo *info); -int sceKernelGetModuleInternal(SceUID modid, void **module); - -int sceKernelGetSystemSwVersion(SceKernelFwInfo *data); - -int sceKernelLoadStartModuleForDriver(const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); -SceUID sceKernelLoadModuleForDriver(const char *path, int flags, SceKernelLMOption *option); -int sceKernelStartModuleForDriver(SceUID modid, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); -int sceKernelUnloadModuleForDriver(SceUID modid, int flags, SceKernelULMOption *option); -int sceKernelStopModuleForDriver(SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); -int sceKernelStopUnloadModuleForDriver(SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); - -SceUID sceKernelLoadStartSharedModuleForPid(SceUID pid, const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); -SceUID sceKernelLoadStartModuleForPid(SceUID pid, const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); -SceUID sceKernelLoadModuleForPid(SceUID pid, const char *path, int flags, SceKernelLMOption *option); -SceUID sceKernelUnloadModuleForPid(SceUID pid, SceUID modid, int flags, SceKernelULMOption *option); -int sceKernelStopModuleForPid(SceUID pid, SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); -int sceKernelStopUnloadModuleForPid(SceUID pid, SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); +int ksceKernelGetModuleList(SceUID pid, int flags1, int flags2, SceUID *modids, size_t *num); +int ksceKernelGetModuleInfo(SceUID pid, SceUID modid, SceKernelModuleInfo *info); +int ksceKernelGetModuleInternal(SceUID modid, void **module); + +int ksceKernelGetSystemSwVersion(SceKernelFwInfo *data); + +int ksceKernelLoadStartModule(const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); +SceUID ksceKernelLoadModule(const char *path, int flags, SceKernelLMOption *option); +int ksceKernelStartModule(SceUID modid, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); +int ksceKernelUnloadModule(SceUID modid, int flags, SceKernelULMOption *option); +int ksceKernelStopModule(SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); +int ksceKernelStopUnloadModule(SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); + +SceUID ksceKernelLoadStartSharedModuleForPid(SceUID pid, const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); +SceUID ksceKernelLoadStartModuleForPid(SceUID pid, const char *path, SceSize args, void *argp, int flags, SceKernelLMOption *option, int *status); +SceUID ksceKernelLoadModuleForPid(SceUID pid, const char *path, int flags, SceKernelLMOption *option); +SceUID ksceKernelUnloadModuleForPid(SceUID pid, SceUID modid, int flags, SceKernelULMOption *option); +int ksceKernelStopModuleForPid(SceUID pid, SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); +int ksceKernelStopUnloadModuleForPid(SceUID pid, SceUID modid, SceSize args, void *argp, int flags, SceKernelULMOption *option, int *status); #ifdef __cplusplus } diff --git a/include/psp2kern/kernel/processmgr.h b/include/psp2kern/kernel/processmgr.h index 47dffe107..4436eb67e 100644 --- a/include/psp2kern/kernel/processmgr.h +++ b/include/psp2kern/kernel/processmgr.h @@ -23,7 +23,7 @@ extern "C" { #endif -void *sceKernelGetProcessKernelBuf(SceUID pid); +void *ksceKernelGetProcessKernelBuf(SceUID pid); #ifdef __cplusplus } diff --git a/include/psp2kern/kernel/sysmem.h b/include/psp2kern/kernel/sysmem.h index a50ddfd42..2fb338b06 100644 --- a/include/psp2kern/kernel/sysmem.h +++ b/include/psp2kern/kernel/sysmem.h @@ -101,7 +101,7 @@ enum { * * @return SceUID of the memory block on success, < 0 on error. */ -SceUID sceKernelAllocMemBlockForKernel(const char *name, SceKernelMemBlockType type, int size, SceKernelAllocMemBlockKernelOpt *optp); +SceUID ksceKernelAllocMemBlock(const char *name, SceKernelMemBlockType type, int size, SceKernelAllocMemBlockKernelOpt *optp); /*** * Frees new memoy block @@ -110,7 +110,7 @@ SceUID sceKernelAllocMemBlockForKernel(const char *name, SceKernelMemBlockType t * * @return 0 on success, < 0 on error. */ -int sceKernelFreeMemBlockForKernel(SceUID uid); +int ksceKernelFreeMemBlock(SceUID uid); /*** * Gets the base address of a memoy block @@ -120,21 +120,21 @@ int sceKernelFreeMemBlockForKernel(SceUID uid); * * @return 0 on success, < 0 on error. */ -int sceKernelGetMemBlockBaseForKernel(SceUID uid, void **basep); +int ksceKernelGetMemBlockBase(SceUID uid, void **basep); -SceUID sceKernelMemPoolCreate(const char *name, SceSize size, SceKernelMemPoolCreateOpt *opt); -int sceKernelMemPoolDestroy(SceUID pool); -void *sceKernelMemPoolAlloc(SceUID pool, SceSize size); -void sceKernelMemPoolFree(SceUID pool, void *ptr); +SceUID ksceKernelMemPoolCreate(const char *name, SceSize size, SceKernelMemPoolCreateOpt *opt); +int ksceKernelMemPoolDestroy(SceUID pool); +void *ksceKernelMemPoolAlloc(SceUID pool, SceSize size); +void ksceKernelMemPoolFree(SceUID pool, void *ptr); -int sceKernelMemcpyUserToKernelForPid(SceUID pid, void *dst, uintptr_t src, size_t len); -int sceKernelMemcpyUserToKernel(void *dst, uintptr_t src, size_t len); -int sceKernelMemcpyKernelToUser(uintptr_t dst, const void *src, size_t len); -int sceKernelRxMemcpyKernelToUserForPid(SceUID pid, uintptr_t dst, const void *src, size_t len); +int ksceKernelMemcpyUserToKernelForPid(SceUID pid, void *dst, uintptr_t src, size_t len); +int ksceKernelMemcpyUserToKernel(void *dst, uintptr_t src, size_t len); +int ksceKernelMemcpyKernelToUser(uintptr_t dst, const void *src, size_t len); +int ksceKernelRxMemcpyKernelToUserForPid(SceUID pid, uintptr_t dst, const void *src, size_t len); -int sceKernelStrncpyUserToKernel(void *dst, uintptr_t src, size_t len); -int sceKernelStrncpyKernelToUser(uintptr_t dst, const void *src, size_t len); -int sceKernelStrncpyUserForPid(SceUID pid, void *dst, uintptr_t src, size_t len); +int ksceKernelStrncpyUserToKernel(void *dst, uintptr_t src, size_t len); +int ksceKernelStrncpyKernelToUser(uintptr_t dst, const void *src, size_t len); +int ksceKernelStrncpyUserForPid(SceUID pid, void *dst, uintptr_t src, size_t len); typedef struct { char data[0x2C]; @@ -144,24 +144,24 @@ typedef struct { uint32_t sce_reserved[2]; } SceObjectBase; -SceUID sceKernelKernelUidForUserUid(SceUID pid, SceUID user_uid); -SceUID sceKernelCreateUserUid(SceUID pid, SceUID kern_uid); -SceUID sceKernelCreateUidObj(SceClass *cls, const char *name, SceCreateUidObjOpt *opt, SceObjectBase **obj); -int sceKernelGetObjForUid(SceUID uid, SceClass *cls, SceObjectBase **obj); -SceClass *sceKernelGetUidClass(void); +SceUID ksceKernelKernelUidForUserUid(SceUID pid, SceUID user_uid); +SceUID ksceKernelCreateUserUid(SceUID pid, SceUID kern_uid); +SceUID ksceKernelCreateUidObj(SceClass *cls, const char *name, SceCreateUidObjOpt *opt, SceObjectBase **obj); +int ksceKernelGetObjForUid(SceUID uid, SceClass *cls, SceObjectBase **obj); +SceClass *ksceKernelGetUidClass(void); typedef int (*SceClassCallback)(void *item); -int sceKernelCreateClass(SceClass *cls, const char *name, void *uidclass, size_t itemsize, SceClassCallback create, SceClassCallback destroy); -int sceKernelDeleteUserUid(SceUID pid, SceUID user_uid); -int sceKernelDeleteUid(SceUID uid); +int ksceKernelCreateClass(SceClass *cls, const char *name, void *uidclass, size_t itemsize, SceClassCallback create, SceClassCallback destroy); +int ksceKernelDeleteUserUid(SceUID pid, SceUID user_uid); +int ksceKernelDeleteUid(SceUID uid); -int sceKernelSwitchVmaForPid(SceUID pid); +int ksceKernelSwitchVmaForPid(SceUID pid); -void *sceKernelGetSysrootBuffer(void); -int sceKernelGetPidContext(SceUID pid, int **ctx); +void *ksceKernelGetSysrootBuffer(void); +int ksceKernelGetPidContext(SceUID pid, int **ctx); -int sceKernelGetProcessTitleIdForKernel(SceUID pid, char *titleid, size_t len); +int ksceKernelGetProcessTitleId(SceUID pid, char *titleid, size_t len); -int sceKernelMapBlockUserVisible(SceUID uid); +int ksceKernelMapBlockUserVisible(SceUID uid); #ifdef __cplusplus } diff --git a/include/psp2kern/kernel/threadmgr.h b/include/psp2kern/kernel/threadmgr.h index 5366e9f70..e6838af0e 100644 --- a/include/psp2kern/kernel/threadmgr.h +++ b/include/psp2kern/kernel/threadmgr.h @@ -41,7 +41,7 @@ typedef struct SceKernelThreadOptParam { } SceKernelThreadOptParam; /** Structure to hold the status information for a thread - * @see sceKernelGetThreadInfo + * @see ksceKernelGetThreadInfo */ typedef struct SceKernelThreadInfo { /** Size of the structure */ @@ -93,7 +93,7 @@ typedef struct SceKernelThreadInfo { } SceKernelThreadInfo; /** Statistics about a running thread. - * @see sceKernelGetThreadRunStatus. + * @see ksceKernelGetThreadRunStatus. */ typedef struct SceKernelThreadRunStatus { SceSize size; @@ -121,7 +121,7 @@ typedef enum SceThreadStatus * @par Example: * @code * SceUID thid; - * thid = sceKernelCreateThread("my_thread", threadFunc, 0x10000100, 0x10000, 0, 0, NULL); + * thid = ksceKernelCreateThread("my_thread", threadFunc, 0x10000100, 0x10000, 0, 0, NULL); * @endcode * * @param name - An arbitrary thread name. @@ -134,7 +134,7 @@ typedef enum SceThreadStatus * @return UID of the created thread, or an error code. */ -SceUID sceKernelCreateThreadForKernel(const char *name, SceKernelThreadEntry entry, int initPriority, +SceUID ksceKernelCreateThread(const char *name, SceKernelThreadEntry entry, int initPriority, int stackSize, SceUInt attr, int cpuAffinityMask, const SceKernelThreadOptParam *option); @@ -145,30 +145,30 @@ SceUID sceKernelCreateThreadForKernel(const char *name, SceKernelThreadEntry ent * * @return < 0 on error. */ -int sceKernelDeleteThreadForKernel(SceUID thid); +int ksceKernelDeleteThread(SceUID thid); /** * Start a created thread * - * @param thid - Thread id from sceKernelCreateThread + * @param thid - Thread id from ksceKernelCreateThread * @param arglen - Length of the data pointed to by argp, in bytes * @param argp - Pointer to the arguments. */ -int sceKernelStartThreadForKernel(SceUID thid, SceSize arglen, void *argp); +int ksceKernelStartThread(SceUID thid, SceSize arglen, void *argp); /** * Exit a thread * * @param status - Exit status. */ -int sceKernelExitThreadForKernel(int status); +int ksceKernelExitThread(int status); /** * Exit a thread and delete itself. * * @param status - Exit status */ -int sceKernelExitDeleteThreadForKernel(int status); +int ksceKernelExitDeleteThread(int status); /** * Wait until a thread has ended. @@ -179,7 +179,7 @@ int sceKernelExitDeleteThreadForKernel(int status); * * @return < 0 on error. */ -int sceKernelWaitThreadEndForKernel(SceUID thid, int *stat, SceUInt *timeout); +int ksceKernelWaitThreadEnd(SceUID thid, int *stat, SceUInt *timeout); /** * Wait until a thread has ended and handle callbacks if necessary. @@ -190,7 +190,7 @@ int sceKernelWaitThreadEndForKernel(SceUID thid, int *stat, SceUInt *timeout); * * @return < 0 on error. */ -int sceKernelWaitThreadEndCBForKernel(SceUID thid, int *stat, SceUInt *timeout); +int ksceKernelWaitThreadEndCB(SceUID thid, int *stat, SceUInt *timeout); /** * Delay the current thread by a specified number of microseconds @@ -199,10 +199,10 @@ int sceKernelWaitThreadEndCBForKernel(SceUID thid, int *stat, SceUInt *timeout); * * @par Example: * @code - * sceKernelDelayThread(1000000); // Delay for a second + * ksceKernelDelayThread(1000000); // Delay for a second * @endcode */ -int sceKernelDelayThreadForKernel(SceUInt delay); +int ksceKernelDelayThread(SceUInt delay); /** * Delay the current thread by a specified number of microseconds and handle any callbacks. @@ -211,10 +211,10 @@ int sceKernelDelayThreadForKernel(SceUInt delay); * * @par Example: * @code - * sceKernelDelayThread(1000000); // Delay for a second + * ksceKernelDelayThread(1000000); // Delay for a second * @endcode */ -int sceKernelDelayThreadCBForKernel(SceUInt delay); +int ksceKernelDelayThreadCB(SceUInt delay); /** * Modify the attributes of the current thread. @@ -224,24 +224,24 @@ int sceKernelDelayThreadCBForKernel(SceUInt delay); * * @return < 0 on error. */ -int sceKernelChangeCurrentThreadAttrForKernel(int unknown, SceUInt attr); +int ksceKernelChangeCurrentThreadAttr(int unknown, SceUInt attr); /** * Change the threads current priority. * - * @param thid - The ID of the thread (from sceKernelCreateThread or sceKernelGetThreadId) + * @param thid - The ID of the thread (from ksceKernelCreateThread or ksceKernelGetThreadId) * @param priority - The new priority (the lower the number the higher the priority) * * @par Example: * @code - * int thid = sceKernelGetThreadId(); + * int thid = ksceKernelGetThreadId(); * // Change priority of current thread to 16 - * sceKernelChangeThreadPriority(thid, 16); + * ksceKernelChangeThreadPriority(thid, 16); * @endcode * * @return 0 if successful, otherwise the error code. */ -int sceKernelChangeThreadPriorityForKernel(SceUID thid, int priority); +int ksceKernelChangeThreadPriority(SceUID thid, int priority); /** * Release a thread in the wait state. @@ -250,21 +250,21 @@ int sceKernelChangeThreadPriorityForKernel(SceUID thid, int priority); * * @return 0 on success, < 0 on error */ -int sceKernelReleaseWaitThreadForKernel(SceUID thid); +int ksceKernelReleaseWaitThread(SceUID thid); /** * Get the current thread Id * * @return The thread id of the calling thread. */ -int sceKernelGetThreadIdForKernel(void); +int ksceKernelGetThreadId(void); /** * Get the current priority of the thread you are in. * * @return The current thread priority */ -int sceKernelGetThreadCurrentPriorityForKernel(void); +int ksceKernelGetThreadCurrentPriority(void); /** * Get the exit status of a thread. @@ -273,14 +273,14 @@ int sceKernelGetThreadCurrentPriorityForKernel(void); * * @return The exit status */ -int sceKernelGetThreadExitStatusForKernel(SceUID thid); +int ksceKernelGetThreadExitStatus(SceUID thid); /** * Check the thread stack? * * @return Unknown. */ -int sceKernelCheckThreadStackForKernel(void); +int ksceKernelCheckThreadStack(void); /** * Get the free stack size for a thread. @@ -290,7 +290,7 @@ int sceKernelCheckThreadStackForKernel(void); * * @return The free size. */ -int sceKernelGetThreadStackFreeSizeForKernel(SceUID thid); +int ksceKernelGetThreadStackFreeSize(SceUID thid); /** * Get the status information for the specified thread. @@ -304,12 +304,12 @@ int sceKernelGetThreadStackFreeSizeForKernel(SceUID thid); * @code * SceKernelThreadInfo status; * status.size = sizeof(SceKernelThreadInfo); - * if(sceKernelGetThreadInfo(thid, &status) == 0) + * if(ksceKernelGetThreadInfo(thid, &status) == 0) * { Do something... } * @endcode * @return 0 if successful, otherwise the error code. */ -int sceKernelGetThreadInfoForKernel(SceUID thid, SceKernelThreadInfo *info); +int ksceKernelGetThreadInfo(SceUID thid, SceKernelThreadInfo *info); /** * Retrive the runtime status of a thread. @@ -319,7 +319,7 @@ int sceKernelGetThreadInfoForKernel(SceUID thid, SceKernelThreadInfo *info); * * @return 0 if successful, otherwise the error code. */ -int sceKernelGetThreadRunStatusForKernel(SceUID thid, SceKernelThreadRunStatus *status); +int ksceKernelGetThreadRunStatus(SceUID thid, SceKernelThreadRunStatus *status); /* Semaphores. */ @@ -331,7 +331,7 @@ typedef struct SceKernelSemaOptParam { } SceKernelSemaOptParam; /** Current state of a semaphore. - * @see sceKernelGetSemaInfo. + * @see ksceKernelGetSemaInfo. */ typedef struct SceKernelSemaInfo { /** Size of the ::SceKernelSemaInfo structure. */ @@ -358,7 +358,7 @@ typedef struct SceKernelSemaInfo { * @par Example: * @code * int semaid; - * semaid = sceKernelCreateSema("MyMutex", 0, 1, 1, 0); + * semaid = ksceKernelCreateSema("MyMutex", 0, 1, 1, 0); * @endcode * * @param name - Specifies the name of the sema @@ -368,7 +368,7 @@ typedef struct SceKernelSemaInfo { * @param option - Sema options (normally set to 0) * @return A semaphore id */ -SceUID sceKernelCreateSemaForKernel(const char *name, SceUInt attr, int initVal, int maxVal, SceKernelSemaOptParam *option); +SceUID ksceKernelCreateSema(const char *name, SceUInt attr, int initVal, int maxVal, SceKernelSemaOptParam *option); /** * Destroy a semaphore @@ -376,7 +376,7 @@ SceUID sceKernelCreateSemaForKernel(const char *name, SceUInt attr, int initVal, * @param semaid - The semaid returned from a previous create call. * @return Returns the value 0 if its succesful otherwise -1 */ -int sceKernelDeleteSemaForKernel(SceUID semaid); +int ksceKernelDeleteSema(SceUID semaid); /** * Send a signal to a semaphore @@ -384,47 +384,47 @@ int sceKernelDeleteSemaForKernel(SceUID semaid); * @par Example: * @code * // Signal the sema - * sceKernelSignalSema(semaid, 1); + * ksceKernelSignalSema(semaid, 1); * @endcode * - * @param semaid - The sema id returned from sceKernelCreateSema + * @param semaid - The sema id returned from ksceKernelCreateSema * @param signal - The amount to signal the sema (i.e. if 2 then increment the sema by 2) * * @return < 0 On error. */ -int sceKernelSignalSemaForKernel(SceUID semaid, int signal); +int ksceKernelSignalSema(SceUID semaid, int signal); /** * Lock a semaphore * * @par Example: * @code - * sceKernelWaitSema(semaid, 1, 0); + * ksceKernelWaitSema(semaid, 1, 0); * @endcode * - * @param semaid - The sema id returned from sceKernelCreateSema + * @param semaid - The sema id returned from ksceKernelCreateSema * @param signal - The value to wait for (i.e. if 1 then wait till reaches a signal state of 1) * @param timeout - Timeout in microseconds (assumed). * * @return < 0 on error. */ -int sceKernelWaitSemaForKernel(SceUID semaid, int signal, SceUInt *timeout); +int ksceKernelWaitSema(SceUID semaid, int signal, SceUInt *timeout); /** * Lock a semaphore and handle callbacks if necessary. * * @par Example: * @code - * sceKernelWaitSemaCB(semaid, 1, 0); + * ksceKernelWaitSemaCB(semaid, 1, 0); * @endcode * - * @param semaid - The sema id returned from sceKernelCreateSema + * @param semaid - The sema id returned from ksceKernelCreateSema * @param signal - The value to wait for (i.e. if 1 then wait till reaches a signal state of 1) * @param timeout - Timeout in microseconds (assumed). * * @return < 0 on error. */ -int sceKernelWaitSemaCBForKernel(SceUID semaid, int signal, SceUInt *timeout); +int ksceKernelWaitSemaCB(SceUID semaid, int signal, SceUInt *timeout); /** * Poll a sempahore. @@ -434,17 +434,17 @@ int sceKernelWaitSemaCBForKernel(SceUID semaid, int signal, SceUInt *timeout); * * @return < 0 on error. */ -int sceKernelPollSemaForKernel(SceUID semaid, int signal); +int ksceKernelPollSema(SceUID semaid, int signal); /** * Cancels a semaphore * - * @param semaid - The sema id returned from sceKernelCreateSema + * @param semaid - The sema id returned from ksceKernelCreateSema * @param setCount - The new lock count of the semaphore * @param numWaitThreads - Number of threads waiting for the semaphore * @return < 0 On error. */ -int sceKernelCancelSemaForKernel(SceUID semaid, int setCount, int *numWaitThreads); +int ksceKernelCancelSema(SceUID semaid, int setCount, int *numWaitThreads); /** * Retrieve information about a semaphore. @@ -454,7 +454,7 @@ int sceKernelCancelSemaForKernel(SceUID semaid, int setCount, int *numWaitThread * * @return < 0 on error. */ -int sceKernelGetSemaInfoForKernel(SceUID semaid, SceKernelSemaInfo *info); +int ksceKernelGetSemaInfo(SceUID semaid, SceKernelSemaInfo *info); /* Mutexes. */ @@ -467,7 +467,7 @@ typedef struct SceKernelMutexOptParam { } SceKernelMutexOptParam; /** Current state of a mutex. - * @see sceKernelGetMutexInfo. + * @see ksceKernelGetMutexInfo. */ typedef struct SceKernelMutexInfo { /** Size of the ::SceKernelMutexInfo structure. */ @@ -494,7 +494,7 @@ typedef struct SceKernelMutexInfo { * @par Example: * @code * int mutexid; - * mutexid = sceKernelCreateMutex("MyMutex", 0, 1, 1, 0); + * mutexid = ksceKernelCreateMutex("MyMutex", 0, 1, 1, 0); * @endcode * * @param name - Specifies the name of the mutex @@ -503,15 +503,15 @@ typedef struct SceKernelMutexInfo { * @param option - Mutex options (normally set to 0) * @return A mutex id */ -SceUID sceKernelCreateMutexForKernel(const char *name, SceUInt attr, int initCount, SceKernelMutexOptParam *option); +SceUID ksceKernelCreateMutex(const char *name, SceUInt attr, int initCount, SceKernelMutexOptParam *option); /** * Destroy a mutex * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @return Returns the value 0 if its succesful otherwise -1 */ -int sceKernelDeleteMutexForKernel(SceUID mutexid); +int ksceKernelDeleteMutex(SceUID mutexid); /** * Open a mutex @@ -519,63 +519,63 @@ int sceKernelDeleteMutexForKernel(SceUID mutexid); * @param name - The name of the mutex to open * @return Returns the value 0 if its succesful otherwise -1 */ -int sceKernelOpenMutexForKernel(const char *name); +int ksceKernelOpenMutex(const char *name); /** * Close a mutex * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @return Returns the value 0 if its succesful otherwise -1 */ -int sceKernelCloseMutexForKernel(SceUID mutexid); +int ksceKernelCloseMutex(SceUID mutexid); /** * Lock a mutex * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @param lockCount - The value to increment to the lock count of the mutex * @param timeout - Timeout in microseconds (assumed) * @return < 0 On error. */ -int sceKernelLockMutexForKernel(SceUID mutexid, int lockCount, unsigned int *timeout); +int ksceKernelLockMutex(SceUID mutexid, int lockCount, unsigned int *timeout); /** * Lock a mutex and handle callbacks if necessary. * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @param lockCount - The value to increment to the lock count of the mutex * @param timeout - Timeout in microseconds (assumed) * @return < 0 On error. */ -int sceKernelLockMutexCBForKernel(SceUID mutexid, int lockCount, unsigned int *timeout); +int ksceKernelLockMutexCB(SceUID mutexid, int lockCount, unsigned int *timeout); /** * Try to lock a mutex (non-blocking) * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @param lockCount - The value to increment to the lock count of the mutex * @return < 0 On error. */ -int sceKernelTryLockMutexForKernel(SceUID mutexid, int lockCount); +int ksceKernelTryLockMutex(SceUID mutexid, int lockCount); /** * Try to unlock a mutex (non-blocking) * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @param unlockCount - The value to decrement to the lock count of the mutex * @return < 0 On error. */ -int sceKernelUnlockMutexForKernel(SceUID mutexid, int unlockCount); +int ksceKernelUnlockMutex(SceUID mutexid, int unlockCount); /** * Cancels a mutex * - * @param mutexid - The mutex id returned from sceKernelCreateMutex + * @param mutexid - The mutex id returned from ksceKernelCreateMutex * @param newCount - The new lock count of the mutex * @param numWaitThreads - Number of threads waiting for the mutex * @return < 0 On error. */ -int sceKernelCancelMutexForKernel(SceUID mutexid, int newCount, int *numWaitThreads); +int ksceKernelCancelMutex(SceUID mutexid, int newCount, int *numWaitThreads); /** * Retrieve information about a mutex. @@ -585,7 +585,7 @@ int sceKernelCancelMutexForKernel(SceUID mutexid, int newCount, int *numWaitThre * * @return < 0 on error. */ -int sceKernelGetMutexInfoForKernel(SceUID mutexid, SceKernelMutexInfo info); +int ksceKernelGetMutexInfo(SceUID mutexid, SceKernelMutexInfo info); /* Event flags. */ @@ -637,74 +637,74 @@ typedef enum SceEventFlagWaitTypes { * @par Example: * @code * int evid; - * evid = sceKernelCreateEventFlag("wait_event", 0, 0, 0); + * evid = ksceKernelCreateEventFlag("wait_event", 0, 0, 0); * @endcode */ -SceUID sceKernelCreateEventFlagForKernel(const char *name, int attr, int bits, SceKernelEventFlagOptParam *opt); +SceUID ksceKernelCreateEventFlag(const char *name, int attr, int bits, SceKernelEventFlagOptParam *opt); /** * Set an event flag bit pattern. * - * @param evid - The event id returned by sceKernelCreateEventFlag. + * @param evid - The event id returned by ksceKernelCreateEventFlag. * @param bits - The bit pattern to set. * * @return < 0 On error */ -int sceKernelSetEventFlagForKernel(SceUID evid, unsigned int bits); +int ksceKernelSetEventFlag(SceUID evid, unsigned int bits); /** * Clear a event flag bit pattern * - * @param evid - The event id returned by ::sceKernelCreateEventFlag + * @param evid - The event id returned by ::ksceKernelCreateEventFlag * @param bits - The bits to clean * * @return < 0 on Error */ -int sceKernelClearEventFlagForKernel(SceUID evid, unsigned int bits); +int ksceKernelClearEventFlag(SceUID evid, unsigned int bits); /** * Poll an event flag for a given bit pattern. * - * @param evid - The event id returned by sceKernelCreateEventFlag. + * @param evid - The event id returned by ksceKernelCreateEventFlag. * @param bits - The bit pattern to poll for. * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together * @param outBits - The bit pattern that was matched. * @return < 0 On error */ -int sceKernelPollEventFlagForKernel(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits); +int ksceKernelPollEventFlag(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits); /** * Wait for an event flag for a given bit pattern. * - * @param evid - The event id returned by sceKernelCreateEventFlag. + * @param evid - The event id returned by ksceKernelCreateEventFlag. * @param bits - The bit pattern to poll for. * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together * @param outBits - The bit pattern that was matched. * @param timeout - Timeout in microseconds * @return < 0 On error */ -int sceKernelWaitEventFlagForKernel(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits, SceUInt *timeout); +int ksceKernelWaitEventFlag(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits, SceUInt *timeout); /** * Wait for an event flag for a given bit pattern with callback. * - * @param evid - The event id returned by sceKernelCreateEventFlag. + * @param evid - The event id returned by ksceKernelCreateEventFlag. * @param bits - The bit pattern to poll for. * @param wait - Wait type, one or more of ::SceEventFlagWaitTypes or'ed together * @param outBits - The bit pattern that was matched. * @param timeout - Timeout in microseconds * @return < 0 On error */ -int sceKernelWaitEventFlagCBForKernel(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits, SceUInt *timeout); +int ksceKernelWaitEventFlagCB(int evid, unsigned int bits, unsigned int wait, unsigned int *outBits, SceUInt *timeout); /** * Delete an event flag * - * @param evid - The event id returned by sceKernelCreateEventFlag. + * @param evid - The event id returned by ksceKernelCreateEventFlag. * * @return < 0 On error */ -int sceKernelDeleteEventFlagForKernel(int evid); +int ksceKernelDeleteEventFlag(int evid); /** * Get the status of an event flag. @@ -714,7 +714,7 @@ int sceKernelDeleteEventFlagForKernel(int evid); * * @return < 0 on error. */ -int sceKernelGetEventFlagInfoForKernel(SceUID event, SceKernelEventFlagInfo *info); +int ksceKernelGetEventFlagInfo(SceUID event, SceKernelEventFlagInfo *info); /* Callbacks. */ @@ -748,7 +748,7 @@ typedef struct SceKernelCallbackInfo { * @par Example: * @code * int cbid; - * cbid = sceKernelCreateCallback("Exit Callback", exit_cb, NULL); + * cbid = ksceKernelCreateCallback("Exit Callback", exit_cb, NULL); * @endcode * * @param name - A textual name for the callback @@ -757,7 +757,7 @@ typedef struct SceKernelCallbackInfo { * * @return >= 0 A callback id which can be used in subsequent functions, < 0 an error. */ -int sceKernelCreateCallbackForKernel(const char *name, unsigned int attr, SceKernelCallbackFunction func, void *arg); +int ksceKernelCreateCallback(const char *name, unsigned int attr, SceKernelCallbackFunction func, void *arg); /** * Gets the status of a specified callback. @@ -768,7 +768,7 @@ int sceKernelCreateCallbackForKernel(const char *name, unsigned int attr, SceKer * * @return < 0 on error. */ -int sceKernelGetCallbackInfoForKernel(SceUID cb, SceKernelCallbackInfo *infop); +int ksceKernelGetCallbackInfo(SceUID cb, SceKernelCallbackInfo *infop); /** * Delete a callback @@ -777,7 +777,7 @@ int sceKernelGetCallbackInfoForKernel(SceUID cb, SceKernelCallbackInfo *infop); * * @return 0 on success, < 0 on error */ -int sceKernelDeleteCallbackForKernel(SceUID cb); +int ksceKernelDeleteCallback(SceUID cb); /** * Notify a callback @@ -787,7 +787,7 @@ int sceKernelDeleteCallbackForKernel(SceUID cb); * * @return 0 on success, < 0 on error */ -int sceKernelNotifyCallbackForKernel(SceUID cb, int arg2); +int ksceKernelNotifyCallback(SceUID cb, int arg2); /** * Cancel a callback ? @@ -796,7 +796,7 @@ int sceKernelNotifyCallbackForKernel(SceUID cb, int arg2); * * @return 0 on succes, < 0 on error */ -int sceKernelCancelCallbackForKernel(SceUID cb); +int ksceKernelCancelCallback(SceUID cb); /** * Get the callback count @@ -805,14 +805,14 @@ int sceKernelCancelCallbackForKernel(SceUID cb); * * @return The callback count, < 0 on error */ -int sceKernelGetCallbackCountForKernel(SceUID cb); +int ksceKernelGetCallbackCount(SceUID cb); /** * Check callback ? * * @return Something or another */ -int sceKernelCheckCallbackForKernel(void); +int ksceKernelCheckCallback(void); /* Message pipes */ @@ -828,7 +828,7 @@ int sceKernelCheckCallbackForKernel(void); * * @return The UID of the created pipe, < 0 on error */ -SceUID sceKernelCreateMsgPipeForKernel(const char *name, int type, int attr, unsigned int bufSize, void *opt); +SceUID ksceKernelCreateMsgPipe(const char *name, int type, int attr, unsigned int bufSize, void *opt); /** * Delete a message pipe @@ -837,7 +837,7 @@ SceUID sceKernelCreateMsgPipeForKernel(const char *name, int type, int attr, uns * * @return 0 on success, < 0 on error */ -int sceKernelDeleteMsgPipeForKernel(SceUID uid); +int ksceKernelDeleteMsgPipe(SceUID uid); /** * Send a message to a pipe @@ -851,7 +851,7 @@ int sceKernelDeleteMsgPipeForKernel(SceUID uid); * * @return 0 on success, < 0 on error */ -int sceKernelSendMsgPipeForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int ksceKernelSendMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); /** * Send a message to a pipe (with callback) @@ -865,7 +865,7 @@ int sceKernelSendMsgPipeForKernel(SceUID uid, void *message, unsigned int size, * * @return 0 on success, < 0 on error */ -int sceKernelSendMsgPipeCBForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int ksceKernelSendMsgPipeCB(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); /** * Try to send a message to a pipe @@ -878,7 +878,7 @@ int sceKernelSendMsgPipeCBForKernel(SceUID uid, void *message, unsigned int size * * @return 0 on success, < 0 on error */ -int sceKernelTrySendMsgPipeForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); +int ksceKernelTrySendMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); /** * Receive a message from a pipe @@ -892,7 +892,7 @@ int sceKernelTrySendMsgPipeForKernel(SceUID uid, void *message, unsigned int siz * * @return 0 on success, < 0 on error */ -int sceKernelReceiveMsgPipeForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int ksceKernelReceiveMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); /** * Receive a message from a pipe (with callback) @@ -906,7 +906,7 @@ int sceKernelReceiveMsgPipeForKernel(SceUID uid, void *message, unsigned int siz * * @return 0 on success, < 0 on error */ -int sceKernelReceiveMsgPipeCBForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); +int ksceKernelReceiveMsgPipeCB(SceUID uid, void *message, unsigned int size, int unk1, void *unk2, unsigned int *timeout); /** * Receive a message from a pipe @@ -919,7 +919,7 @@ int sceKernelReceiveMsgPipeCBForKernel(SceUID uid, void *message, unsigned int s * * @return 0 on success, < 0 on error */ -int sceKernelTryReceiveMsgPipeForKernel(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); +int ksceKernelTryReceiveMsgPipe(SceUID uid, void *message, unsigned int size, int unk1, void *unk2); /** * Cancel a message pipe @@ -930,7 +930,7 @@ int sceKernelTryReceiveMsgPipeForKernel(SceUID uid, void *message, unsigned int * * @return 0 on success, < 0 on error */ -int sceKernelCancelMsgPipeForKernel(SceUID uid, int *psend, int *precv); +int ksceKernelCancelMsgPipe(SceUID uid, int *psend, int *precv); /** Message Pipe status info */ typedef struct SceKernelMppInfo { @@ -952,7 +952,7 @@ typedef struct SceKernelMppInfo { * * @return 0 on success, < 0 on error */ -int sceKernelGetMsgPipeInfoForKernel(SceUID uid, SceKernelMppInfo *info); +int ksceKernelGetMsgPipeInfo(SceUID uid, SceKernelMppInfo *info); /* Misc. */ @@ -975,7 +975,7 @@ typedef struct SceKernelSystemInfo { * * @return 0 on success, < 0 on error */ -int sceKernelGetSystemInfoForKernel(SceKernelSystemInfo *info); +int ksceKernelGetSystemInfo(SceKernelSystemInfo *info); /* Misc. */ @@ -1005,7 +1005,7 @@ typedef enum SceKernelIdListType { * * @return The type, < 0 on error */ -SceKernelIdListType sceKernelGetThreadmgrUIDClassForKernel(SceUID uid); +SceKernelIdListType ksceKernelGetThreadmgrUIDClass(SceUID uid); @@ -1017,10 +1017,10 @@ typedef struct SceKernelLwMutexOptParam { SceSize size; } SceKernelLwMutexOptParam; -int sceKernelCreateLwMutexForKernel(SceKernelLwMutexWork *pWork,const char *pName, unsigned int attr, int initCount, const SceKernelLwMutexOptParam *pOptParam); -int sceKernelDeleteLwMutexForKernel(SceKernelLwMutexWork *pWork); -int sceKernelLockLwMutexForKernel(SceKernelLwMutexWork *pWork, int lockCount, unsigned int *pTimeout); -int sceKernelUnlockLwMutexForKernel(SceKernelLwMutexWork *pWork, int unlockCount); +int ksceKernelCreateLwMutex(SceKernelLwMutexWork *pWork,const char *pName, unsigned int attr, int initCount, const SceKernelLwMutexOptParam *pOptParam); +int ksceKernelDeleteLwMutex(SceKernelLwMutexWork *pWork); +int ksceKernelLockLwMutex(SceKernelLwMutexWork *pWork, int lockCount, unsigned int *pTimeout); +int ksceKernelUnlockLwMutex(SceKernelLwMutexWork *pWork, int unlockCount); typedef struct SceKernelLwCondWork { SceInt64 data[4]; @@ -1030,10 +1030,10 @@ typedef struct SceKernelLwCondOptParam { SceSize size; } SceKernelLwCondOptParam; -int sceKernelCreateLwCondForKernel(SceKernelLwCondWork *pWork, const char *pName, unsigned int attr, SceKernelLwMutexWork *pLwMutex, const SceKernelLwCondOptParam *pOptParam); -int sceKernelDeleteLwCondForKernel(SceKernelLwCondWork *pWork); -int sceKernelSignalLwCondForKernel(SceKernelLwCondWork *pWork); -int sceKernelWaitLwCondForKernel(SceKernelLwCondWork *pWork, unsigned int *pTimeout); +int ksceKernelCreateLwCond(SceKernelLwCondWork *pWork, const char *pName, unsigned int attr, SceKernelLwMutexWork *pLwMutex, const SceKernelLwCondOptParam *pOptParam); +int ksceKernelDeleteLwCond(SceKernelLwCondWork *pWork); +int ksceKernelSignalLwCond(SceKernelLwCondWork *pWork); +int ksceKernelWaitLwCond(SceKernelLwCondWork *pWork, unsigned int *pTimeout); @@ -1042,29 +1042,29 @@ int sceKernelWaitLwCondForKernel(SceKernelLwCondWork *pWork, unsigned int *pTim * * @return The system time */ -SceInt64 sceKernelGetSystemTimeWideForDriverForKernel(void); +SceInt64 ksceKernelGetSystemTimeWide(void); /** - * @brief sceKernelGetThreadTLSAddr gets an address to a 4 bytes area of TLS memory for the specified thread + * @brief ksceKernelGetThreadTLSAddr gets an address to a 4 bytes area of TLS memory for the specified thread * @param thid - The UID of the thread to access TLS * @param key - the TLS keyslot index * @return pointer to TLS memory */ -void *sceKernelGetThreadTLSAddrForKernel(SceUID thid, int key); +void *ksceKernelGetThreadTLSAddr(SceUID thid, int key); /** - * @brief sceKernelGetTLSAddr get pointer to TLS key area for current thread + * @brief ksceKernelGetTLSAddr get pointer to TLS key area for current thread * @param key - the TLS keyslot index * @return pointer to TLS key value */ -void *sceKernelGetTLSAddrForKernel(int key); +void *ksceKernelGetTLSAddr(int key); /** * @brief Gets the current process PID * * @return Current PID */ -SceUID sceKernelGetProcessId(void); +SceUID ksceKernelGetProcessId(void); /** * @brief Runs a function with larger stack size @@ -1075,7 +1075,7 @@ SceUID sceKernelGetProcessId(void); * * @return Zero on success */ -int sceKernelRunWithStack(int stack_size, int (*to_call)(void *), void *args); +int ksceKernelRunWithStack(int stack_size, int (*to_call)(void *), void *args); #ifdef __cplusplus } diff --git a/include/psp2kern/net/net.h b/include/psp2kern/net/net.h index a7e23791b..e609a59c3 100644 --- a/include/psp2kern/net/net.h +++ b/include/psp2kern/net/net.h @@ -266,7 +266,7 @@ enum { SCE_NET_RESOLVER_EALIGNMENT }; -/** Flags to specify as argument to ::sceNetDumpRead() */ +/** Flags to specify as argument to ::ksceNetDumpRead() */ enum { SCE_NET_DUMP_PEEK = 0x00000010, SCE_NET_DUMP_DONTWAIT = 0x00000020, @@ -283,7 +283,7 @@ enum { SCE_NET_EPOLLDESCID = 0x00010000 }; -/** Flags to specify as argument to ::sceNetEpollControl() */ +/** Flags to specify as argument to ::ksceNetEpollControl() */ enum { SCE_NET_EPOLL_CTL_ADD = 1, SCE_NET_EPOLL_CTL_MOD, @@ -320,25 +320,25 @@ enum { SCE_NET_SOCKINFO_F_ALL = 0x001F0007 }; -/** Flags to specify as argument to ::sceNetEmulationGet() / ::sceNetEmulationSet() */ +/** Flags to specify as argument to ::ksceNetEmulationGet() / ::ksceNetEmulationSet() */ enum { SCE_NET_EMULATION_FLAG_ETH0 = 1, SCE_NET_EMULATION_FLAG_WLAN0 }; -/** Flags to specify as argument to ::sceNetResolverStartNtoa() / ::sceNetResolverStartAton() */ +/** Flags to specify as argument to ::ksceNetResolverStartNtoa() / ::ksceNetResolverStartAton() */ enum { SCE_NET_RESOLVER_ASYNC = 0x00000001, SCE_NET_RESOLVER_START_NTOA_DISABLE_IPADDRESS = 0x00010000 }; -/** Flags to specify as argument to ::sceNetResolverAbort() */ +/** Flags to specify as argument to ::ksceNetResolverAbort() */ enum { SCE_NET_RESOLVER_ABORT_FLAG_NTOA_PRESERVATION = 0x00000001, SCE_NET_RESOLVER_ABORT_FLAG_ATON_PRESERVATION = 0x00000002 }; -/** Flags to specify as argument to ::sceNetSocketAbort() */ +/** Flags to specify as argument to ::ksceNetSocketAbort() */ enum { SCE_NET_SOCKET_ABORT_FLAG_RCV_PRESERVATION = 0x00000001, SCE_NET_SOCKET_ABORT_FLAG_SND_PRESERVATION = 0x00000002 @@ -412,7 +412,7 @@ enum { SCE_NET_MSG_USESIGNATURE = 0x00000800 }; -/** Flags to specify as argument to ::sceNetShutdown() */ +/** Flags to specify as argument to ::ksceNetShutdown() */ enum { SCE_NET_SHUT_RD, SCE_NET_SHUT_WR, @@ -706,20 +706,20 @@ typedef struct SceNetIcmpHeader { /* prototypes */ -int sceNetSocketForDriver(const char *name, int domain, int type, int protocol); -int sceNetAcceptForDriver(int s, SceNetSockaddr *addr, unsigned int *addrlen); -int sceNetBindForDriver(int s, const SceNetSockaddr *addr, unsigned int addrlen); -int sceNetListenForDriver(int s, int backlog); -int sceNetRecvForDriver(int s, void *buf, unsigned int len, int flags); -int sceNetRecvfromForDriver(int s, void *buf, unsigned int len, int flags, SceNetSockaddr *from, unsigned int *fromlen); -int sceNetSendForDriver(int s, const void *msg, unsigned int len, int flags); -int sceNetSendtoForDriver(int s, const void *msg, unsigned int len, int flags, const SceNetSockaddr *to, unsigned int tolen); -int sceNetSetsockoptForDriver(int s, int level, int optname, const void *optval, unsigned int optlen); -int sceNetSocketCloseForDriver(int s); +int ksceNetSocket(const char *name, int domain, int type, int protocol); +int ksceNetAccept(int s, SceNetSockaddr *addr, unsigned int *addrlen); +int ksceNetBind(int s, const SceNetSockaddr *addr, unsigned int addrlen); +int ksceNetListen(int s, int backlog); +int ksceNetRecv(int s, void *buf, unsigned int len, int flags); +int ksceNetRecvfrom(int s, void *buf, unsigned int len, int flags, SceNetSockaddr *from, unsigned int *fromlen); +int ksceNetSend(int s, const void *msg, unsigned int len, int flags); +int ksceNetSendto(int s, const void *msg, unsigned int len, int flags, const SceNetSockaddr *to, unsigned int tolen); +int ksceNetSetsockopt(int s, int level, int optname, const void *optval, unsigned int optlen); +int ksceNetSocketClose(int s); /* fixme ? */ -#define sceNetHtonsForDriver __builtin_bswap16 -#define sceNetHtonlForDriver __builtin_bswap32 +#define ksceNetHtons __builtin_bswap16 +#define ksceNetHtonl __builtin_bswap32 #ifdef __cplusplus } diff --git a/include/psp2kern/sblacmgr.h b/include/psp2kern/sblacmgr.h index 88d4fde5f..b535b92fd 100644 --- a/include/psp2kern/sblacmgr.h +++ b/include/psp2kern/sblacmgr.h @@ -23,10 +23,10 @@ extern "C" { #endif -int sceSblACMgrIsShell(SceUID pid); -int sceSblACMgrIsGameProgram(SceUID pid); -int sceSblACMgrIsNonGameProgram(SceUID pid); -int sceSblACMgrIsDevelopmentMode(void); +int ksceSblACMgrIsShell(SceUID pid); +int ksceSblACMgrIsGameProgram(SceUID pid); +int ksceSblACMgrIsNonGameProgram(SceUID pid); +int ksceSblACMgrIsDevelopmentMode(void); #ifdef __cplusplus } diff --git a/include/psp2kern/usbserial.h b/include/psp2kern/usbserial.h index d960b8bd2..bfb5558a3 100644 --- a/include/psp2kern/usbserial.h +++ b/include/psp2kern/usbserial.h @@ -24,7 +24,7 @@ extern "C" { * * @note The user is responsible for making sure no other UDC driver is active. This activates UDC as a "PS Vita" Type D device. */ -int sceUsbSerialStartForKernel(void); +int ksceUsbSerialStart(void); /** * Setup USB serial device @@ -33,26 +33,26 @@ int sceUsbSerialStartForKernel(void); * * @param unk Unknown */ -int sceUsbSerialSetupForKernel(int unk); +int ksceUsbSerialSetup(int unk); /** * Get USB device status * * @return Returns 1 when serial port is open */ -int sceUsbSerialStatusForKernel(void); +int ksceUsbSerialStatus(void); /** * Close USB serial device */ -int sceUsbSerialCloseForKernel(void); +int ksceUsbSerialClose(void); /** * Get receive buffer length * * @return Returns length of USB rx buffer */ -unsigned int sceUsbSerialGetRecvBufferSizeForKernel(void); +unsigned int ksceUsbSerialGetRecvBufferSize(void); /** * Send data @@ -63,7 +63,7 @@ unsigned int sceUsbSerialGetRecvBufferSizeForKernel(void); * @param unk2 Unknown * @note max send length is 0x10000 */ -unsigned int sceUsbSerialSendForKernel(const void *buffer, unsigned int len, int unk1, int unk2); +unsigned int ksceUsbSerialSend(const void *buffer, unsigned int len, int unk1, int unk2); /** * Receive Data @@ -74,7 +74,7 @@ unsigned int sceUsbSerialSendForKernel(const void *buffer, unsigned int len, int * @param unk2 Unknown * @note max recv length is 0x10000 */ -unsigned int sceUsbSerialRecvForKernel(void *buffer, unsigned int max_len, int unk1, int unk2); +unsigned int ksceUsbSerialRecv(void *buffer, unsigned int max_len, int unk1, int unk2); #ifdef __cplusplus } From 2357ada23f328c043b04de8d824a668aef8017c1 Mon Sep 17 00:00:00 2001 From: devnoname120 Date: Fri, 16 Dec 2016 18:47:33 +0100 Subject: [PATCH 2/4] Finish ksce renaming --- db.yml | 358 +++++++++++++++++++++--------------------- include/psp2kern/bt.h | 334 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 513 insertions(+), 179 deletions(-) create mode 100644 include/psp2kern/bt.h diff --git a/db.yml b/db.yml index 993ddb0b4..dc588c69c 100644 --- a/db.yml +++ b/db.yml @@ -551,51 +551,51 @@ modules: nid: 0x9785DB68 SceBtForDriver: functions: - sceBtAvrcpReadVolumeForDriver: 0xC9C70056 - sceBtAvrcpSendButtonForDriver: 0xEC5F8519 - sceBtAvrcpSendVolumeForDriver: 0x7689DA3D - sceBtAvrcpSetPlayStatusForDriver: 0xC5E7349C - sceBtAvrcpSetTitleForDriver: 0x91EF55AD - sceBtDeleteRegisteredInfoForDriver: 0xE6F659E0 - sceBtFreqAudioForDriver: 0xDA20DCC8 - sceBtGetConfigurationForDriver: 0x94C66A3B - sceBtGetConnectingInfoForDriver: 0xE9936446 - sceBtGetDeviceNameForDriver: 0x633F784C - sceBtGetInfoForTestForDriver: 0x2C9DD7BB - sceBtGetLastErrorForDriver: 0xAD31A43E - sceBtGetRegisteredInfoForDriver: 0xF86D25E2 - sceBtGetStatusForTestForDriver: 0x83781649 - sceBtGetVidPidForDriver: 0x780A5557 - sceBtHfpGetCurrentPhoneNumberForDriver: 0x7BC66D6D - sceBtHfpRequestForDriver: 0x6E49D11D - sceBtHidGetReportDescriptorForDriver: 0x6CB4ABA - sceBtHidTransferForDriver: 0xF9DCEC77 - sceBtPushBipForDriver: 0x7FF77792 - sceBtPushOppForDriver: 0x21C788E2 - sceBtReadEventForDriver: 0x5ABB9A9D - sceBtRecvAudioForDriver: 0xCD7C0492 - sceBtRecvBipForDriver: 0xE8E95977 - sceBtRecvOppForDriver: 0x8008AA2C - sceBtRecvSppForDriver: 0xC09D9E7C - sceBtRegisterCallbackForDriver: 0x120AC1F7 - sceBtReplyPinCodeForDriver: 0xBB69A62A - sceBtReplyUserConfirmationForDriver: 0xB5FA291C - sceBtSendAudioForDriver: 0x47F19727 - sceBtSendL2capEchoRequestForTestForDriver: 0xE3A66814 - sceBtSendSppForDriver: 0x92241DFB - sceBtSetConfigurationForDriver: 0xEBDCC992 - sceBtSetContentProtectionForDriver: 0x8632086 - sceBtSetInquiryResultForTestForDriver: 0x1C26F878 - sceBtSetInquiryScanForDriver: 0x4F5A852E - sceBtSetL2capEchoResponseBufferForTestForDriver: 0xB7D8E0E - sceBtSetStatusForTestForDriver: 0x9C195411 - sceBtStartAudioForDriver: 0x8D47CABD - sceBtStartConnectForDriver: 0x6059113A - sceBtStartDisconnectForDriver: 0x50710281 - sceBtStartInquiryForDriver: 0x9DC7E7E5 - sceBtStopAudioForDriver: 0xCAE5A9F3 - sceBtStopInquiryForDriver: 0x6A1D9598 - sceBtUnregisterCallbackForDriver: 0xBF72E1BE + ksceBtAvrcpReadVolume: 0xC9C70056 + ksceBtAvrcpSendButton: 0xEC5F8519 + ksceBtAvrcpSendVolume: 0x7689DA3D + ksceBtAvrcpSetPlayStatus: 0xC5E7349C + ksceBtAvrcpSetTitle: 0x91EF55AD + ksceBtDeleteRegisteredInfo: 0xE6F659E0 + ksceBtFreqAudio: 0xDA20DCC8 + ksceBtGetConfiguration: 0x94C66A3B + ksceBtGetConnectingInfo: 0xE9936446 + ksceBtGetDeviceName: 0x633F784C + ksceBtGetInfoForTest: 0x2C9DD7BB + ksceBtGetLastError: 0xAD31A43E + ksceBtGetRegisteredInfo: 0xF86D25E2 + ksceBtGetStatusForTest: 0x83781649 + ksceBtGetVidPid: 0x780A5557 + ksceBtHfpGetCurrentPhoneNumber: 0x7BC66D6D + ksceBtHfpRequest: 0x6E49D11D + ksceBtHidGetReportDescriptor: 0x6CB4ABA + ksceBtHidTransfer: 0xF9DCEC77 + ksceBtPushBip: 0x7FF77792 + ksceBtPushOpp: 0x21C788E2 + ksceBtReadEvent: 0x5ABB9A9D + ksceBtRecvAudio: 0xCD7C0492 + ksceBtRecvBip: 0xE8E95977 + ksceBtRecvOpp: 0x8008AA2C + ksceBtRecvSpp: 0xC09D9E7C + ksceBtRegisterCallback: 0x120AC1F7 + ksceBtReplyPinCode: 0xBB69A62A + ksceBtReplyUserConfirmation: 0xB5FA291C + ksceBtSendAudio: 0x47F19727 + ksceBtSendL2capEchoRequestForTest: 0xE3A66814 + ksceBtSendSpp: 0x92241DFB + ksceBtSetConfiguration: 0xEBDCC992 + ksceBtSetContentProtection: 0x8632086 + ksceBtSetInquiryResultForTest: 0x1C26F878 + ksceBtSetInquiryScan: 0x4F5A852E + ksceBtSetL2capEchoResponseBufferForTest: 0xB7D8E0E + ksceBtSetStatusForTest: 0x9C195411 + ksceBtStartAudio: 0x8D47CABD + ksceBtStartConnect: 0x6059113A + ksceBtStartDisconnect: 0x50710281 + ksceBtStartInquiry: 0x9DC7E7E5 + ksceBtStopAudio: 0xCAE5A9F3 + ksceBtStopInquiry: 0x6A1D9598 + ksceBtUnregisterCallback: 0xBF72E1BE kernel: true nid: 0xD48CA62D SceCamera: @@ -1608,90 +1608,90 @@ modules: kernel: true nid: 0x6F25E18A functions: - sceKernelMemcpyKernelToUser: 0x6D88EF8A - sceKernelMemcpyUserToKernel: 0xBC996A7A - sceKernelStrncpyKernelToUser: 0x80BD6FEB - sceKernelStrncpyUserToKernel: 0xDB3EC244 - sceKernelStrlenUser: 0xB429D419 - sceKernelGetPaddr: 0x8D160E65 - sceKernelGetPaddrList: 0xE68BEEBD - sceKernelGetMemBlockBaseForDriver: 0xA841EDDA - sceKernelFindMemBlockByAddrForDriver: 0x8A1742F6 - sceKernelRemapBlock: 0xDFE2C8CB - sceKernelMemPoolCreate: 0x9328E0E8 - sceKernelMemPoolDestroy: 0xD6437637 - sceKernelMemPoolAlloc: 0x7B4CB60A - sceKernelMemPoolFree: 0x3EBCE343 - sceKernelMapUserBlock: 0x7D4F8B5F - sceKernelSwitchVmaForPid: 0x6F2ACDAE - sceKernelRoMemcpyKernelToUserForPid: 0x571D2739 - sceKernelFirstDifferentIntUserForPid: 0x8334454F - sceKernelStrnlenUserForPid: 0x9929EB07 - sceKernelStrncpyUserForPid: 0x75AAF178 - sceKernelMemcpyKernelToUserForPidUnchecked: 0xFED82F2D - sceKernelMemcpyKernelToUserForPid: 0x6B825479 - sceKernelMemcpyUserToKernelForPid: 0x605275F8 - sceKernelMemcpyUserToUserForPid: 0x8E086C33 - sceKernelKernelUidForUserUid: 0x45D22597 - sceKernelCreateUserUid: 0xBF209859 - sceKernelGetObjForUid: 0xED6C14 - sceKernelGetUidClass: 0x85336A1C - sceKernelCreateClass: 0x61317102 - sceKernelDeleteUid: 0x47D32F2 - sceKernelDeleteUserUid: 0x84A4AF5E - sceKernelAllocMemBlockForKernel: 0xC94850C9 - sceKernelGetMemBlockBaseForKernel: 0xA841EDDA - sceKernelFreeMemBlockForKernel: 0x9E1C61 - sceKernelGetPidContext: 0x2ECF7944 - sceKernelMapBlockUserVisible: 0x58D21746 + ksceKernelMemcpyKernelToUser: 0x6D88EF8A + ksceKernelMemcpyUserToKernel: 0xBC996A7A + ksceKernelStrncpyKernelToUser: 0x80BD6FEB + ksceKernelStrncpyUserToKernel: 0xDB3EC244 + ksceKernelStrlenUser: 0xB429D419 + ksceKernelGetPaddr: 0x8D160E65 + ksceKernelGetPaddrList: 0xE68BEEBD + ksceKernelGetMemBlockBase: 0xA841EDDA + ksceKernelFindMemBlockByAddr: 0x8A1742F6 + ksceKernelRemapBlock: 0xDFE2C8CB + ksceKernelMemPoolCreate: 0x9328E0E8 + ksceKernelMemPoolDestroy: 0xD6437637 + ksceKernelMemPoolAlloc: 0x7B4CB60A + ksceKernelMemPoolFree: 0x3EBCE343 + ksceKernelMapUserBlock: 0x7D4F8B5F + ksceKernelSwitchVmaForPid: 0x6F2ACDAE + ksceKernelRoMemcpyKernelToUserForPid: 0x571D2739 + ksceKernelFirstDifferentIntUserForPid: 0x8334454F + ksceKernelStrnlenUserForPid: 0x9929EB07 + ksceKernelStrncpyUserForPid: 0x75AAF178 + ksceKernelMemcpyKernelToUserForPidUnchecked: 0xFED82F2D + ksceKernelMemcpyKernelToUserForPid: 0x6B825479 + ksceKernelMemcpyUserToKernelForPid: 0x605275F8 + ksceKernelMemcpyUserToUserForPid: 0x8E086C33 + ksceKernelKernelUidForUserUid: 0x45D22597 + ksceKernelCreateUserUid: 0xBF209859 + ksceKernelGetObjForUid: 0xED6C14 + ksceKernelGetUidClass: 0x85336A1C + ksceKernelCreateClass: 0x61317102 + ksceKernelDeleteUid: 0x47D32F2 + ksceKernelDeleteUserUid: 0x84A4AF5E + ksceKernelAllocMemBlock: 0xC94850C9 + ksceKernelGetMemBlockBase: 0xA841EDDA + ksceKernelFreeMemBlock: 0x9E1C61 + ksceKernelGetPidContext: 0x2ECF7944 + ksceKernelMapBlockUserVisible: 0x58D21746 SceSysmemForKernel: kernel: true nid: 0x63A519E5 functions: - sceKernelCreateUidObj: 0xDF0288D7 - sceKernelRxMemcpyKernelToUserForPid: 0x30931572 + ksceKernelCreateUidObj: 0xDF0288D7 + ksceKernelRxMemcpyKernelToUserForPid: 0x30931572 SceSysclibForDriver: kernel: true nid: 0x7EE45391 functions: - memcpy: 0x40C88316 - memset: 0xAB9BF5C - strchr: 0x38463759 - strncmp: 0x12CEE649 - strcmp: 0xB33BC43 - strstr: 0x1304A69D - rshift: 0x1D89F6C0 - strrchr: 0x7F0E0835 - strncat: 0xA1D1C32C - strtol: 0xAB77C5AA - snprintf: 0xAE7A8981 - sceKernelStackCheckFail: 0xB997493D - strnlen: 0xCD4BD884 - strlen: 0xCFC6A9AC - memcmp: 0xF939E83D + kmemcpy: 0x40C88316 + kmemset: 0xAB9BF5C + kstrchr: 0x38463759 + kstrncmp: 0x12CEE649 + kstrcmp: 0xB33BC43 + kstrstr: 0x1304A69D + krshift: 0x1D89F6C0 + kstrrchr: 0x7F0E0835 + kstrncat: 0xA1D1C32C + kstrtol: 0xAB77C5AA + ksnprintf: 0xAE7A8981 + ksceKernelStackCheckFail: 0xB997493D + kstrnlen: 0xCD4BD884 + kstrlen: 0xCFC6A9AC + kmemcmp: 0xF939E83D SceCpuForKernel: kernel: true nid: 0x54BF2BAB functions: - sceKernelCpuSaveContext: 0x211B89DA - sceKernelCpuRestoreContext: 0xA4F0FB9 - sceKernelCpuIcacheAndL2Flush: 0x19F17BD0 - sceKernelCpuUnrestrictedMemcpy: 0x8C683DEC - sceKernelCpuDcacheFlush: 0x6BA2E51C + ksceKernelCpuSaveContext: 0x211B89DA + ksceKernelCpuRestoreContext: 0xA4F0FB9 + ksceKernelCpuIcacheAndL2Flush: 0x19F17BD0 + ksceKernelCpuUnrestrictedMemcpy: 0x8C683DEC + ksceKernelCpuDcacheFlush: 0x6BA2E51C SceCpuForDriver: kernel: true nid: 0x40ECDB0E functions: - sceKernelCpuDisableInterrupts: 0x821FC0EE - sceKernelCpuEnableInterrupts: 0xF5BAD43B - sceKernelCpuDcacheAndL2AndDMAFlush: 0x364E68A4 - sceKernelCpuDcacheAndL2Flush: 0x9CB9F0CE + ksceKernelCpuDisableInterrupts: 0x821FC0EE + ksceKernelCpuEnableInterrupts: 0xF5BAD43B + ksceKernelCpuDcacheAndL2AndDMAFlush: 0x364E68A4 + ksceKernelCpuDcacheAndL2Flush: 0x9CB9F0CE SceSysrootForKernel: kernel: true nid: 0x3691DA45 functions: - sceKernelGetSysrootBuffer: 0x3E455842 - sceKernelGetProcessTitleIdForKernel: 0xEC3124A3 + ksceKernelGetSysrootBuffer: 0x3E455842 + ksceKernelGetProcessTitleId: 0xEC3124A3 SceSysmem: functions: sceKernelAllocMemBlock: 0xB9D5EBDE @@ -1718,27 +1718,27 @@ modules: kernel: true nid: 0xA8CA0EFD functions: - sceKernelCreateMutexForKernel: 0xFBAA026E - sceKernelDeleteMutexForKernel: 0xA912340 - sceKernelLockMutexForKernel: 0x16AC80C5 - sceKernelUnlockMutexForKernel: 0x1E82E5D0 - sceKernelRunWithStack: 0xE54FD746 + ksceKernelCreateMutex: 0xFBAA026E + ksceKernelDeleteMutex: 0xA912340 + ksceKernelLockMutex: 0x16AC80C5 + ksceKernelUnlockMutex: 0x1E82E5D0 + ksceKernelRunWithStack: 0xE54FD746 SceThreadmgrForDriver: kernel: true nid: 0xE2C40624 functions: - sceKernelCreateCallbackForDriver: 0x1C41614C - sceKernelCreateEventFlagForDriver: 0x4336BAA4 - sceKernelCreateThreadForDriver: 0xC6674E7D - sceKernelDelayThreadForDriver: 0x4B675D05 - sceKernelDelayThreadCBForDriver: 0x9C0180E1 - sceKernelDeleteCallbackForDriver: 0x3A7E17F6 - sceKernelDeleteThreadForDriver: 0xAC834F3F - sceKernelGetProcessId: 0x9DCB4B7A - sceKernelGetSystemTimeWideForDriver: 0xF4EE4FA9 - sceKernelStartThreadForDriver: 0x21F5419B - sceKernelWaitEventFlagCBForDriver: 0x8A35F714 - sceKernelWaitThreadEndForDriver: 0x3E20216F + ksceKernelCreateCallback: 0x1C41614C + ksceKernelCreateEventFlag: 0x4336BAA4 + ksceKernelCreateThread: 0xC6674E7D + ksceKernelDelayThread: 0x4B675D05 + ksceKernelDelayThreadCB: 0x9C0180E1 + ksceKernelDeleteCallback: 0x3A7E17F6 + ksceKernelDeleteThread: 0xAC834F3F + ksceKernelGetProcessId: 0x9DCB4B7A + ksceKernelGetSystemTimeWide: 0xF4EE4FA9 + ksceKernelStartThread: 0x21F5419B + ksceKernelWaitEventFlagCB: 0x8A35F714 + ksceKernelWaitThreadEnd: 0x3E20216F SceThreadmgr: functions: sceKernelCancelCallback: 0x30741EF2 @@ -1842,26 +1842,26 @@ modules: kernel: true nid: 0xC445FA63 functions: - sceKernelGetModuleListForKernel: 0x97CF7B4E - sceKernelGetModuleInternal: 0xFE303863 - sceKernelGetModuleInfoForKernel: 0xD269F915 - sceKernelLoadModuleForPid: 0xFA21D8CB - sceKernelStopModuleForPid: 0x7BB4CE54 - sceKernelUnloadModuleForPid: 0x5972E2CC + ksceKernelGetModuleList: 0x97CF7B4E + ksceKernelGetModuleInternal: 0xFE303863 + ksceKernelGetModuleInfo: 0xD269F915 + ksceKernelLoadModuleForPid: 0xFA21D8CB + ksceKernelStopModuleForPid: 0x7BB4CE54 + ksceKernelUnloadModuleForPid: 0x5972E2CC SceModulemgrForDriver: kernel: true nid: 0xD4A60A52 functions: - sceKernelGetSystemSwVersion: 0x5182E212 - sceKernelLoadStartModuleForDriver: 0x189BFBBB - sceKernelLoadModuleForDriver: 0x86D8D634 - sceKernelStartModuleForDriver: 0x675B682 - sceKernelStopModuleForDriver: 0x100DAEB9 - sceKernelStopUnloadModuleForDriver: 0x3B30B7E - sceKernelUnloadModuleForDriver: 0x728E72A6 - sceKernelLoadStartSharedModuleForPid: 0xE2ADEF8D - sceKernelLoadStartModuleForPid: 0x9D953C22 - sceKernelStopUnloadModuleForPid: 0x49A3EDC7 + ksceKernelGetSystemSwVersion: 0x5182E212 + ksceKernelLoadStartModule: 0x189BFBBB + ksceKernelLoadModule: 0x86D8D634 + ksceKernelStartModule: 0x675B682 + ksceKernelStopModule: 0x100DAEB9 + ksceKernelStopUnloadModule: 0x3B30B7E + ksceKernelUnloadModule: 0x728E72A6 + ksceKernelLoadStartSharedModuleForPid: 0xE2ADEF8D + ksceKernelLoadStartModuleForPid: 0x9D953C22 + ksceKernelStopUnloadModuleForPid: 0x49A3EDC7 SceModulemgr: functions: sceKernelGetModuleIdByAddr: 0xF5798C7C @@ -1877,19 +1877,19 @@ modules: kernel: true nid: 0x40FD29C7 functions: - sceIoDevctlForDriver: 0x16882FC4 - sceIoDreadForDriver: 0x20CF5FC7 - sceIoWriteForDriver: 0x21EE91F0 - sceIoDopenForDriver: 0x463B25CC - sceIoLseekForDriver: 0x62090481 - sceIoOpenForDriver: 0x75192972 - sceIoChstatForDriver: 0x7D42B8DC - sceIoGetstatForDriver: 0x75C96D25 - sceIoMkdirForDriver: 0x7F710B25 - sceIoReadForDriver: 0xE17EFC03 - sceIoCloseForDriver: 0xF99DD8A3 - sceIoRenameForDriver: 0xDC0C4997 - sceIoRemoveForDriver: 0x0D7BB3E1 + ksceIoDevctl: 0x16882FC4 + ksceIoDread: 0x20CF5FC7 + ksceIoWrite: 0x21EE91F0 + ksceIoDopen: 0x463B25CC + ksceIoLseek: 0x62090481 + ksceIoOpen: 0x75192972 + ksceIoChstat: 0x7D42B8DC + ksceIoGetstat: 0x75C96D25 + ksceIoMkdir: 0x7F710B25 + ksceIoRead: 0xE17EFC03 + ksceIoClose: 0xF99DD8A3 + ksceIoRename: 0xDC0C4997 + ksceIoRemove: 0x0D7BB3E1 SceIofilemgr: functions: sceIoCancel: 0xCEF48835 @@ -1942,7 +1942,7 @@ modules: kernel: true nid: 0x7A69DE86 functions: - sceKernelGetProcessKernelBuf: 0xB9E68092 + ksceKernelGetProcessKernelBuf: 0xB9E68092 SceLibKernel: nid: 0x48 libraries: @@ -3076,16 +3076,16 @@ modules: kernel: true nid: 0xB2A5C920 functions: - sceNetSocketForDriver: 0xEB95B024 - sceNetAcceptForDriver: 0x880A5423 - sceNetBindForDriver: 0x84AB650F - sceNetListenForDriver: 0x80C7992 - sceNetRecvForDriver: 0x49B1669C - sceNetRecvfromForDriver: 0x49B1669C - sceNetSendForDriver: 0xAB746734 - sceNetSendtoForDriver: 0xAB746734 - sceNetSetsockoptForDriver: 0x4BF5FAB4 - sceNetSocketCloseForDriver: 0x21F4428D + ksceNetSocket: 0xEB95B024 + ksceNetAccept: 0x880A5423 + ksceNetBind: 0x84AB650F + ksceNetListen: 0x80C7992 + ksceNetRecv: 0x49B1669C + ksceNetRecvfrom: 0x49B1669C + ksceNetSend: 0xAB746734 + ksceNetSendto: 0xAB746734 + ksceNetSetsockopt: 0x4BF5FAB4 + ksceNetSocketClose: 0x21F4428D SceNetAdhocMatching: nid: 0x6B libraries: @@ -4989,7 +4989,7 @@ modules: kernel: true nid: 0x88758561 functions: - printf: 0x391B74B7 + kprintf: 0x391B74B7 SceSblSsMgr: nid: 0xFDDD93FA libraries: @@ -4997,7 +4997,7 @@ modules: kernel: true nid: 0x61E9428D functions: - sceKernelGetRandomNumberForDriver: 0x4F9BFBE5 + ksceKernelGetRandomNumber: 0x4F9BFBE5 SceSblACMgr: nid: 0xB6E5AEBE libraries: @@ -5005,10 +5005,10 @@ modules: kernel: true nid: 0x9AD8E213 functions: - sceSblACMgrIsShell: 0x8612B243 - sceSblACMgrIsGameProgram: 0x1298C647 - sceSblACMgrIsNonGameProgram: 0x6C5AB07F - sceSblACMgrIsDevelopmentMode: 0xE87D1777 + ksceSblACMgrIsShell: 0x8612B243 + ksceSblACMgrIsGameProgram: 0x1298C647 + ksceSblACMgrIsNonGameProgram: 0x6C5AB07F + ksceSblACMgrIsDevelopmentMode: 0xE87D1777 SceUsbSerial: nid: 0xF8D9930F libraries: @@ -5016,13 +5016,13 @@ modules: kernel: true nid: 0x8829C2F3 functions: - sceUsbSerialStartForKernel: 0xFEE7F4BA - sceUsbSerialSetupForKernel: 0x590B8F97 - sceUsbSerialStatusForKernel: 0x8C426906 - sceUsbSerialCloseForKernel: 0xE6B1E64F - sceUsbSerialGetRecvBufferSizeForKernel: 0xF531B5AE - sceUsbSerialSendForKernel: 0xC2E73C0 - sceUsbSerialRecvForKernel: 0x6B5E296F + ksceUsbSerialStart: 0xFEE7F4BA + ksceUsbSerialSetup: 0x590B8F97 + ksceUsbSerialStatus: 0x8C426906 + ksceUsbSerialClose: 0xE6B1E64F + ksceUsbSerialGetRecvBufferSize: 0xF531B5AE + ksceUsbSerialSend: 0xC2E73C0 + ksceUsbSerialRecv: 0x6B5E296F SceUsbSerial: kernel: false nid: 0x2820117D diff --git a/include/psp2kern/bt.h b/include/psp2kern/bt.h new file mode 100644 index 000000000..b6a9d479e --- /dev/null +++ b/include/psp2kern/bt.h @@ -0,0 +1,334 @@ +/** + * \file + * \brief Header file Which defines USB Serial related functions + * + * Copyright (C) 2016 PSP2SDK Project + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +#ifndef _PSP2_KERNEL_BT_H_ +#define _PSP2_KERNEL_BT_H_ + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +#define SCE_BT_ERROR_ACL_TX_BUF_OVERFLOW 0x802f0b03 +#define SCE_BT_ERROR_ACL_TX_CB_OVERFLOW 0x802f0b04 +#define SCE_BT_ERROR_ATT_APPLICATION_ERROR_HI 0x802f23ff +#define SCE_BT_ERROR_ATT_APPLICATION_ERROR_LO 0x802f2380 +#define SCE_BT_ERROR_ATT_ATTRIBUTE_NOT_FOUND 0x802f230a +#define SCE_BT_ERROR_ATT_ATTRIBUTE_NOT_LONG 0x802f230b +#define SCE_BT_ERROR_ATT_BASE 0x802f2300 +#define SCE_BT_ERROR_ATT_INSUFFICIENT_AUTHENTICATION 0x802f2305 +#define SCE_BT_ERROR_ATT_INSUFFICIENT_AUTHORIZATION 0x802f2308 +#define SCE_BT_ERROR_ATT_INSUFFICIENT_ENCRYPTION 0x802f230f +#define SCE_BT_ERROR_ATT_INSUFFICIENT_ENCRYPTION_KEY_SIZE 0x802f230c +#define SCE_BT_ERROR_ATT_INSUFFICIENT_RESOURCES 0x802f2311 +#define SCE_BT_ERROR_ATT_INVALID_ATTRIBUTE_VALUE_LENGTH 0x802f230d +#define SCE_BT_ERROR_ATT_INVALID_HANDLE 0x802f2301 +#define SCE_BT_ERROR_ATT_INVALID_OFFSET 0x802f2307 +#define SCE_BT_ERROR_ATT_INVALID_PDU 0x802f2304 +#define SCE_BT_ERROR_ATT_NOT_YET 0x802f2a07 +#define SCE_BT_ERROR_ATT_PEPARE_QUEUE_FULL 0x802f2309 +#define SCE_BT_ERROR_ATT_READ_INVALID_INTERNAL 0x802f2a03 +#define SCE_BT_ERROR_ATT_READ_INVALID_LENGTH 0x802f2a02 +#define SCE_BT_ERROR_ATT_READ_INVALID_NO 0x802f2a01 +#define SCE_BT_ERROR_ATT_READ_NOT_PERMITTED 0x802f2302 +#define SCE_BT_ERROR_ATT_REQUEST_NOT_SUPPORTED 0x802f2306 +#define SCE_BT_ERROR_ATT_UNLIKELY_ERROR 0x802f230e +#define SCE_BT_ERROR_ATT_UNSUPPORTED_GROUP_TYPE 0x802f2310 +#define SCE_BT_ERROR_ATT_WRITE_INVALID_INTERNAL 0x802f2a06 +#define SCE_BT_ERROR_ATT_WRITE_INVALID_LENGTH 0x802f2a05 +#define SCE_BT_ERROR_ATT_WRITE_INVALID_NO 0x802f2a04 +#define SCE_BT_ERROR_ATT_WRITE_NOT_PERMITTED 0x802f2303 +#define SCE_BT_ERROR_AUDIO_COMBI_NOT_FOUND 0x802f0d16 +#define SCE_BT_ERROR_AUDIO_FREQ_IS_LE 0x802f2209 +#define SCE_BT_ERROR_AUDIO_FREQ_NOT_CONNECTED 0x802f0d0f +#define SCE_BT_ERROR_AUDIO_INTERNAL_1 0x802f0d18 +#define SCE_BT_ERROR_AUDIO_RECV_BAD_TYPE 0x802f0d12 +#define SCE_BT_ERROR_AUDIO_RECV_BUSY 0x802f0d1a +#define SCE_BT_ERROR_AUDIO_RECV_INVALID_LENGTH 0x802f0d0a +#define SCE_BT_ERROR_AUDIO_RECV_IS_LE 0x802f2208 +#define SCE_BT_ERROR_AUDIO_RECV_NO_CAP 0x802f0d1d +#define SCE_BT_ERROR_AUDIO_RECV_NOT_CONNECTED 0x802f0d08 +#define SCE_BT_ERROR_AUDIO_RECV_NOT_STARTED 0x802f0d09 +#define SCE_BT_ERROR_AUDIO_RECV_SERV_FAILED 0x802f0d1e +#define SCE_BT_ERROR_AUDIO_SEND_BAD_TYPE 0x802f0d11 +#define SCE_BT_ERROR_AUDIO_SEND_BUSY 0x802f0d19 +#define SCE_BT_ERROR_AUDIO_SEND_INVALID_LENGTH 0x802f0d07 +#define SCE_BT_ERROR_AUDIO_SEND_IS_LE 0x802f2207 +#define SCE_BT_ERROR_AUDIO_SEND_NO_CAP 0x802f0d1b +#define SCE_BT_ERROR_AUDIO_SEND_NO_CP 0x802f0d10 +#define SCE_BT_ERROR_AUDIO_SEND_NO_L2C 0x802f0d17 +#define SCE_BT_ERROR_AUDIO_SEND_NOT_CONNECTED 0x802f0d05 +#define SCE_BT_ERROR_AUDIO_SEND_NOT_STARTED 0x802f0d06 +#define SCE_BT_ERROR_AUDIO_SEND_SERV_FAILED 0x802f0d1c +#define SCE_BT_ERROR_AUDIO_START_INVALID_SERV 0x802f0d0b +#define SCE_BT_ERROR_AUDIO_START_IS_LE 0x802f2205 +#define SCE_BT_ERROR_AUDIO_START_NO_CAP 0x802f0d02 +#define SCE_BT_ERROR_AUDIO_START_NOT_CONNECTED 0x802f0d01 +#define SCE_BT_ERROR_AUDIO_START_SERV_FAILED 0x802f0d0d +#define SCE_BT_ERROR_AUDIO_STOP_INVALID_SERV 0x802f0d0c +#define SCE_BT_ERROR_AUDIO_STOP_IS_LE 0x802f2206 +#define SCE_BT_ERROR_AUDIO_STOP_NO_CAP 0x802f0d04 +#define SCE_BT_ERROR_AUDIO_STOP_NOT_CONNECTED 0x802f0d03 +#define SCE_BT_ERROR_AUDIO_STOP_SERV_FAILED 0x802f0d0e +#define SCE_BT_ERROR_AVCTP_CLOSE_NO_L2C 0x802f0602 +#define SCE_BT_ERROR_AVCTP_IS_LE 0x802f2203 +#define SCE_BT_ERROR_AVCTP_NOT_CONNECTED 0x802f0604 +#define SCE_BT_ERROR_AVCTP_OPEN_NO_L2C 0x802f0601 +#define SCE_BT_ERROR_AVCTP_READ_NO_VOLUME 0x802f0608 +#define SCE_BT_ERROR_AVCTP_SEND_BUSY 0x802f0605 +#define SCE_BT_ERROR_AVCTP_SEND_NO_L2C 0x802f0603 +#define SCE_BT_ERROR_AVCTP_SEND_NO_PRESS 0x802f0606 +#define SCE_BT_ERROR_AVCTP_SEND_NO_RELEASE 0x802f0607 +#define SCE_BT_ERROR_AVCTP_SEND_NOT_RUBY 0x802f0609 +#define SCE_BT_ERROR_AVDTP_CLOSE_BAD_SERV 0x802f0502 +#define SCE_BT_ERROR_AVDTP_CLOSE_BAD_STATE 0x802f0503 +#define SCE_BT_ERROR_AVDTP_OPEN_NO_L2C 0x802f0501 +#define SCE_BT_ERROR_AVDTP_RECONF_BAD_SERV 0x802f0509 +#define SCE_BT_ERROR_AVDTP_RECONF_BAD_STATE 0x802f050a +#define SCE_BT_ERROR_AVDTP_SEND_BAD_STATE 0x802f0508 +#define SCE_BT_ERROR_AVDTP_START_BAD_SERV 0x802f0504 +#define SCE_BT_ERROR_AVDTP_START_BAD_STATE 0x802f0505 +#define SCE_BT_ERROR_AVDTP_STOP_BAD_SERV 0x802f0506 +#define SCE_BT_ERROR_AVDTP_STOP_BAD_STATE 0x802f0507 +#define SCE_BT_ERROR_AVRCP_INVALID_PLAY_STATUS 0x802f1202 +#define SCE_BT_ERROR_AVRCP_TOO_LONG_TITLE 0x802f1201 +#define SCE_BT_ERROR_CB_NOT_REGISTERED 0x802f0c03 +#define SCE_BT_ERROR_CB_OVERFLOW 0x802f0c04 +#define SCE_BT_ERROR_CB_TOO_MANY 0x802f0c02 +#define SCE_BT_ERROR_CONF_BT_INACTIVE 0x802f1503 +#define SCE_BT_ERROR_CONF_CANT_DISABLE_FUNCTION 0x802f1508 +#define SCE_BT_ERROR_CONF_CANT_ENABLE_FUNCTION 0x802f1507 +#define SCE_BT_ERROR_CONF_CANT_ENTER 0x802f1520 +#define SCE_BT_ERROR_CONF_CARD_NOT_FOUND 0x802f1505 +#define SCE_BT_ERROR_CONF_DISABLE_SUBINTR 0x802f150c +#define SCE_BT_ERROR_CONF_ENABLE_SUBINTR 0x802f150b +#define SCE_BT_ERROR_CONF_FUNCTION_NOT_FOUND 0x802f1506 +#define SCE_BT_ERROR_CONF_INVALID_VALUE 0x802f1502 +#define SCE_BT_ERROR_CONF_NOT_READY 0x802f1501 +#define SCE_BT_ERROR_CONF_OFF_TIMEOUT 0x802f150e +#define SCE_BT_ERROR_CONF_ON_TIMEOUT 0x802f150d +#define SCE_BT_ERROR_CONF_REGISTER_SUBINTR_HANDLER 0x802f1509 +#define SCE_BT_ERROR_CONF_RELEASE_SUBINTR_HANDLER 0x802f150a +#define SCE_BT_ERROR_CONF_SUSPEND_TIMEOUT 0x802f150f +#define SCE_BT_ERROR_CONF_TIMEOUT 0x802f1504 +#define SCE_BT_ERROR_CONNECT_START_BUSY 0x802f0204 +#define SCE_BT_ERROR_CONNECT_START_CONNECTED 0x802f020a +#define SCE_BT_ERROR_CONNECT_START_DELETING 0x802f020e +#define SCE_BT_ERROR_CONNECT_START_IS_LE 0x802f2202 +#define SCE_BT_ERROR_CONNECT_START_NO_REG 0x802f0202 +#define SCE_BT_ERROR_CONNECT_START_NOT_CONNECTABLE 0x802f0203 +#define SCE_BT_ERROR_CONNECT_START_REG_FULL 0x802f0209 +#define SCE_BT_ERROR_CONNECT_START_TOO_MANY 0x802f020d +#define SCE_BT_ERROR_COPYIN_FAILED 0x802f0b09 +#define SCE_BT_ERROR_COPYOUT_FAILED 0x802f0b0a +#define SCE_BT_ERROR_DISCONNECT_START_NOT_CONNECTED 0x802f0205 +#define SCE_BT_ERROR_GATT_BUSY 0x802f2403 +#define SCE_BT_ERROR_GATT_DISCONNECT 0x802f240a +#define SCE_BT_ERROR_GATT_ENTER 0x802f240c +#define SCE_BT_ERROR_GATT_INVALID_FLAGS 0x802f2405 +#define SCE_BT_ERROR_GATT_INVALID_HANDLE 0x802f2404 +#define SCE_BT_ERROR_GATT_INVALID_NO 0x802f2401 +#define SCE_BT_ERROR_GATT_INVALID_SIZE 0x802f2406 +#define SCE_BT_ERROR_GATT_NOT_CONNECTED 0x802f2402 +#define SCE_BT_ERROR_GATT_NOT_LE 0x802f2407 +#define SCE_BT_ERROR_GATT_NOT_YET 0x802f2409 +#define SCE_BT_ERROR_GATT_TOO_BIG_BUFFER 0x802f240d +#define SCE_BT_ERROR_GATT_TOO_BIG_RECORD 0x802f2408 +#define SCE_BT_ERROR_GATT_TSLEEP 0x802f240b +#define SCE_BT_ERROR_GET_DEBUG_INFO_INVALID_ARGUMENT 0x802f2105 +#define SCE_BT_ERROR_GET_DEBUG_INFO_INVALID_REQUEST 0x802f2101 +#define SCE_BT_ERROR_GET_DEBUG_INFO_INVALID_SIZE 0x802f2103 +#define SCE_BT_ERROR_GET_DEBUG_INFO_INVALID_STATE 0x802f2107 +#define SCE_BT_ERROR_GET_DEBUG_INFO_NOT_CONNECTED 0x802f2109 +#define SCE_BT_ERROR_GET_JACK_STATUS_NOT_CONNECTED 0x802f3301 +#define SCE_BT_ERROR_GET_NAME_NO_DEVICE 0x802f0c01 +#define SCE_BT_ERROR_HCI_TX_OVERFLOW 0x802f0b02 +#define SCE_BT_ERROR_HID_CLOSE_NO_L2C 0x802f0902 +#define SCE_BT_ERROR_HID_INVALID_BUFFER_ADDRESS 0x802f0907 +#define SCE_BT_ERROR_HID_INVALID_IDLE 0x802f0909 +#define SCE_BT_ERROR_HID_INVALID_LENGTH 0x802f090d +#define SCE_BT_ERROR_HID_INVALID_PROTOCOL 0x802f0908 +#define SCE_BT_ERROR_HID_INVALID_REPORT_ID 0x802f090e +#define SCE_BT_ERROR_HID_INVALID_REQUEST_TYPE 0x802f0906 +#define SCE_BT_ERROR_HID_IS_LE 0x802f2204 +#define SCE_BT_ERROR_HID_NO_CAP 0x802f0905 +#define SCE_BT_ERROR_HID_NOT_CONNECTED 0x802f0904 +#define SCE_BT_ERROR_HID_NOT_YET 0x802f090c +#define SCE_BT_ERROR_HID_OPEN_NO_L2C 0x802f0901 +#define SCE_BT_ERROR_HID_OVERWRITE_REQ 0x802f090f +#define SCE_BT_ERROR_HID_RECV_INVALID_LENGTH 0x802f0e02 +#define SCE_BT_ERROR_HID_RECV_NOT_CONNECTED 0x802f0e01 +#define SCE_BT_ERROR_HID_SEND_NO_L2C 0x802f0903 +#define SCE_BT_ERROR_INQUIRY_START_BUSY 0x802f0201 +#define SCE_BT_ERROR_JEDI_SNIFF_NOT_CONNECTED 0x802f3601 +#define SCE_BT_ERROR_JEDI_SNIFF_NOT_JEDI 0x802f3602 +#define SCE_BT_ERROR_JEDI_VOLUME_GAIN_NOT_CONNECTED 0x802f3501 +#define SCE_BT_ERROR_JUMBO_UNLOCK_NOT_OWNER 0x802f0b01 +#define SCE_BT_ERROR_KPROC_CREATE 0x802f2002 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_BUSY 0x802f290d +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_CONNECTED 0x802f290b +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_FULL 0x802f290c +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_INTERVAL_MAX 0x802f2906 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_INTERVAL_MIN 0x802f2905 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_LATENCY 0x802f2907 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_OWN_ADDRESS_TYPE 0x802f2904 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_PEER_ADDRESS 0x802f2903 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_SCAN_INTERVAL 0x802f2901 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_SCAN_WINDOW 0x802f2902 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_INVALID_TIMEOUT 0x802f2908 +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_REG_ERROR 0x802f290a +#define SCE_BT_ERROR_LE_CREATE_CONNECTION_REG_FULL 0x802f2909 +#define SCE_BT_ERROR_LE_GET_ADVERTISING_NOT_FOUND 0x802f2801 +#define SCE_BT_ERROR_LE_NOT_SUPPORTED 0x802f2b01 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_DIRECT_ADDRESS 0x802f2607 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_DIRECT_ADDRESS_TYPE 0x802f2606 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_INTERVAL_MAX 0x802f2604 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_INTERVAL_MIN 0x802f2603 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_LENGTH 0x802f2602 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_OWN_ADDRESS_TYPE 0x802f2605 +#define SCE_BT_ERROR_LE_SET_ADVERTISING_INVALID_REQ 0x802f2601 +#define SCE_BT_ERROR_LE_SET_SCAN_INVALID_INTERVAL 0x802f2703 +#define SCE_BT_ERROR_LE_SET_SCAN_INVALID_LENGTH 0x802f2702 +#define SCE_BT_ERROR_LE_SET_SCAN_INVALID_OWN_ADDRESS_TYPE 0x802f2705 +#define SCE_BT_ERROR_LE_SET_SCAN_INVALID_REQ 0x802f2701 +#define SCE_BT_ERROR_LE_SET_SCAN_INVALID_WINDOW 0x802f2704 +#define SCE_BT_ERROR_NOT_READY 0x802f3201 +#define SCE_BT_ERROR_NOT_SUPPORTED_DEVICE 0x802f3403 +#define SCE_BT_ERROR_NOTIMP 0x802f2001 +#define SCE_BT_ERROR_PAIRING_OOB_CAN_NOT_DISCONNECT 0x802f3103 +#define SCE_BT_ERROR_PAIRING_OOB_FULL 0x802f3102 +#define SCE_BT_ERROR_PAIRING_OOB_INTERNAL_ERROR 0x802f3104 +#define SCE_BT_ERROR_PAIRING_OOB_TIMEOUT 0x802f3101 +#define SCE_BT_ERROR_PIN_INVALID_LENGTH 0x802f0206 +#define SCE_BT_ERROR_PIN_IS_LE 0x802f2201 +#define SCE_BT_ERROR_REG_CANNOT_LOAD 0x802f010a +#define SCE_BT_ERROR_REG_CANNOT_OPEN 0x802f010b +#define SCE_BT_ERROR_REG_CANNOT_READ 0x802f010c +#define SCE_BT_ERROR_REG_CANNOT_WRITE 0x802f010d +#define SCE_BT_ERROR_REG_DELETE_CONNECTING 0x802f0109 +#define SCE_BT_ERROR_REG_DELETE_NO_ENTRY 0x802f0102 +#define SCE_BT_ERROR_REG_GET_HID_DESC_NO_REG 0x802f0107 +#define SCE_BT_ERROR_REG_GET_HID_DESC_TOO_SHORT 0x802f0108 +#define SCE_BT_ERROR_REG_NOT_READY 0x802f0101 +#define SCE_BT_ERROR_REG_SET_HID_DESC_BAD_ARG 0x802f0105 +#define SCE_BT_ERROR_REG_SET_HID_DESC_NO_REG 0x802f0106 +#define SCE_BT_ERROR_REG_UPDATE_CANNOT_SAVE 0x802f0103 +#define SCE_BT_ERROR_SDIO_DISABLE_FUNCTION 0x802f2009 +#define SCE_BT_ERROR_SDIO_ENABLE_FUNCTION 0x802f2008 +#define SCE_BT_ERROR_SDIO_GET_FUNCTION 0x802f2003 +#define SCE_BT_ERROR_SDIO_LOCK 0x802f2006 +#define SCE_BT_ERROR_SDIO_READ_DIR 0x802f200c +#define SCE_BT_ERROR_SDIO_READ_FIX 0x802f200e +#define SCE_BT_ERROR_SDIO_REGISTER_INTR_HANDLER 0x802f2004 +#define SCE_BT_ERROR_SDIO_SET_BLOCK_LEN 0x802f200a +#define SCE_BT_ERROR_SDIO_SET_BUS_SPEED 0x802f200b +#define SCE_BT_ERROR_SDIO_UNLOCK 0x802f2007 +#define SCE_BT_ERROR_SDIO_UNREGISTER_INTR_HANDLER 0x802f2005 +#define SCE_BT_ERROR_SDIO_WRITE_DIR 0x802f200d +#define SCE_BT_ERROR_SDIO_WRITE_FIX 0x802f200f +#define SCE_BT_ERROR_SDP_OPEN_NO_L2C 0x802f0208 +#define SCE_BT_ERROR_SET_DEBUG_INFO_INVALID_ARGUMENT 0x802f2106 +#define SCE_BT_ERROR_SET_DEBUG_INFO_INVALID_REQUEST 0x802f2102 +#define SCE_BT_ERROR_SET_DEBUG_INFO_INVALID_SIZE 0x802f2104 +#define SCE_BT_ERROR_SET_DEBUG_INFO_INVALID_STATE 0x802f2108 +#define SCE_BT_ERROR_SET_DEBUG_INFO_NOT_CONNECTED 0x802f210a +#define SCE_BT_ERROR_SM_INVALID_CONFIRM_REPLY 0x802f2505 +#define SCE_BT_ERROR_SM_INVALID_KEY_LENGTH 0x802f2501 +#define SCE_BT_ERROR_SM_NO_REQ 0x802f2503 +#define SCE_BT_ERROR_SM_NOT_DIGIT 0x802f2502 +#define SCE_BT_ERROR_SM_NOT_NEEDED_PIN 0x802f2504 +#define SCE_BT_ERROR_TIMER_CANCEL_BAD_ID 0x802f0b05 +#define SCE_BT_ERROR_TIMER_CANCEL_NOT_INITIALIZED 0x802f0b06 +#define SCE_BT_ERROR_TIMER_SET_NO_SPACE 0x802f0b08 +#define SCE_BT_ERROR_TIMER_SET_NOT_INITIALIZED 0x802f0b07 +#define SCE_BT_ERROR_TOO_MANY_CONNECTION 0x802f3401 +#define SCE_BT_ERROR_TOO_MANY_HID 0x802f3402 +#define SCE_BT_ERROR_TSLEEP 0x802f2010 +#define SCE_BT_ERROR_USER_CONFIRM_NOT_CONNECTED 0x802f0207 + +typedef struct { + unsigned char mac[5]; + unsigned char unk1[32 - 5]; + char name[128]; + unsigned char unk2[128]; +} SceBtRegisteredInfo; /* size = 0x100 */ + +typedef struct { + // mac0 is at *(unsigned int *)&data[0x08]; + // mac1 is at *(unsigned int *)&data[0x0C]; + unsigned char data[0x10]; +} SceBtEvent; + +typedef void (*SceBtCallback)(int r0, int r1, int r2, int r3); + +typedef struct _SceBtHidRequest { + uint32_t unk00; + uint32_t unk04; + uint8_t type; //@0x08, 0 = read?, 1 = write?, 2 = feature?, 3 = ? + uint8_t unk09; + uint8_t unk0A; + uint8_t unk0B; + void *buffer; // 0x0C + uint32_t length; // 0x10 + struct _SceBtHidRequest *next; +} __attribute__((packed)) SceBtHidRequest; /* size = 0x18 */ + +int ksceBtAvrcpReadVolumeForDriver(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSendButtonForDriver(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSendVolumeForDriver(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSetPlayStatusForDriver(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSetTitleForDriver(int r0, int r1, int r2, int r3); +int ksceBtDeleteRegisteredInfoForDriver(int r0, int r1, int r2, int r3); +int ksceBtFreqAudioForDriver(int r0, int r1, int r2, int r3); +int ksceBtGetConfigurationForDriver(void); // returns 0x0 BT disabled, 0x9 if enabled +int ksceBtGetConnectingInfoForDriver(unsigned int mac0, unsigned int mac1); // 1 = disconnected?, 2 = connecting?, 5 = connected? +int ksceBtGetDeviceNameForDriver(unsigned int mac0, unsigned int mac1, char name[0x79]); +int ksceBtGetInfoForTestForDriver(int r0, int r1, int r2, int r3); +int ksceBtGetLastErrorForDriver(void); +int ksceBtGetRegisteredInfoForDriver(int device, int unk, SceBtRegisteredInfo *info, unsigned int info_size); +int ksceBtGetStatusForTestForDriver(int r0, int r1, int r2, int r3); +int ksceBtGetVidPidForDriver(unsigned int mac0, unsigned int mac1, unsigned short vid_pid[2]); +int ksceBtHfpGetCurrentPhoneNumberForDriver(int r0, int r1, int r2, int r3); +int ksceBtHfpRequestForDriver(int r0, int r1, int r2, int r3); +int ksceBtHidGetReportDescriptorForDriver(unsigned int mac0, unsigned int mac1, void *buffer, unsigned int size); +int ksceBtHidTransferForDriver(unsigned int mac0, unsigned int mac1, SceBtHidRequest *request); +int ksceBtPairingOOBForDriver(int r0, int r1, int r2, int r3); +int ksceBtPushBipForDriver(int r0, int r1, int r2, int r3); +int ksceBtPushOppForDriver(int r0, int r1, int r2, int r3); +int ksceBtReadEventForDriver(SceBtEvent *events, int num_events); +int ksceBtRecvAudioForDriver(int r0, int r1, int r2, int r3); +int ksceBtRecvBipForDriver(int r0, int r1, int r2, int r3); +int ksceBtRecvOppForDriver(int r0, int r1, int r2, int r3); +int ksceBtRecvSppForDriver(int r0, int r1, int r2, int r3); +int ksceBtRegisterCallbackForDriver(SceUID cb, int unused, int flags1, int flags2); // looks like flags1 is a mask for permitted MACs +int ksceBtReplyPinCodeForDriver(unsigned int mac0, unsigned int mac1, unsigned char *code, unsigned int length); +int ksceBtReplyUserConfirmationForDriver(unsigned int mac0, unsigned int mac1, int unk); +int ksceBtSendAudioForDriver(int r0, int r1, int r2, int r3); +int ksceBtSendL2capEchoRequestForTestForDriver(int r0, int r1, int r2, int r3); +int ksceBtSendSppForDriver(int r0, int r1, int r2, int r3); +int ksceBtSetConfigurationForDriver(int r0); //0 = disable bt, 1 = enabling, 2 = enabled 3 = disabling? +int ksceBtSetContentProtectionForDriver(int r0); +int ksceBtSetInquiryResultForTestForDriver(unsigned char *); +int ksceBtSetInquiryScanForDriver(int r0); +int ksceBtSetL2capEchoResponseBufferForTestForDriver(int r0, int r1, int r2, int r3); +int ksceBtSetStatusForTestForDriver(int r0, int r1, int r2, int r3); +int ksceBtStartAudioForDriver(int r0, int r1, int r2, int r3); +int ksceBtStartConnectForDriver(unsigned int mac0, unsigned int mac1); // mac0 can be used as a device index (already paired devices)? +int ksceBtStartDisconnectForDriver(unsigned int mac0, unsigned int mac1); +int ksceBtStartInquiryForDriver(void); +int ksceBtStopAudioForDriver(int r0, int r1, int r2, int r3); +int ksceBtStopInquiryForDriver(void); +int ksceBtUnregisterCallbackForDriver(SceUID cb); + +#ifdef __cplusplus +} +#endif +#endif From 40ea6f31a43acbba9c1e688417523c432ee1cd43 Mon Sep 17 00:00:00 2001 From: devnoname120 Date: Fri, 16 Dec 2016 18:56:54 +0100 Subject: [PATCH 3/4] Remove remaining ForDriver suffixes in headers --- include/psp2kern/bt.h | 92 +++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/include/psp2kern/bt.h b/include/psp2kern/bt.h index b6a9d479e..2c908ac0d 100644 --- a/include/psp2kern/bt.h +++ b/include/psp2kern/bt.h @@ -281,52 +281,52 @@ typedef struct _SceBtHidRequest { struct _SceBtHidRequest *next; } __attribute__((packed)) SceBtHidRequest; /* size = 0x18 */ -int ksceBtAvrcpReadVolumeForDriver(int r0, int r1, int r2, int r3); -int ksceBtAvrcpSendButtonForDriver(int r0, int r1, int r2, int r3); -int ksceBtAvrcpSendVolumeForDriver(int r0, int r1, int r2, int r3); -int ksceBtAvrcpSetPlayStatusForDriver(int r0, int r1, int r2, int r3); -int ksceBtAvrcpSetTitleForDriver(int r0, int r1, int r2, int r3); -int ksceBtDeleteRegisteredInfoForDriver(int r0, int r1, int r2, int r3); -int ksceBtFreqAudioForDriver(int r0, int r1, int r2, int r3); -int ksceBtGetConfigurationForDriver(void); // returns 0x0 BT disabled, 0x9 if enabled -int ksceBtGetConnectingInfoForDriver(unsigned int mac0, unsigned int mac1); // 1 = disconnected?, 2 = connecting?, 5 = connected? -int ksceBtGetDeviceNameForDriver(unsigned int mac0, unsigned int mac1, char name[0x79]); -int ksceBtGetInfoForTestForDriver(int r0, int r1, int r2, int r3); -int ksceBtGetLastErrorForDriver(void); -int ksceBtGetRegisteredInfoForDriver(int device, int unk, SceBtRegisteredInfo *info, unsigned int info_size); -int ksceBtGetStatusForTestForDriver(int r0, int r1, int r2, int r3); -int ksceBtGetVidPidForDriver(unsigned int mac0, unsigned int mac1, unsigned short vid_pid[2]); -int ksceBtHfpGetCurrentPhoneNumberForDriver(int r0, int r1, int r2, int r3); -int ksceBtHfpRequestForDriver(int r0, int r1, int r2, int r3); -int ksceBtHidGetReportDescriptorForDriver(unsigned int mac0, unsigned int mac1, void *buffer, unsigned int size); -int ksceBtHidTransferForDriver(unsigned int mac0, unsigned int mac1, SceBtHidRequest *request); -int ksceBtPairingOOBForDriver(int r0, int r1, int r2, int r3); -int ksceBtPushBipForDriver(int r0, int r1, int r2, int r3); -int ksceBtPushOppForDriver(int r0, int r1, int r2, int r3); -int ksceBtReadEventForDriver(SceBtEvent *events, int num_events); -int ksceBtRecvAudioForDriver(int r0, int r1, int r2, int r3); -int ksceBtRecvBipForDriver(int r0, int r1, int r2, int r3); -int ksceBtRecvOppForDriver(int r0, int r1, int r2, int r3); -int ksceBtRecvSppForDriver(int r0, int r1, int r2, int r3); -int ksceBtRegisterCallbackForDriver(SceUID cb, int unused, int flags1, int flags2); // looks like flags1 is a mask for permitted MACs -int ksceBtReplyPinCodeForDriver(unsigned int mac0, unsigned int mac1, unsigned char *code, unsigned int length); -int ksceBtReplyUserConfirmationForDriver(unsigned int mac0, unsigned int mac1, int unk); -int ksceBtSendAudioForDriver(int r0, int r1, int r2, int r3); -int ksceBtSendL2capEchoRequestForTestForDriver(int r0, int r1, int r2, int r3); -int ksceBtSendSppForDriver(int r0, int r1, int r2, int r3); -int ksceBtSetConfigurationForDriver(int r0); //0 = disable bt, 1 = enabling, 2 = enabled 3 = disabling? -int ksceBtSetContentProtectionForDriver(int r0); -int ksceBtSetInquiryResultForTestForDriver(unsigned char *); -int ksceBtSetInquiryScanForDriver(int r0); -int ksceBtSetL2capEchoResponseBufferForTestForDriver(int r0, int r1, int r2, int r3); -int ksceBtSetStatusForTestForDriver(int r0, int r1, int r2, int r3); -int ksceBtStartAudioForDriver(int r0, int r1, int r2, int r3); -int ksceBtStartConnectForDriver(unsigned int mac0, unsigned int mac1); // mac0 can be used as a device index (already paired devices)? -int ksceBtStartDisconnectForDriver(unsigned int mac0, unsigned int mac1); -int ksceBtStartInquiryForDriver(void); -int ksceBtStopAudioForDriver(int r0, int r1, int r2, int r3); -int ksceBtStopInquiryForDriver(void); -int ksceBtUnregisterCallbackForDriver(SceUID cb); +int ksceBtAvrcpReadVolume(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSendButton(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSendVolume(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSetPlayStatus(int r0, int r1, int r2, int r3); +int ksceBtAvrcpSetTitle(int r0, int r1, int r2, int r3); +int ksceBtDeleteRegisteredInfo(int r0, int r1, int r2, int r3); +int ksceBtFreqAudio(int r0, int r1, int r2, int r3); +int ksceBtGetConfiguration(void); // returns 0x0 BT disabled, 0x9 if enabled +int ksceBtGetConnectingInfo(unsigned int mac0, unsigned int mac1); // 1 = disconnected?, 2 = connecting?, 5 = connected? +int ksceBtGetDeviceName(unsigned int mac0, unsigned int mac1, char name[0x79]); +int ksceBtGetInfoForTest(int r0, int r1, int r2, int r3); +int ksceBtGetLastError(void); +int ksceBtGetRegisteredInfo(int device, int unk, SceBtRegisteredInfo *info, unsigned int info_size); +int ksceBtGetStatusForTest(int r0, int r1, int r2, int r3); +int ksceBtGetVidPid(unsigned int mac0, unsigned int mac1, unsigned short vid_pid[2]); +int ksceBtHfpGetCurrentPhoneNumber(int r0, int r1, int r2, int r3); +int ksceBtHfpRequest(int r0, int r1, int r2, int r3); +int ksceBtHidGetReportDescriptor(unsigned int mac0, unsigned int mac1, void *buffer, unsigned int size); +int ksceBtHidTransfer(unsigned int mac0, unsigned int mac1, SceBtHidRequest *request); +int ksceBtPairingOOB(int r0, int r1, int r2, int r3); +int ksceBtPushBip(int r0, int r1, int r2, int r3); +int ksceBtPushOpp(int r0, int r1, int r2, int r3); +int ksceBtReadEvent(SceBtEvent *events, int num_events); +int ksceBtRecvAudio(int r0, int r1, int r2, int r3); +int ksceBtRecvBip(int r0, int r1, int r2, int r3); +int ksceBtRecvOpp(int r0, int r1, int r2, int r3); +int ksceBtRecvSpp(int r0, int r1, int r2, int r3); +int ksceBtRegisterCallback(SceUID cb, int unused, int flags1, int flags2); // looks like flags1 is a mask for permitted MACs +int ksceBtReplyPinCode(unsigned int mac0, unsigned int mac1, unsigned char *code, unsigned int length); +int ksceBtReplyUserConfirmation(unsigned int mac0, unsigned int mac1, int unk); +int ksceBtSendAudio(int r0, int r1, int r2, int r3); +int ksceBtSendL2capEchoRequestForTest(int r0, int r1, int r2, int r3); +int ksceBtSendSpp(int r0, int r1, int r2, int r3); +int ksceBtSetConfiguration(int r0); //0 = disable bt, 1 = enabling, 2 = enabled 3 = disabling? +int ksceBtSetContentProtection(int r0); +int ksceBtSetInquiryResultForTest(unsigned char *); +int ksceBtSetInquiryScan(int r0); +int ksceBtSetL2capEchoResponseBufferForTest(int r0, int r1, int r2, int r3); +int ksceBtSetStatusForTest(int r0, int r1, int r2, int r3); +int ksceBtStartAudio(int r0, int r1, int r2, int r3); +int ksceBtStartConnect(unsigned int mac0, unsigned int mac1); // mac0 can be used as a device index (already paired devices)? +int ksceBtStartDisconnect(unsigned int mac0, unsigned int mac1); +int ksceBtStartInquiry(void); +int ksceBtStopAudio(int r0, int r1, int r2, int r3); +int ksceBtStopInquiry(void); +int ksceBtUnregisterCallback(SceUID cb); #ifdef __cplusplus } From f767e125156d51103a126d9e2d42f3a1b96144ac Mon Sep 17 00:00:00 2001 From: devnoname120 Date: Fri, 16 Dec 2016 19:46:28 +0100 Subject: [PATCH 4/4] Remove k-prefix for Kernel libc and debug --- db.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/db.yml b/db.yml index dc588c69c..1fd11cb88 100644 --- a/db.yml +++ b/db.yml @@ -1654,21 +1654,21 @@ modules: kernel: true nid: 0x7EE45391 functions: - kmemcpy: 0x40C88316 - kmemset: 0xAB9BF5C - kstrchr: 0x38463759 - kstrncmp: 0x12CEE649 - kstrcmp: 0xB33BC43 - kstrstr: 0x1304A69D - krshift: 0x1D89F6C0 - kstrrchr: 0x7F0E0835 - kstrncat: 0xA1D1C32C - kstrtol: 0xAB77C5AA - ksnprintf: 0xAE7A8981 + memcpy: 0x40C88316 + memset: 0xAB9BF5C + strchr: 0x38463759 + strncmp: 0x12CEE649 + strcmp: 0xB33BC43 + strstr: 0x1304A69D + rshift: 0x1D89F6C0 + strrchr: 0x7F0E0835 + strncat: 0xA1D1C32C + strtol: 0xAB77C5AA + snprintf: 0xAE7A8981 ksceKernelStackCheckFail: 0xB997493D - kstrnlen: 0xCD4BD884 - kstrlen: 0xCFC6A9AC - kmemcmp: 0xF939E83D + strnlen: 0xCD4BD884 + strlen: 0xCFC6A9AC + memcmp: 0xF939E83D SceCpuForKernel: kernel: true nid: 0x54BF2BAB @@ -4989,7 +4989,7 @@ modules: kernel: true nid: 0x88758561 functions: - kprintf: 0x391B74B7 + printf: 0x391B74B7 SceSblSsMgr: nid: 0xFDDD93FA libraries: