Reintroduce LOG_CHANNEL

Groundwork for further improvements
This commit is contained in:
Nekotekina 2018-08-25 15:39:00 +03:00
parent 57f394e156
commit 363811981d
128 changed files with 266 additions and 268 deletions

View File

@ -7,8 +7,6 @@
namespace cfg namespace cfg
{ {
logs::channel cfg("CFG");
_base::_base(type _type) _base::_base(type _type)
: m_type(_type) : m_type(_type)
{ {
@ -67,19 +65,19 @@ bool cfg::try_to_int64(s64* out, const std::string& value, s64 min, s64 max)
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
if (out) cfg.error("cfg::try_to_int('%s'): exception: %s", value, e.what()); if (out) LOG_ERROR(GENERAL, "cfg::try_to_int('%s'): exception: %s", value, e.what());
return false; return false;
} }
if (pos != value.size()) if (pos != value.size())
{ {
if (out) cfg.error("cfg::try_to_int('%s'): unexpected characters (pos=%zu)", value, pos); if (out) LOG_ERROR(GENERAL, "cfg::try_to_int('%s'): unexpected characters (pos=%zu)", value, pos);
return false; return false;
} }
if (result < min || result > max) if (result < min || result > max)
{ {
if (out) cfg.error("cfg::try_to_int('%s'): out of bounds (%lld..%lld)", value, min, max); if (out) LOG_ERROR(GENERAL, "cfg::try_to_int('%s'): out of bounds (%lld..%lld)", value, min, max);
return false; return false;
} }
@ -119,13 +117,13 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
if (pos != value.size()) if (pos != value.size())
{ {
if (out) cfg.error("cfg::try_to_enum_value('%s'): unexpected characters (pos=%zu)", value, pos); if (out) LOG_ERROR(GENERAL, "cfg::try_to_enum_value('%s'): unexpected characters (pos=%zu)", value, pos);
return false; return false;
} }
if (val > max) if (val > max)
{ {
if (out) cfg.error("cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max); if (out) LOG_ERROR(GENERAL, "cfg::try_to_enum_value('%s'): out of bounds(0..%u)", value, max);
return false; return false;
} }
@ -134,7 +132,7 @@ bool cfg::try_to_enum_value(u64* out, decltype(&fmt_class_string<int>::format) f
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
if (out) cfg.error("cfg::try_to_enum_value('%s'): invalid enum value: %s", value, e.what()); if (out) LOG_ERROR(GENERAL, "cfg::try_to_enum_value('%s'): invalid enum value: %s", value, e.what());
return false; return false;
} }
} }
@ -300,7 +298,7 @@ bool cfg::node::from_string(const std::string& value) try
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
cfg.fatal("%s thrown: %s", typeid(e).name(), e.what()); LOG_FATAL(GENERAL, "%s thrown: %s", typeid(e).name(), e.what());
return false; return false;
} }

View File

@ -19,7 +19,7 @@
extern void ppu_set_breakpoint(u32 addr); extern void ppu_set_breakpoint(u32 addr);
extern void ppu_remove_breakpoint(u32 addr); extern void ppu_remove_breakpoint(u32 addr);
logs::channel gdbDebugServer("gdbDebugServer"); LOG_CHANNEL(gdbDebugServer);
int sock_init(void) int sock_init(void)
{ {

View File

@ -113,6 +113,8 @@ namespace logs
void set_level(const std::string&, level); void set_level(const std::string&, level);
} }
#define LOG_CHANNEL(ch, ...) ::logs::channel ch(#ch, ##__VA_ARGS__);
// Legacy: // Legacy:
#define LOG_SUCCESS(ch, fmt, ...) logs::ch.success("" fmt, ##__VA_ARGS__) #define LOG_SUCCESS(ch, fmt, ...) logs::ch.success("" fmt, ##__VA_ARGS__)

View File

@ -21,7 +21,7 @@ extern "C"
extern std::mutex g_mutex_avcodec_open2; extern std::mutex g_mutex_avcodec_open2;
logs::channel cellAdec("cellAdec"); LOG_CHANNEL(cellAdec);
class AudioDecoder : public ppu_thread class AudioDecoder : public ppu_thread
{ {

View File

@ -4,7 +4,7 @@
#include "cellAtrac.h" #include "cellAtrac.h"
logs::channel cellAtrac("cellAtrac"); LOG_CHANNEL(cellAtrac);
s32 cellAtracSetDataAndGetMemSize(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr<u32> puiWorkMemByte) s32 cellAtracSetDataAndGetMemSize(vm::ptr<CellAtracHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, vm::ptr<u32> puiWorkMemByte)
{ {

View File

@ -4,7 +4,7 @@
#include "cellAtracMulti.h" #include "cellAtracMulti.h"
logs::channel cellAtracMulti("cellAtracMulti"); LOG_CHANNEL(cellAtracMulti);
s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr<CellAtracMultiHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, u32 uiOutputChNum, vm::ptr<s32> piTrackArray, vm::ptr<u32> puiWorkMemByte) s32 cellAtracMultiSetDataAndGetMemSize(vm::ptr<CellAtracMultiHandle> pHandle, vm::ptr<u8> pucBufferAddr, u32 uiReadByte, u32 uiBufferByte, u32 uiOutputChNum, vm::ptr<s32> piTrackArray, vm::ptr<u32> puiWorkMemByte)
{ {

View File

@ -10,7 +10,7 @@
#include <thread> #include <thread>
logs::channel cellAudio("cellAudio"); LOG_CHANNEL(cellAudio);
template <> template <>
void fmt_class_string<CellAudioError>::format(std::string& out, u64 arg) void fmt_class_string<CellAudioError>::format(std::string& out, u64 arg)

View File

@ -9,7 +9,7 @@
#include "cellVideoOut.h" #include "cellVideoOut.h"
#include "cellSysutil.h" #include "cellSysutil.h"
logs::channel cellAvconfExt("cellAvconfExt"); LOG_CHANNEL(cellAvconfExt);
s32 cellAudioOutUnregisterDevice(u32 deviceNumber) s32 cellAudioOutUnregisterDevice(u32 deviceNumber)
{ {

View File

@ -6,7 +6,7 @@
logs::channel cellBGDL("cellBGDL"); LOG_CHANNEL(cellBGDL);
s32 cellBGDLGetInfo(vm::cptr<char> content_id, vm::ptr<CellBGDLInfo> info, s32 num) s32 cellBGDLGetInfo(vm::cptr<char> content_id, vm::ptr<CellBGDLInfo> info, s32 num)
{ {

View File

@ -9,7 +9,7 @@
#include <thread> #include <thread>
logs::channel cellCamera("cellCamera"); LOG_CHANNEL(cellCamera);
// ************** // **************
// * Prototypes * // * Prototypes *

View File

@ -4,7 +4,7 @@
#include "cellCelp8Enc.h" #include "cellCelp8Enc.h"
logs::channel cellCelp8Enc("cellCelp8Enc"); LOG_CHANNEL(cellCelp8Enc);
s32 cellCelp8EncQueryAttr() s32 cellCelp8EncQueryAttr()

View File

@ -4,7 +4,7 @@
#include "cellCelpEnc.h" #include "cellCelpEnc.h"
logs::channel cellCelpEnc("cellCelpEnc"); LOG_CHANNEL(cellCelpEnc);
s32 cellCelpEncQueryAttr() s32 cellCelpEncQueryAttr()

View File

@ -5,7 +5,7 @@
logs::channel cellCrossController("cellCrossController"); LOG_CHANNEL(cellCrossController);
enum enum
{ {

View File

@ -3,7 +3,7 @@
#include "cellDaisy.h" #include "cellDaisy.h"
logs::channel cellDaisy("cellDaisy"); LOG_CHANNEL(cellDaisy);
using LFQueue2 = struct CellDaisyLFQueue2; using LFQueue2 = struct CellDaisyLFQueue2;
using Lock = struct CellDaisyLock; using Lock = struct CellDaisyLock;

View File

@ -9,7 +9,7 @@
#include <thread> #include <thread>
logs::channel cellDmux("cellDmux"); LOG_CHANNEL(cellDmux);
/* Demuxer Thread Classes */ /* Demuxer Thread Classes */

View File

@ -4,7 +4,7 @@
#include "cellFiber.h" #include "cellFiber.h"
logs::channel cellFiber("cellFiber"); LOG_CHANNEL(cellFiber);
template <> template <>
void fmt_class_string<CellFiberError>::format(std::string& out, u64 arg) void fmt_class_string<CellFiberError>::format(std::string& out, u64 arg)

View File

@ -8,7 +8,7 @@
#include "cellFont.h" #include "cellFont.h"
logs::channel cellFont("cellFont"); LOG_CHANNEL(cellFont);
// Functions // Functions
s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontConfig> config) s32 cellFontInitializeWithRevision(u64 revisionFlags, vm::ptr<CellFontConfig> config)

View File

@ -3,7 +3,7 @@
#include "cellFontFT.h" #include "cellFontFT.h"
logs::channel cellFontFT("cellFontFT"); LOG_CHANNEL(cellFontFT);
s32 cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr<CellFontLibraryConfigFT> config, vm::pptr<CellFontLibrary> lib) s32 cellFontInitLibraryFreeTypeWithRevision(u64 revisionFlags, vm::ptr<CellFontLibraryConfigFT> config, vm::pptr<CellFontLibrary> lib)
{ {

View File

@ -13,7 +13,7 @@
logs::channel cellFs("cellFs"); LOG_CHANNEL(cellFs);
error_code cellFsGetPath(u32 fd, vm::ptr<char> out_path) error_code cellFsGetPath(u32 fd, vm::ptr<char> out_path)
{ {

View File

@ -12,7 +12,7 @@
#include <thread> #include <thread>
logs::channel cellGame("cellGame"); LOG_CHANNEL(cellGame);
template<> template<>
void fmt_class_string<CellGameError>::format(std::string& out, u64 arg) void fmt_class_string<CellGameError>::format(std::string& out, u64 arg)

View File

@ -3,7 +3,7 @@
#include "cellGame.h" #include "cellGame.h"
logs::channel cellGameExec("cellGameExec"); LOG_CHANNEL(cellGameExec);
s32 cellGameSetExitParam(u32 execdata) s32 cellGameSetExitParam(u32 execdata)
{ {

View File

@ -10,7 +10,7 @@
#include <thread> #include <thread>
logs::channel cellGcmSys("cellGcmSys"); LOG_CHANNEL(cellGcmSys);
extern s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 count); extern s32 cellGcmCallback(ppu_thread& ppu, vm::ptr<CellGcmContextData> context, u32 count);

View File

@ -8,7 +8,7 @@
#include "pad_thread.h" #include "pad_thread.h"
#include "Utilities/Timer.h" #include "Utilities/Timer.h"
logs::channel cellGem("cellGem"); LOG_CHANNEL(cellGem);
// ********************** // **********************
// * HLE helper structs * // * HLE helper structs *

View File

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "cellGifDec.h" #include "cellGifDec.h"
logs::channel cellGifDec("cellGifDec"); LOG_CHANNEL(cellGifDec);
// cellGifDec aliases (only for cellGifDec.cpp) // cellGifDec aliases (only for cellGifDec.cpp)
using PPMainHandle = vm::pptr<GifDecoder>; using PPMainHandle = vm::pptr<GifDecoder>;

View File

@ -3,7 +3,7 @@
#include "cellHttp.h" #include "cellHttp.h"
logs::channel cellHttp("cellHttp"); LOG_CHANNEL(cellHttp);
s32 cellHttpAuthCacheExport() s32 cellHttpAuthCacheExport()
{ {

View File

@ -11,7 +11,7 @@
#pragma comment(lib, "Winhttp.lib") #pragma comment(lib, "Winhttp.lib")
#endif #endif
logs::channel cellHttpUtil("cellHttpUtil"); LOG_CHANNEL(cellHttpUtil);
s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required) s32 cellHttpUtilParseUri(vm::ptr<CellHttpUri> uri, vm::cptr<char> str, vm::ptr<void> pool, u32 size, vm::ptr<u32> required)
{ {

View File

@ -2,7 +2,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellImeJp.h" #include "cellImeJp.h"
logs::channel cellImeJp("cellImeJp"); LOG_CHANNEL(cellImeJp);
// Return Codes // Return Codes
enum enum

View File

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_fs.h" #include "Emu/Cell/lv2/sys_fs.h"
#include "cellJpgDec.h" #include "cellJpgDec.h"
logs::channel cellJpgDec("cellJpgDec"); LOG_CHANNEL(cellJpgDec);
s32 cellJpgDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam) s32 cellJpgDecCreate(u32 mainHandle, u32 threadInParam, u32 threadOutParam)
{ {

View File

@ -3,7 +3,7 @@
#include "cellJpgEnc.h" #include "cellJpgEnc.h"
logs::channel cellJpgEnc("cellJpgEnc"); LOG_CHANNEL(cellJpgEnc);
s32 cellJpgEncQueryAttr() s32 cellJpgEncQueryAttr()

View File

@ -3,7 +3,7 @@
logs::channel cellKey2char("cellKey2char"); LOG_CHANNEL(cellKey2char);
// Return Codes // Return Codes
enum CellKey2CharError : u32 enum CellKey2CharError : u32

View File

@ -15,7 +15,7 @@ typedef const char *HostCode;
#include "cellL10n.h" #include "cellL10n.h"
logs::channel cellL10n("cellL10n"); LOG_CHANNEL(cellL10n);
// Translate code id to code name. some codepage may has another name. // Translate code id to code name. some codepage may has another name.
// If this makes your compilation fail, try replace the string code with one in "iconv -l" // If this makes your compilation fail, try replace the string code with one in "iconv -l"

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellLibprof("cellLibprof"); LOG_CHANNEL(cellLibprof);
s32 cellUserTraceInit() s32 cellUserTraceInit()
{ {

View File

@ -4,7 +4,7 @@
#include "cellMic.h" #include "cellMic.h"
logs::channel cellMic("cellMic"); LOG_CHANNEL(cellMic);
s32 cellMicInit() s32 cellMicInit()
{ {

View File

@ -11,7 +11,7 @@
#include "cellMusic.h" #include "cellMusic.h"
logs::channel cellMusic("cellMusic"); LOG_CHANNEL(cellMusic);
struct music_t struct music_t
{ {

View File

@ -10,7 +10,7 @@
logs::channel cellMusicDecode("cellMusicDecode"); LOG_CHANNEL(cellMusicDecode);
// Return Codes // Return Codes
enum enum

View File

@ -4,7 +4,7 @@
logs::channel cellMusicExport("cellMusicExport"); LOG_CHANNEL(cellMusicExport);
// Return Codes // Return Codes
enum enum

View File

@ -8,7 +8,7 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
logs::channel cellNetCtl("cellNetCtl"); LOG_CHANNEL(cellNetCtl);
template <> template <>
void fmt_class_string<CellNetCtlError>::format(std::string& out, u64 arg) void fmt_class_string<CellNetCtlError>::format(std::string& out, u64 arg)

View File

@ -6,7 +6,7 @@
#include "cellOskDialog.h" #include "cellOskDialog.h"
#include "cellMsgDialog.h" #include "cellMsgDialog.h"
logs::channel cellOskDialog("cellOskDialog"); LOG_CHANNEL(cellOskDialog);
static char16_t s_osk_text[CELL_OSKDIALOG_STRING_SIZE]; static char16_t s_osk_text[CELL_OSKDIALOG_STRING_SIZE];

View File

@ -4,7 +4,7 @@
logs::channel cellOvis("cellOvis"); LOG_CHANNEL(cellOvis);
// Return Codes // Return Codes
enum enum

View File

@ -12,7 +12,7 @@ bool squeue_test_exit()
return Emu.IsStopped(); return Emu.IsStopped();
} }
logs::channel cellPamf("cellPamf"); LOG_CHANNEL(cellPamf);
s32 pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId) s32 pamfStreamTypeToEsFilterId(u8 type, u8 ch, CellCodecEsFilterId& pEsFilterId)
{ {

View File

@ -4,7 +4,7 @@
logs::channel cellPhotoDecode("cellPhotoDecode"); LOG_CHANNEL(cellPhotoDecode);
// Return Codes // Return Codes
enum enum

View File

@ -4,7 +4,7 @@
logs::channel cellPhotoExport("cellPhotoExport"); LOG_CHANNEL(cellPhotoExport);
// Return Codes // Return Codes
enum enum

View File

@ -5,7 +5,7 @@
logs::channel cellPhotoImportUtil("cellPhotoImportUtil"); LOG_CHANNEL(cellPhotoImportUtil);
// Return Codes // Return Codes
enum enum

View File

@ -19,7 +19,7 @@ typedef png_bytep iCCP_profile_type;
typedef png_charp iCCP_profile_type; typedef png_charp iCCP_profile_type;
#endif #endif
logs::channel cellPngDec("cellPngDec"); LOG_CHANNEL(cellPngDec);
// cellPngDec aliases to improve readability // cellPngDec aliases to improve readability
using PPHandle = vm::pptr<PngHandle>; using PPHandle = vm::pptr<PngHandle>;

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellPngEnc("cellPngEnc"); LOG_CHANNEL(cellPngEnc);
// Error Codes // Error Codes
enum enum

View File

@ -4,7 +4,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellSysutil.h" #include "cellSysutil.h"
logs::channel cellPrint("cellPrint"); LOG_CHANNEL(cellPrint);
// Error Codes // Error Codes
enum enum

View File

@ -5,7 +5,7 @@
logs::channel cellRec("cellRec"); LOG_CHANNEL(cellRec);
enum enum
{ {

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellRemotePlay("cellRemotePlay"); LOG_CHANNEL(cellRemotePlay);
s32 cellRemotePlayGetStatus() s32 cellRemotePlayGetStatus()
{ {

View File

@ -6,7 +6,7 @@
#include "Emu/RSX/GCM.h" #include "Emu/RSX/GCM.h"
#include "cellResc.h" #include "cellResc.h"
logs::channel cellResc("cellResc"); LOG_CHANNEL(cellResc);
s32 cellRescInit(vm::ptr<CellRescInitConfig> initConfig) s32 cellRescInit(vm::ptr<CellRescInitConfig> initConfig)
{ {

View File

@ -3,7 +3,7 @@
#include "cellRtc.h" #include "cellRtc.h"
logs::channel cellRtc("cellRtc"); LOG_CHANNEL(cellRtc);
s64 convertToUNIXTime(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years) s64 convertToUNIXTime(u16 seconds, u16 minutes, u16 hours, u16 days, s32 years)
{ {

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellRtcAlarm("cellRtcAlarm"); LOG_CHANNEL(cellRtcAlarm);
s32 cellRtcAlarmRegister() s32 cellRtcAlarmRegister()
{ {

View File

@ -5,7 +5,7 @@
#include "cellRudp.h" #include "cellRudp.h"
logs::channel cellRudp("cellRudp"); LOG_CHANNEL(cellRudp);
struct rudp_t struct rudp_t
{ {

View File

@ -5,7 +5,7 @@
#include "cellSail.h" #include "cellSail.h"
#include "cellPamf.h" #include "cellPamf.h"
logs::channel cellSail("cellSail"); LOG_CHANNEL(cellSail);
s32 cellSailMemAllocatorInitialize(vm::ptr<CellSailMemAllocator> pSelf, vm::ptr<CellSailMemAllocatorFuncs> pCallbacks) s32 cellSailMemAllocatorInitialize(vm::ptr<CellSailMemAllocator> pSelf, vm::ptr<CellSailMemAllocatorFuncs> pCallbacks)
{ {

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSailRec("cellSailRec"); LOG_CHANNEL(cellSailRec);
// Error Codes // Error Codes
enum enum

View File

@ -11,7 +11,7 @@
#include <mutex> #include <mutex>
#include <algorithm> #include <algorithm>
logs::channel cellSaveData("cellSaveData"); LOG_CHANNEL(cellSaveData);
SaveDialogBase::~SaveDialogBase() SaveDialogBase::~SaveDialogBase()
{ {

View File

@ -6,7 +6,7 @@
logs::channel cellScreenshot("cellScreenshot"); LOG_CHANNEL(cellScreenshot);
s32 cellScreenShotSetParameter(vm::cptr<CellScreenShotSetParam> param) s32 cellScreenShotSetParameter(vm::cptr<CellScreenShotSetParam> param)
{ {

View File

@ -7,7 +7,7 @@
#include "cellSearch.h" #include "cellSearch.h"
logs::channel cellSearch("cellSearch"); LOG_CHANNEL(cellSearch);
template<> template<>
void fmt_class_string<CellSearchError>::format(std::string& out, u64 arg) void fmt_class_string<CellSearchError>::format(std::string& out, u64 arg)

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSheap("cellSheap"); LOG_CHANNEL(cellSheap);
// Return Codes // Return Codes
enum enum

View File

@ -5,7 +5,7 @@
logs::channel cellSpudll("cellSpudll"); LOG_CHANNEL(cellSpudll);
template<> template<>
void fmt_class_string<CellSpudllError>::format(std::string& out, u64 arg) void fmt_class_string<CellSpudllError>::format(std::string& out, u64 arg)

View File

@ -15,7 +15,7 @@
#include "sysPrxForUser.h" #include "sysPrxForUser.h"
#include "cellSpurs.h" #include "cellSpurs.h"
logs::channel cellSpurs("cellSpurs"); LOG_CHANNEL(cellSpurs);
error_code sys_spu_image_close(vm::ptr<sys_spu_image> img); error_code sys_spu_image_close(vm::ptr<sys_spu_image> img);

View File

@ -8,7 +8,7 @@
#include "cellSpurs.h" #include "cellSpurs.h"
#include "cellSpursJq.h" #include "cellSpursJq.h"
logs::channel cellSpursJq("cellSpursJq"); LOG_CHANNEL(cellSpursJq);
s32 cellSpursJobQueueAttributeInitialize() s32 cellSpursJobQueueAttributeInitialize()
{ {

View File

@ -7,7 +7,7 @@
#include "Utilities/File.h" #include "Utilities/File.h"
#include "Emu/VFS.h" #include "Emu/VFS.h"
logs::channel cellSsl("cellSsl"); LOG_CHANNEL(cellSsl);

View File

@ -3,7 +3,7 @@
#include "cellSubDisplay.h" #include "cellSubDisplay.h"
logs::channel cellSubDisplay("cellSubDisplay"); LOG_CHANNEL(cellSubDisplay);
template<> template<>
void fmt_class_string<CellSubDisplayError>::format(std::string& out, u64 arg) void fmt_class_string<CellSubDisplayError>::format(std::string& out, u64 arg)

View File

@ -6,7 +6,7 @@
#include "Emu/Cell/lv2/sys_process.h" #include "Emu/Cell/lv2/sys_process.h"
#include "cellSync.h" #include "cellSync.h"
logs::channel cellSync("cellSync"); LOG_CHANNEL(cellSync);
template<> template<>
void fmt_class_string<CellSyncError>::format(std::string& out, u64 arg) void fmt_class_string<CellSyncError>::format(std::string& out, u64 arg)

View File

@ -6,7 +6,7 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
logs::channel cellSync2("cellSync2"); LOG_CHANNEL(cellSync2);
vm::gvar<CellSync2CallerThreadType> gCellSync2CallerThreadTypePpuThread; vm::gvar<CellSync2CallerThreadType> gCellSync2CallerThreadTypePpuThread;
vm::gvar<CellSync2Notifier> gCellSync2NotifierPpuThread; vm::gvar<CellSync2Notifier> gCellSync2NotifierPpuThread;

View File

@ -4,7 +4,7 @@
#include "cellSysconf.h" #include "cellSysconf.h"
logs::channel cellSysconf("cellSysconf"); LOG_CHANNEL(cellSysconf);
s32 cellSysconfAbort() s32 cellSysconfAbort()
{ {

View File

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSysmodule("cellSysmodule"); LOG_CHANNEL(cellSysmodule);
enum enum
{ {

View File

@ -10,7 +10,7 @@
#include <mutex> #include <mutex>
#include <queue> #include <queue>
logs::channel cellSysutil("cellSysutil"); LOG_CHANNEL(cellSysutil);
struct sysutil_cb_manager struct sysutil_cb_manager
{ {

View File

@ -3,7 +3,7 @@
logs::channel cellSysutilAp("cellSysutilAp"); LOG_CHANNEL(cellSysutilAp);
// Return Codes // Return Codes
enum enum

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilAvc("cellSysutilAvc"); LOG_CHANNEL(cellSysutilAvc);
s32 cellSysutilAvcByeRequest() s32 cellSysutilAvcByeRequest()
{ {

View File

@ -5,7 +5,7 @@
#include "sceNp2.h" #include "sceNp2.h"
#include "cellSysutilAvc2.h" #include "cellSysutilAvc2.h"
logs::channel cellSysutilAvc2("cellSysutilAvc2"); LOG_CHANNEL(cellSysutilAvc2);
template<> template<>
void fmt_class_string<CellSysutilAvc2Error>::format(std::string& out, u64 arg) void fmt_class_string<CellSysutilAvc2Error>::format(std::string& out, u64 arg)

View File

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilMisc("cellSysutilMisc"); LOG_CHANNEL(cellSysutilMisc);
// License areas // License areas
enum enum

View File

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellSysutilNpEula("cellSysutilNpEula"); LOG_CHANNEL(cellSysutilNpEula);
s32 cellSysutilNpEula_59D1629A() // Resistance 3, Uncharted 2 s32 cellSysutilNpEula_59D1629A() // Resistance 3, Uncharted 2
{ {

View File

@ -3,7 +3,7 @@
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
#include "cellUsbd.h" #include "cellUsbd.h"
logs::channel cellUsbd("cellUsbd"); LOG_CHANNEL(cellUsbd);
s32 cellUsbdInit() s32 cellUsbdInit()
{ {

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cellUsbPspcm("cellUsbPspcm"); LOG_CHANNEL(cellUsbPspcm);
// Return Codes // Return Codes
enum enum

View File

@ -7,7 +7,7 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
#include "cellSysutil.h" #include "cellSysutil.h"
logs::channel cellUserInfo("cellUserInfo"); LOG_CHANNEL(cellUserInfo);
template<> template<>
void fmt_class_string<CellUserInfoError>::format(std::string& out, u64 arg) void fmt_class_string<CellUserInfoError>::format(std::string& out, u64 arg)

View File

@ -22,7 +22,7 @@ extern "C"
std::mutex g_mutex_avcodec_open2; std::mutex g_mutex_avcodec_open2;
logs::channel cellVdec("cellVdec"); LOG_CHANNEL(cellVdec);
vm::gvar<s32> _cell_vdec_prx_ver; // ??? vm::gvar<s32> _cell_vdec_prx_ver; // ???

View File

@ -5,7 +5,7 @@
logs::channel cellVideoExport("cellVideoExport"); LOG_CHANNEL(cellVideoExport);
struct CellVideoExportSetParam struct CellVideoExportSetParam
{ {

View File

@ -4,7 +4,7 @@
#include "cellVideoUpload.h" #include "cellVideoUpload.h"
#include "cellSysutil.h" #include "cellSysutil.h"
logs::channel cellVideoUpload("cellVideoUpload"); LOG_CHANNEL(cellVideoUpload);
error_code cellVideoUploadInitialize(vm::cptr<CellVideoUploadParam> pParam, vm::ptr<CellVideoUploadCallback> cb, vm::ptr<void> userdata) error_code cellVideoUploadInitialize(vm::cptr<CellVideoUploadParam> pParam, vm::ptr<CellVideoUploadCallback> cb, vm::ptr<void> userdata)
{ {

View File

@ -4,7 +4,7 @@
#include "cellVoice.h" #include "cellVoice.h"
logs::channel cellVoice("cellVoice"); LOG_CHANNEL(cellVoice);
s32 cellVoiceConnectIPortToOPort() s32 cellVoiceConnectIPortToOPort()

View File

@ -10,7 +10,7 @@ extern "C"
#include "cellVpost.h" #include "cellVpost.h"
logs::channel cellVpost("cellVpost"); LOG_CHANNEL(cellVpost);
s32 cellVpostQueryAttr(vm::cptr<CellVpostCfgParam> cfgParam, vm::ptr<CellVpostAttr> attr) s32 cellVpostQueryAttr(vm::cptr<CellVpostCfgParam> cfgParam, vm::ptr<CellVpostAttr> attr)
{ {

View File

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel cell_FreeType2("cell_FreeType2"); LOG_CHANNEL(cell_FreeType2);
// Functions // Functions
s32 cellFreeType2Ex() s32 cellFreeType2Ex()

View File

@ -2,7 +2,7 @@
#include "Emu/System.h" #include "Emu/System.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel libmedi("libmedi"); LOG_CHANNEL(libmedi);
s32 cellMediatorCloseContext() s32 cellMediatorCloseContext()
{ {

View File

@ -11,7 +11,7 @@
#include <thread> #include <thread>
#include <mutex> #include <mutex>
logs::channel libmixer("libmixer"); LOG_CHANNEL(libmixer);
struct SurMixerConfig struct SurMixerConfig
{ {

View File

@ -3,7 +3,7 @@
#include "libsnd3.h" #include "libsnd3.h"
logs::channel libsnd3("libsnd3"); LOG_CHANNEL(libsnd3);
s32 cellSnd3Init(u32 maxVoice, u32 samples, vm::ptr<CellSnd3RequestQueueCtx> queue) s32 cellSnd3Init(u32 maxVoice, u32 samples, vm::ptr<CellSnd3RequestQueueCtx> queue)
{ {

View File

@ -5,7 +5,7 @@
logs::channel libsynth2("libsynth2"); LOG_CHANNEL(libsynth2);
s32 cellSoundSynth2Config(s16 param, s32 value) s32 cellSoundSynth2Config(s16 param, s32 value)
{ {

View File

@ -10,7 +10,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "cellSysutil.h" #include "cellSysutil.h"
logs::channel sceNp("sceNp"); LOG_CHANNEL(sceNp);
s32 g_psn_connection_status = SCE_NP_MANAGER_STATUS_OFFLINE; s32 g_psn_connection_status = SCE_NP_MANAGER_STATUS_OFFLINE;

View File

@ -4,7 +4,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "sceNp2.h" #include "sceNp2.h"
logs::channel sceNp2("sceNp2"); LOG_CHANNEL(sceNp2);
s32 sceNp2Init(u32 poolsize, vm::ptr<void> poolptr) s32 sceNp2Init(u32 poolsize, vm::ptr<void> poolptr)
{ {

View File

@ -5,7 +5,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "sceNpClans.h" #include "sceNpClans.h"
logs::channel sceNpClans("sceNpClans"); LOG_CHANNEL(sceNpClans);
s32 sceNpClansInit(vm::ptr<SceNpCommunicationId> commId, vm::ptr<SceNpCommunicationPassphrase> passphrase, vm::ptr<void> pool, vm::ptr<u32> poolSize, u32 flags) s32 sceNpClansInit(vm::ptr<SceNpCommunicationId> commId, vm::ptr<SceNpCommunicationPassphrase> passphrase, vm::ptr<void> pool, vm::ptr<u32> poolSize, u32 flags)
{ {

View File

@ -3,7 +3,7 @@
#include "sceNpCommerce2.h" #include "sceNpCommerce2.h"
logs::channel sceNpCommerce2("sceNpCommerce2"); LOG_CHANNEL(sceNpCommerce2);
s32 sceNpCommerce2ExecuteStoreBrowse() s32 sceNpCommerce2ExecuteStoreBrowse()
{ {

View File

@ -4,7 +4,7 @@
logs::channel sceNpMatchingInt("sceNpMatchingInt"); LOG_CHANNEL(sceNpMatchingInt);
s32 sceNpMatchingGetRoomMemberList() s32 sceNpMatchingGetRoomMemberList()
{ {

View File

@ -4,7 +4,7 @@
#include "sceNpSns.h" #include "sceNpSns.h"
logs::channel sceNpSns("sceNpSns"); LOG_CHANNEL(sceNpSns);
template<> template<>
void fmt_class_string<sceNpSnsError>::format(std::string& out, u64 arg) void fmt_class_string<sceNpSnsError>::format(std::string& out, u64 arg)

View File

@ -14,7 +14,7 @@
#include "Utilities/StrUtil.h" #include "Utilities/StrUtil.h"
logs::channel sceNpTrophy("sceNpTrophy"); LOG_CHANNEL(sceNpTrophy);
TrophyNotificationBase::~TrophyNotificationBase() TrophyNotificationBase::~TrophyNotificationBase()
{ {

View File

@ -4,7 +4,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "sceNpTus.h" #include "sceNpTus.h"
logs::channel sceNpTus("sceNpTus"); LOG_CHANNEL(sceNpTus);
s32 sceNpTusInit() s32 sceNpTusInit()
{ {

View File

@ -4,7 +4,7 @@
#include "sceNp.h" #include "sceNp.h"
#include "sceNpUtil.h" #include "sceNpUtil.h"
logs::channel sceNpUtil("sceNpUtil"); LOG_CHANNEL(sceNpUtil);
s32 sceNpUtilBandwidthTestInitStart(u32 prio, size_t stack) s32 sceNpUtilBandwidthTestInitStart(u32 prio, size_t stack)
{ {

View File

@ -9,7 +9,7 @@
#include "Emu/Cell/lv2/sys_tty.h" #include "Emu/Cell/lv2/sys_tty.h"
#include "sysPrxForUser.h" #include "sysPrxForUser.h"
logs::channel sysPrxForUser("sysPrxForUser"); LOG_CHANNEL(sysPrxForUser);
extern u64 get_system_time(); extern u64 get_system_time();

View File

@ -1,7 +1,7 @@
#include "stdafx.h" #include "stdafx.h"
#include "Emu/Cell/PPUModule.h" #include "Emu/Cell/PPUModule.h"
logs::channel sys_io("sys_io"); LOG_CHANNEL(sys_io);
extern void cellPad_init(); extern void cellPad_init();
extern void cellKb_init(); extern void cellKb_init();

View File

@ -5,7 +5,7 @@
logs::channel sys_libc("sys_libc"); LOG_CHANNEL(sys_libc);
void sys_libc_memcpy(vm::ptr<void> dst, vm::cptr<void> src, u32 size) void sys_libc_memcpy(vm::ptr<void> dst, vm::cptr<void> src, u32 size)
{ {

View File

@ -5,7 +5,7 @@
#include "sys_lv2dbg.h" #include "sys_lv2dbg.h"
logs::channel sys_lv2dbg("sys_lv2dbg"); LOG_CHANNEL(sys_lv2dbg);
template <> template <>
void fmt_class_string<CellLv2DbgError>::format(std::string& out, u64 arg) void fmt_class_string<CellLv2DbgError>::format(std::string& out, u64 arg)

View File

@ -6,7 +6,7 @@
logs::channel libnet("libnet"); LOG_CHANNEL(libnet);
struct sys_net_tls_data struct sys_net_tls_data
{ {

Some files were not shown because too many files have changed in this diff Show More