mirror of
https://github.com/hrydgard/ppsspp.git
synced 2025-04-02 11:01:50 -04:00
Reset Np state on init, this was missing.
This commit is contained in:
parent
5abb1be440
commit
5ffd9a2d72
3 changed files with 15 additions and 2 deletions
|
@ -68,6 +68,7 @@
|
||||||
#include "sceMp3.h"
|
#include "sceMp3.h"
|
||||||
#include "sceMpeg.h"
|
#include "sceMpeg.h"
|
||||||
#include "sceNet.h"
|
#include "sceNet.h"
|
||||||
|
#include "sceNp.h"
|
||||||
#include "sceNetAdhoc.h"
|
#include "sceNetAdhoc.h"
|
||||||
#include "sceNetAdhocMatching.h"
|
#include "sceNetAdhocMatching.h"
|
||||||
#include "scePower.h"
|
#include "scePower.h"
|
||||||
|
@ -160,6 +161,7 @@ void __KernelInit()
|
||||||
__UsbMicInit();
|
__UsbMicInit();
|
||||||
__OpenPSIDInit();
|
__OpenPSIDInit();
|
||||||
__HttpInit();
|
__HttpInit();
|
||||||
|
__NpInit();
|
||||||
|
|
||||||
SaveState::Init(); // Must be after IO, as it may create a directory
|
SaveState::Init(); // Must be after IO, as it may create a directory
|
||||||
Reporting::Init();
|
Reporting::Init();
|
||||||
|
|
|
@ -56,6 +56,14 @@ std::recursive_mutex npAuthEvtMtx;
|
||||||
std::deque<NpAuthArgs> npAuthEvents;
|
std::deque<NpAuthArgs> npAuthEvents;
|
||||||
std::map<int, NpAuthHandler> npAuthHandlers;
|
std::map<int, NpAuthHandler> npAuthHandlers;
|
||||||
|
|
||||||
|
void __NpInit() {
|
||||||
|
npAuthInited = false;
|
||||||
|
npSigninState = NP_SIGNIN_STATUS_NONE;
|
||||||
|
npAuthMemStat = {};
|
||||||
|
npSigninTimestamp = {};
|
||||||
|
npTitleId = {};
|
||||||
|
}
|
||||||
|
|
||||||
// Tickets data are in big-endian based on captured packets
|
// Tickets data are in big-endian based on captured packets
|
||||||
static int writeTicketParam(u8* buffer, const u16_be type, const char* data = nullptr, const u16_be size = 0) {
|
static int writeTicketParam(u8* buffer, const u16_be type, const char* data = nullptr, const u16_be size = 0) {
|
||||||
if (buffer == nullptr) return 0;
|
if (buffer == nullptr) return 0;
|
||||||
|
@ -144,14 +152,15 @@ static int sceNpInit()
|
||||||
} else {
|
} else {
|
||||||
npOnlineId.clear();
|
npOnlineId.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
// NOTE: Checking validity and returning -1 here doesn't seem to work. Instead, we will fail to generate a ticket.
|
// NOTE: Checking validity and returning -1 here doesn't seem to work. Instead, we will fail to generate a ticket.
|
||||||
|
|
||||||
return hleLogError(Log::sceNet, 0, "UNIMPL");
|
return hleLogError(Log::sceNet, 0, "UNIMPL");
|
||||||
}
|
}
|
||||||
|
|
||||||
static int sceNpTerm()
|
static int sceNpTerm()
|
||||||
{
|
{
|
||||||
|
// Reset sign in state.
|
||||||
|
npSigninState = NP_SIGNIN_STATUS_NONE;
|
||||||
|
|
||||||
// No parameters
|
// No parameters
|
||||||
return hleLogError(Log::sceNet, 0, "UNIMPL");
|
return hleLogError(Log::sceNet, 0, "UNIMPL");
|
||||||
}
|
}
|
||||||
|
|
|
@ -434,6 +434,8 @@ extern std::recursive_mutex npAuthEvtMtx;
|
||||||
// Used by sceNp2.cpp
|
// Used by sceNp2.cpp
|
||||||
extern SceNpCommunicationId npTitleId;
|
extern SceNpCommunicationId npTitleId;
|
||||||
|
|
||||||
|
void __NpInit();
|
||||||
|
|
||||||
int NpGetNpId(SceNpId* npid);
|
int NpGetNpId(SceNpId* npid);
|
||||||
bool NpAuthProcessEvents();
|
bool NpAuthProcessEvents();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue