mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-12 04:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #824 from Nmzik/master

Browse Source 
Adjusted attributes, added better log messages and an initialization check in the sceNP module
This commit is contained in:
Hykem 2014-09-30 21:01:58 +01:00
commit 64158b1b10
2 changed files with 68 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
rpcs3/Emu/SysCalls/Modules/sceNp.cpp
View File

@ -158,15 +158,17 @@ int sceNpDrmIsAvailable2(u32 k_licensee_addr, vm::ptr<const char> drm_path)
return npDrmIsAvailable(k_licensee_addr, drm_path); return npDrmIsAvailable(k_licensee_addr, drm_path);
} }
int sceNpDrmVerifyUpgradeLicense(u32 content_id_addr) int sceNpDrmVerifyUpgradeLicense(vm::ptr<const char> content_id)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpDrmVerifyUpgradeLicense(content_id_addr=0x%x)", content_id.addr());
return CELL_OK; return CELL_OK;
} }
int sceNpDrmVerifyUpgradeLicense2() int sceNpDrmVerifyUpgradeLicense2(vm::ptr<const char> content_id)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpDrmVerifyUpgradeLicense2(content_id_addr=0x%x)", content_id.addr());
return CELL_OK; return CELL_OK;
} }
@ -339,9 +341,13 @@ int sceNpBasicAddPlayersHistoryAsync()
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetPlayersHistoryEntryCount() int sceNpBasicGetPlayersHistoryEntryCount(u32 options, vm::ptr<u32> count)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetPlayersHistoryEntryCount(options=%d, count_addr=0x%x)", options, count.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
@ -357,9 +363,13 @@ int sceNpBasicAddBlockListEntry()
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetBlockListEntryCount() int sceNpBasicGetBlockListEntryCount(u32 count)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetBlockListEntryCount(count=%d)", count);
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
@ -369,15 +379,23 @@ int sceNpBasicGetBlockListEntry()
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetMessageAttachmentEntryCount() int sceNpBasicGetMessageAttachmentEntryCount(vm::ptr<u32> count)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetMessageAttachmentEntryCount(count_addr=0x%x)", count.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetMessageAttachmentEntry() int sceNpBasicGetMessageAttachmentEntry(u32 index, vm::ptr<SceNpUserInfo> from)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetMessageAttachmentEntry(index=%d, from_addr=0x%x)", index, from.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
@ -393,27 +411,43 @@ int sceNpBasicGetCustomInvitationEntry()
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetMatchingInvitationEntryCount() int sceNpBasicGetMatchingInvitationEntryCount(vm::ptr<u32> count)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetMatchingInvitationEntryCount(count_addr=0x%x)", count.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetMatchingInvitationEntry() int sceNpBasicGetMatchingInvitationEntry(u32 index, vm::ptr<SceNpUserInfo> from)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetMatchingInvitationEntry(index=%d, from_addr=0x%x)", index, from.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetClanMessageEntryCount() int sceNpBasicGetClanMessageEntryCount(vm::ptr<u32> count)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetClanMessageEntryCount(count_addr=0x%x)", count.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetClanMessageEntry() int sceNpBasicGetClanMessageEntry(u32 index, vm::ptr<SceNpUserInfo> from)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetClanMessageEntry(index=%d, from_addr=0x%x)", index, from.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }
@ -430,9 +464,13 @@ int sceNpBasicGetMessageEntryCount(u32 type, vm::ptr<u32> count)
return CELL_OK; return CELL_OK;
} }
int sceNpBasicGetMessageEntry() int sceNpBasicGetMessageEntry(u32 type, u32 index, vm::ptr<SceNpUserInfo> from)
{ {
UNIMPLEMENTED_FUNC(sceNp); sceNp->Todo("sceNpBasicGetMessageEntry(type=%d, index=%d, from_addr=0x%x)", type, index, from.addr());
if (!sceNpInstance.m_bSceNpInitialized)
return SCE_NP_BASIC_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }

10
rpcs3/Emu/SysCalls/Modules/sceNpTrophy.cpp
View File

@ -237,9 +237,15 @@ int sceNpTrophyDestroyContext()
return CELL_OK; return CELL_OK;
} }
int sceNpTrophyAbortHandle() int sceNpTrophyAbortHandle(u32 handle)
{ {
UNIMPLEMENTED_FUNC(sceNpTrophy); sceNpTrophy->Todo("sceNpTrophyAbortHandle(handle=%d)", handle);
// TODO: ?
if (!sceNpTrophyInstance.m_bInitialized)
return SCE_NP_TROPHY_ERROR_NOT_INITIALIZED;
return CELL_OK; return CELL_OK;
} }