Merge pull request #3865 from NarcolepticK/applet_manager-migrate-logging
service/apt/applet_manager: Migrate logging macros
This commit is contained in:
commit
1449f8e725
|
@ -170,8 +170,8 @@ void AppletManager::CancelAndSendParameter(const MessageParameter& parameter) {
|
||||||
// Signal the event to let the receiver know that a new parameter is ready to be read
|
// Signal the event to let the receiver know that a new parameter is ready to be read
|
||||||
auto* const slot_data = GetAppletSlotData(static_cast<AppletId>(parameter.destination_id));
|
auto* const slot_data = GetAppletSlotData(static_cast<AppletId>(parameter.destination_id));
|
||||||
if (slot_data == nullptr) {
|
if (slot_data == nullptr) {
|
||||||
LOG_DEBUG(Service_APT, "No applet was registered with the id %03X",
|
NGLOG_DEBUG(Service_APT, "No applet was registered with the id {:03X}",
|
||||||
static_cast<u32>(parameter.destination_id));
|
static_cast<u32>(parameter.destination_id));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -329,8 +329,8 @@ ResultCode AppletManager::PrepareToStartLibraryApplet(AppletId applet_id) {
|
||||||
// If we weren't able to load the native applet title, try to fallback to an HLE implementation.
|
// If we weren't able to load the native applet title, try to fallback to an HLE implementation.
|
||||||
auto applet = HLE::Applets::Applet::Get(applet_id);
|
auto applet = HLE::Applets::Applet::Get(applet_id);
|
||||||
if (applet) {
|
if (applet) {
|
||||||
LOG_WARNING(Service_APT, "applet has already been started id=%08X",
|
NGLOG_WARNING(Service_APT, "applet has already been started id={:08X}",
|
||||||
static_cast<u32>(applet_id));
|
static_cast<u32>(applet_id));
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
return HLE::Applets::Applet::Create(applet_id, shared_from_this());
|
return HLE::Applets::Applet::Create(applet_id, shared_from_this());
|
||||||
|
@ -353,8 +353,8 @@ ResultCode AppletManager::PreloadLibraryApplet(AppletId applet_id) {
|
||||||
// If we weren't able to load the native applet title, try to fallback to an HLE implementation.
|
// If we weren't able to load the native applet title, try to fallback to an HLE implementation.
|
||||||
auto applet = HLE::Applets::Applet::Get(applet_id);
|
auto applet = HLE::Applets::Applet::Get(applet_id);
|
||||||
if (applet) {
|
if (applet) {
|
||||||
LOG_WARNING(Service_APT, "applet has already been started id=%08X",
|
NGLOG_WARNING(Service_APT, "applet has already been started id={:08X}",
|
||||||
static_cast<u32>(applet_id));
|
static_cast<u32>(applet_id));
|
||||||
return RESULT_SUCCESS;
|
return RESULT_SUCCESS;
|
||||||
} else {
|
} else {
|
||||||
return HLE::Applets::Applet::Create(applet_id, shared_from_this());
|
return HLE::Applets::Applet::Create(applet_id, shared_from_this());
|
||||||
|
@ -400,14 +400,15 @@ ResultVal<AppletManager::AppletInfo> AppletManager::GetAppletInfo(AppletId app_i
|
||||||
return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet,
|
return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet,
|
||||||
ErrorSummary::NotFound, ErrorLevel::Status);
|
ErrorSummary::NotFound, ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
LOG_WARNING(Service_APT, "Using HLE applet info for applet %03X", static_cast<u32>(app_id));
|
NGLOG_WARNING(Service_APT, "Using HLE applet info for applet {:03X}",
|
||||||
|
static_cast<u32>(app_id));
|
||||||
// TODO(Subv): Get the title id for the current applet and write it in the response[2-3]
|
// TODO(Subv): Get the title id for the current applet and write it in the response[2-3]
|
||||||
return MakeResult<AppletInfo>({0, Service::FS::MediaType::NAND, true, true, 0});
|
return MakeResult<AppletInfo>({0, Service::FS::MediaType::NAND, true, true, 0});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (app_id == AppletId::Application) {
|
if (app_id == AppletId::Application) {
|
||||||
// TODO(Subv): Implement this once Application launching is implemented
|
// TODO(Subv): Implement this once Application launching is implemented
|
||||||
LOG_ERROR(Service_APT, "Unimplemented GetAppletInfo(Application)");
|
NGLOG_ERROR(Service_APT, "Unimplemented GetAppletInfo(Application)");
|
||||||
return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet, ErrorSummary::NotFound,
|
return ResultCode(ErrorDescription::NotFound, ErrorModule::Applet, ErrorSummary::NotFound,
|
||||||
ErrorLevel::Status);
|
ErrorLevel::Status);
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue