From daa430ddc442f22cb710ecec639210048b006814 Mon Sep 17 00:00:00 2001 From: AKuHAK <621640+AKuHAK@users.noreply.github.com> Date: Sat, 12 Jun 2021 23:50:29 +0300 Subject: [PATCH] IOP modules: cleaned imports list --- modules/bdmevent/imports.lst | 4 ---- modules/debug/ioptrap/imports.lst | 5 ----- modules/debug/ps2link/imports.lst | 14 ++----------- modules/debug/udptty-ingame/imports.lst | 2 -- modules/ds34bt/iop/imports.lst | 10 ---------- modules/ds34usb/iop/imports.lst | 6 ------ modules/iopcore/cdvdfsv/imports.lst | 3 --- modules/iopcore/cdvdman/imports.lst | 7 ------- modules/iopcore/eesync/imports.lst | 1 - .../iopcore/patches/apemodpatch/imports.lst | 5 ----- .../iopcore/patches/cleareffects/imports.lst | 1 - .../patches/f2techioppatch/imports.lst | 5 ----- .../iopcore/patches/iremsndpatch/imports.lst | 6 ------ modules/isofs/imports.lst | 7 ------- modules/isofs/isofs.c | 2 +- modules/mcemu/imports.lst | 20 +++---------------- modules/network/httpclient/imports.lst | 11 +++++----- modules/network/lwnbdsvr/imports.lst | 8 -------- modules/network/nbns/imports.lst | 8 +++----- modules/network/smap-ingame/imports.lst | 1 - modules/pademu/imports.lst | 15 -------------- modules/pademu/pademu.c | 2 +- modules/vmc/genvmc/imports.lst | 4 +--- 23 files changed, 16 insertions(+), 131 deletions(-) diff --git a/modules/bdmevent/imports.lst b/modules/bdmevent/imports.lst index 20d8a42eb..809caaad7 100644 --- a/modules/bdmevent/imports.lst +++ b/modules/bdmevent/imports.lst @@ -1,7 +1,3 @@ -iomanX_IMPORTS_start -I_AddDrv -iomanX_IMPORTS_end - bdm_IMPORTS_start I_bdm_RegisterCallback bdm_IMPORTS_end diff --git a/modules/debug/ioptrap/imports.lst b/modules/debug/ioptrap/imports.lst index 8c11bc8c6..6d05aa6ff 100644 --- a/modules/debug/ioptrap/imports.lst +++ b/modules/debug/ioptrap/imports.lst @@ -16,11 +16,6 @@ I_RegisterDefaultExceptionHandler I_RegisterPriorityExceptionHandler excepman_IMPORTS_end -intrman_IMPORTS_start -I_CpuSuspendIntr -I_CpuResumeIntr -intrman_IMPORTS_end - stdio_IMPORTS_start I_printf stdio_IMPORTS_end diff --git a/modules/debug/ps2link/imports.lst b/modules/debug/ps2link/imports.lst index 3bb33d6ec..bc4838af3 100644 --- a/modules/debug/ps2link/imports.lst +++ b/modules/debug/ps2link/imports.lst @@ -8,7 +8,6 @@ I_memset I_memcpy I_strlen I_strncpy -I_strncmp sysclib_IMPORTS_end thsemap_IMPORTS_start @@ -21,8 +20,8 @@ thsemap_IMPORTS_end thbase_IMPORTS_start I_CreateThread I_DeleteThread -I_StartThread -I_GetThreadId +I_StartThread +I_GetThreadId I_ExitDeleteThread thbase_IMPORTS_end @@ -35,14 +34,6 @@ ioman_IMPORTS_end ps2ip_IMPORTS_start I_lwip_send -I_lwip_sendto -I_lwip_socket -I_lwip_listen -I_lwip_recv -I_lwip_recvfrom -I_lwip_close -I_lwip_bind -I_lwip_accept ps2ip_IMPORTS_end sifcmd_IMPORTS_start @@ -81,6 +72,5 @@ ioptrap_IMPORTS_end poweroff_IMPORTS_start I_SetPowerButtonHandler -I_AddPowerOffHandler I_PoweroffShutdown poweroff_IMPORTS_end diff --git a/modules/debug/udptty-ingame/imports.lst b/modules/debug/udptty-ingame/imports.lst index 1b3070d72..6239fd3ea 100644 --- a/modules/debug/udptty-ingame/imports.lst +++ b/modules/debug/udptty-ingame/imports.lst @@ -1,6 +1,5 @@ thsemap_IMPORTS_start -I_CreateSema I_DeleteSema I_SignalSema I_WaitSema @@ -32,7 +31,6 @@ stdio_IMPORTS_end sysclib_IMPORTS_start I_prnt -I_strncmp sysclib_IMPORTS_end sysmem_IMPORTS_start diff --git a/modules/ds34bt/iop/imports.lst b/modules/ds34bt/iop/imports.lst index b8e4d12ee..14d2b6eeb 100644 --- a/modules/ds34bt/iop/imports.lst +++ b/modules/ds34bt/iop/imports.lst @@ -5,12 +5,7 @@ I_sceSifRegisterRpc I_sceSifRpcLoop sifcmd_IMPORTS_end -stdio_IMPORTS_start -I_printf -stdio_IMPORTS_end - sysclib_IMPORTS_start -I_strncmp I_memcmp sysclib_IMPORTS_end @@ -19,18 +14,13 @@ I_CreateSema I_SignalSema I_WaitSema I_PollSema -I_DeleteSema -I_iSignalSema thsemap_IMPORTS_end thbase_IMPORTS_start I_StartThread I_CreateThread -I_DeleteThread I_DelayThread I_GetThreadId -I_SetAlarm -I_CancelAlarm thbase_IMPORTS_end usbd_IMPORTS_start diff --git a/modules/ds34usb/iop/imports.lst b/modules/ds34usb/iop/imports.lst index f862657ab..a3fb2b0e1 100644 --- a/modules/ds34usb/iop/imports.lst +++ b/modules/ds34usb/iop/imports.lst @@ -5,23 +5,17 @@ I_sceSifRegisterRpc I_sceSifRpcLoop sifcmd_IMPORTS_end -stdio_IMPORTS_start -I_printf -stdio_IMPORTS_end - thsemap_IMPORTS_start I_CreateSema I_SignalSema I_WaitSema I_PollSema -I_DeleteSema I_iSignalSema thsemap_IMPORTS_end thbase_IMPORTS_start I_StartThread I_CreateThread -I_DeleteThread I_DelayThread I_GetThreadId I_SetAlarm diff --git a/modules/iopcore/cdvdfsv/imports.lst b/modules/iopcore/cdvdfsv/imports.lst index ee33bd24c..b8862e5e0 100644 --- a/modules/iopcore/cdvdfsv/imports.lst +++ b/modules/iopcore/cdvdfsv/imports.lst @@ -38,13 +38,11 @@ I_sceCdLayerSearchFile cdvdman_IMPORTS_end intrman_IMPORTS_start -I_CpuEnableIntr I_CpuSuspendIntr I_CpuResumeIntr intrman_IMPORTS_end loadcore_IMPORTS_start -I_FlushDcache I_RegisterLibraryEntries loadcore_IMPORTS_end @@ -78,4 +76,3 @@ thevent_IMPORTS_start I_ClearEventFlag I_WaitEventFlag thevent_IMPORTS_end - diff --git a/modules/iopcore/cdvdman/imports.lst b/modules/iopcore/cdvdman/imports.lst index a90342bca..9a23da6ef 100644 --- a/modules/iopcore/cdvdman/imports.lst +++ b/modules/iopcore/cdvdman/imports.lst @@ -17,13 +17,10 @@ I_CpuSuspendIntr I_CpuResumeIntr I_QueryIntrContext I_EnableIntr -I_DisableIntr I_RegisterIntrHandler intrman_IMPORTS_end sysmem_IMPORTS_start -I_AllocSysMemory -I_FreeSysMemory I_Kprintf sysmem_IMPORTS_end @@ -38,14 +35,11 @@ loadcore_IMPORTS_end sysclib_IMPORTS_start I_strcpy I_strlen -I_strcmp I_strncmp I_strchr I_strrchr I_strstr I_strncpy -I_strtok -I_toupper I_sprintf sysclib_IMPORTS_end @@ -67,7 +61,6 @@ I_iSetAlarm I_CancelAlarm I_USec2SysClock I_SleepThread -I_WakeupThread I_iWakeupThread thbase_IMPORTS_end diff --git a/modules/iopcore/eesync/imports.lst b/modules/iopcore/eesync/imports.lst index b09b68fb3..ec29bd03b 100644 --- a/modules/iopcore/eesync/imports.lst +++ b/modules/iopcore/eesync/imports.lst @@ -5,4 +5,3 @@ loadcore_IMPORTS_end sifman_IMPORTS_start I_sceSifSetSMFlag sifman_IMPORTS_end - diff --git a/modules/iopcore/patches/apemodpatch/imports.lst b/modules/iopcore/patches/apemodpatch/imports.lst index 4eed24535..dbedd6f78 100644 --- a/modules/iopcore/patches/apemodpatch/imports.lst +++ b/modules/iopcore/patches/apemodpatch/imports.lst @@ -12,10 +12,6 @@ stdio_IMPORTS_start I_printf stdio_IMPORTS_end -sysclib_IMPORTS_start -I_strtol -sysclib_IMPORTS_end - thbase_IMPORTS_start I_SetAlarm I_CancelAlarm @@ -32,4 +28,3 @@ I_CreateSema I_SignalSema I_PollSema thsemap_IMPORTS_end - diff --git a/modules/iopcore/patches/cleareffects/imports.lst b/modules/iopcore/patches/cleareffects/imports.lst index 52b2c5d51..1e19cf80d 100644 --- a/modules/iopcore/patches/cleareffects/imports.lst +++ b/modules/iopcore/patches/cleareffects/imports.lst @@ -6,4 +6,3 @@ libsd_IMPORTS_end sysclib_IMPORTS_start I_memset sysclib_IMPORTS_end - diff --git a/modules/iopcore/patches/f2techioppatch/imports.lst b/modules/iopcore/patches/f2techioppatch/imports.lst index bc498b101..3bde4b2f4 100644 --- a/modules/iopcore/patches/f2techioppatch/imports.lst +++ b/modules/iopcore/patches/f2techioppatch/imports.lst @@ -10,8 +10,3 @@ modload_IMPORTS_end stdio_IMPORTS_start I_printf stdio_IMPORTS_end - -sysclib_IMPORTS_start -I_strtol -sysclib_IMPORTS_end - diff --git a/modules/iopcore/patches/iremsndpatch/imports.lst b/modules/iopcore/patches/iremsndpatch/imports.lst index 15f09e102..cef64c874 100644 --- a/modules/iopcore/patches/iremsndpatch/imports.lst +++ b/modules/iopcore/patches/iremsndpatch/imports.lst @@ -1,8 +1,3 @@ -intrman_IMPORTS_start -I_CpuSuspendIntr -I_CpuResumeIntr -intrman_IMPORTS_end - loadcore_IMPORTS_start I_GetLoadcoreInternalData I_FlushIcache @@ -25,4 +20,3 @@ I_CreateSema I_SignalSema I_WaitSema thsemap_IMPORTS_end - diff --git a/modules/isofs/imports.lst b/modules/isofs/imports.lst index 052365188..7a008ed35 100644 --- a/modules/isofs/imports.lst +++ b/modules/isofs/imports.lst @@ -2,7 +2,6 @@ thsemap_IMPORTS_start I_CreateSema I_DeleteSema I_SignalSema -I_iSignalSema I_WaitSema thsemap_IMPORTS_end @@ -12,19 +11,13 @@ I_close I_read I_lseek I_AddDrv -I_DelDrv ioman_IMPORTS_end -stdio_IMPORTS_start -I_printf -stdio_IMPORTS_end - sysclib_IMPORTS_start I_memset I_memcmp I_memcpy I_strcmp -I_strncmp I_strcpy I_strlen I_strncpy diff --git a/modules/isofs/isofs.c b/modules/isofs/isofs.c index 23fac3c28..d4c31d780 100644 --- a/modules/isofs/isofs.c +++ b/modules/isofs/isofs.c @@ -588,7 +588,7 @@ static iop_device_t IsofsDevice = { int _start(int argc, char *argv[]) { if (AddDrv(&IsofsDevice) == 0) { - printf("ISOFS driver start.\n"); + DPRINTF("ISOFS driver start.\n"); return MODULE_RESIDENT_END; } diff --git a/modules/mcemu/imports.lst b/modules/mcemu/imports.lst index a283a2b81..9d514bfd9 100644 --- a/modules/mcemu/imports.lst +++ b/modules/mcemu/imports.lst @@ -5,7 +5,6 @@ intrman_IMPORTS_start I_CpuSuspendIntr I_CpuResumeIntr -I_QueryIntrContext intrman_IMPORTS_end loadcore_IMPORTS_start @@ -35,16 +34,16 @@ I_smb_Close oplutils_IMPORTS_end sifcmd_IMPORTS_start -I_sceSifBindRpc -I_sceSifCallRpc +I_sceSifCallRpc I_sceSifGetOtherData I_sceSifInitRpc +I_sceSifBindRpc I_sceSifSendCmd sifcmd_IMPORTS_end sifman_IMPORTS_start I_sceSifInit -I_sceSifSetDma +I_sceSifSetDma I_sceSifCheckInit I_sceSifDmaStat sifman_IMPORTS_end @@ -61,7 +60,6 @@ stdio_IMPORTS_end sysclib_IMPORTS_start I_prnt I_strncmp -I_strncpy sysclib_IMPORTS_end sysmem_IMPORTS_start @@ -72,22 +70,10 @@ sysmem_IMPORTS_end thbase_IMPORTS_start I_CreateThread I_StartThread -I_ExitDeleteThread I_DeleteThread -I_SleepThread -I_iWakeupThread I_DelayThread thbase_IMPORTS_end -thsemap_IMPORTS_start -I_CreateSema -I_SignalSema -I_iSignalSema -I_WaitSema -I_DeleteSema -I_PollSema -thsemap_IMPORTS_end - dmacman_IMPORTS_start I_dmac_request I_dmac_transfer diff --git a/modules/network/httpclient/imports.lst b/modules/network/httpclient/imports.lst index b92a9dc0a..bc2ce20f7 100644 --- a/modules/network/httpclient/imports.lst +++ b/modules/network/httpclient/imports.lst @@ -9,13 +9,13 @@ I_ReleaseLibraryEntries loadcore_IMPORTS_end ps2ip_IMPORTS_start -I_lwip_socket -I_lwip_connect -I_lwip_send I_lwip_recv -I_lwip_select +I_lwip_send I_lwip_close +I_lwip_select +I_lwip_socket I_lwip_shutdown +I_lwip_connect I_lwip_gethostbyname ps2ip_IMPORTS_end @@ -36,9 +36,8 @@ stdio_IMPORTS_end sysclib_IMPORTS_start I_look_ctype_table I_memcpy -I_memset I_memmove -I_strcpy +I_memset I_strcmp I_strncmp I_strlen diff --git a/modules/network/lwnbdsvr/imports.lst b/modules/network/lwnbdsvr/imports.lst index cd3385ad6..d32261a50 100644 --- a/modules/network/lwnbdsvr/imports.lst +++ b/modules/network/lwnbdsvr/imports.lst @@ -1,4 +1,3 @@ - atad_IMPORTS_start I_ata_get_devinfo I_ata_device_sector_io @@ -17,26 +16,19 @@ I_lwip_socket I_lwip_bind I_lwip_accept I_lwip_listen -I_lwip_select -I_inet_addr ps2ip_IMPORTS_end thbase_IMPORTS_start -I_DelayThread I_CreateThread I_StartThread I_DeleteThread thbase_IMPORTS_end sysclib_IMPORTS_start -I_strcpy I_strlen -I_memcpy I_memset sysclib_IMPORTS_end stdio_IMPORTS_start I_printf stdio_IMPORTS_end - - diff --git a/modules/network/nbns/imports.lst b/modules/network/nbns/imports.lst index b000fc338..9793873c4 100644 --- a/modules/network/nbns/imports.lst +++ b/modules/network/nbns/imports.lst @@ -9,13 +9,11 @@ I_ReleaseLibraryEntries loadcore_IMPORTS_end ps2ip_IMPORTS_start -I_lwip_socket -I_lwip_connect -I_lwip_bind -I_lwip_send -I_lwip_sendto I_lwip_recv +I_lwip_sendto I_lwip_close +I_lwip_socket +I_lwip_bind I_lwip_shutdown ps2ip_IMPORTS_end diff --git a/modules/network/smap-ingame/imports.lst b/modules/network/smap-ingame/imports.lst index e804a0636..27ba3a64e 100644 --- a/modules/network/smap-ingame/imports.lst +++ b/modules/network/smap-ingame/imports.lst @@ -26,7 +26,6 @@ sysclib_IMPORTS_end ps2ip_IMPORTS_start I_pbuf_alloc - I_pbuf_free I_netif_add I_netif_set_default I_ps2ip_input diff --git a/modules/pademu/imports.lst b/modules/pademu/imports.lst index 200e5d7fc..114a009be 100644 --- a/modules/pademu/imports.lst +++ b/modules/pademu/imports.lst @@ -1,33 +1,20 @@ loadcore_IMPORTS_start I_RegisterLibraryEntries I_ReleaseLibraryEntries -I_GetLoadcoreInternalData I_QueryLibraryEntryTable I_SetRebootTimeLibraryHandlingMode loadcore_IMPORTS_end -stdio_IMPORTS_start -I_printf -stdio_IMPORTS_end - thsemap_IMPORTS_start I_CreateSema I_SignalSema I_WaitSema I_PollSema -I_DeleteSema I_iSignalSema thsemap_IMPORTS_end thbase_IMPORTS_start -I_StartThread -I_CreateThread -I_DeleteThread I_DelayThread -I_GetThreadId -I_SleepThread -I_WakeupThread -I_TerminateThread I_SetAlarm I_CancelAlarm thbase_IMPORTS_end @@ -42,13 +29,11 @@ I_sceUsbdScanStaticDescriptor I_sceUsbdOpenPipe I_sceUsbdClosePipe I_sceUsbdOpenPipeAligned -I_sceUsbdSetPrivateData I_sceUsbdTransferPipe I_sceUsbdRegisterLdd usbd_IMPORTS_end sysclib_IMPORTS_start -I_strncmp I_memcmp #ifndef USE_SMSUTILS I_memset diff --git a/modules/pademu/pademu.c b/modules/pademu/pademu.c index 3668b498a..a0df86cab 100644 --- a/modules/pademu/pademu.c +++ b/modules/pademu/pademu.c @@ -170,7 +170,7 @@ int hookRegisterLibraryEntires(iop_library_t *lib) { register int ret; - if (!strncmp(lib->name, "sio2man", 8)) { + if (!memcmp(lib->name, "sio2man", 8)) { ret = pRegisterLibraryEntires(lib); if (ret == 0) { ReleaseLibraryEntries((struct irx_export_table *)lib); diff --git a/modules/vmc/genvmc/imports.lst b/modules/vmc/genvmc/imports.lst index 19a0e4342..e433801d7 100644 --- a/modules/vmc/genvmc/imports.lst +++ b/modules/vmc/genvmc/imports.lst @@ -29,7 +29,7 @@ I_FreeSysMemory sysmem_IMPORTS_end thsemap_IMPORTS_start -I_CreateSema +I_CreateSema //CreateMutex I_DeleteSema I_WaitSema I_SignalSema @@ -46,8 +46,6 @@ sysclib_IMPORTS_end thbase_IMPORTS_start I_CreateThread I_StartThread -I_DeleteThread -I_TerminateThread I_ExitDeleteThread thbase_IMPORTS_end