archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 15:31:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove HLE log channel

Browse source
This commit is contained in:
Nekotekina 2020-02-01 11:23:50 +03:00
parent 15391f45d0
commit 21f7b0ff0f
13 changed files with 77 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Utilities/Log.h
View file

@ -122,7 +122,6 @@ namespace logs
namespace logs namespace logs
{ {
/* Small set of predefined channels */ /* Small set of predefined channels */
LOG_CHANNEL(HLE);
LOG_CHANNEL(PPU); LOG_CHANNEL(PPU);
LOG_CHANNEL(SPU); LOG_CHANNEL(SPU);
} }

6
rpcs3/Emu/Cell/Modules/cellAdec.cpp
View file

@ -453,7 +453,7 @@ public:
reader.addr = task.au.addr; reader.addr = task.au.addr;
reader.size = task.au.size; reader.size = task.au.size;
reader.has_ats = use_ats_headers; reader.has_ats = use_ats_headers;
//LOG_NOTICE(HLE, "Audio AU: size = 0x%x, pts = 0x%llx", task.au.size, task.au.pts); //cellAdec.notice("Audio AU: size = 0x%x, pts = 0x%llx", task.au.size, task.au.pts);
if (just_started) if (just_started)
{ {
@ -610,7 +610,7 @@ public:
frame.userdata = task.au.userdata; frame.userdata = task.au.userdata;
frame.size = frame.data->nb_samples * frame.data->channels * nbps; frame.size = frame.data->nb_samples * frame.data->channels * nbps;
//LOG_NOTICE(HLE, "got audio frame (pts=0x%llx, nb_samples=%d, ch=%d, sample_rate=%d, nbps=%d)", //cellAdec.notice("got audio frame (pts=0x%llx, nb_samples=%d, ch=%d, sample_rate=%d, nbps=%d)",
//frame.pts, frame.data->nb_samples, frame.data->channels, frame.data->sample_rate, nbps); //frame.pts, frame.data->nb_samples, frame.data->channels, frame.data->sample_rate, nbps);
if (frames.push(frame, &is_closed)) if (frames.push(frame, &is_closed))
@ -714,7 +714,7 @@ next:
adec.reader.addr = adec.task.au.addr; adec.reader.addr = adec.task.au.addr;
adec.reader.size = adec.task.au.size; adec.reader.size = adec.task.au.size;
adec.reader.has_ats = adec.use_ats_headers; adec.reader.has_ats = adec.use_ats_headers;
//LOG_NOTICE(HLE, "Audio AU: size = 0x%x, pts = 0x%llx", adec.task.au.size, adec.task.au.pts); //cellAdec.notice("Audio AU: size = 0x%x, pts = 0x%llx", adec.task.au.size, adec.task.au.pts);
} }
break; break;

2
rpcs3/Emu/Cell/Modules/cellCamera.cpp
View file

@ -1403,7 +1403,7 @@ void camera_context::set_attr(s32 attrib, u32 arg1, u32 arg2)
{ {
if (arg1 != CELL_CAMERA_READ_FUNCCALL && arg1 != CELL_CAMERA_READ_DIRECT) if (arg1 != CELL_CAMERA_READ_FUNCCALL && arg1 != CELL_CAMERA_READ_DIRECT)
{ {
LOG_WARNING(HLE, "Unknown read mode set: %d", arg1); cellCamera.warning("Unknown read mode set: %d", arg1);
arg1 = CELL_CAMERA_READ_FUNCCALL; arg1 = CELL_CAMERA_READ_FUNCCALL;
} }
read_mode.exchange(arg1); read_mode.exchange(arg1);

2
rpcs3/Emu/Cell/Modules/cellDmux.cpp
View file

@ -524,7 +524,7 @@ public:
} }
stream = task.stream; stream = task.stream;
//LOG_NOTICE(HLE, "*** stream updated(addr=0x%x, size=0x%x, discont=%d, userdata=0x%llx)", //cellDmux.notice("*** stream updated(addr=0x%x, size=0x%x, discont=%d, userdata=0x%llx)",
//stream.addr, stream.size, stream.discontinuity, stream.userdata); //stream.addr, stream.size, stream.discontinuity, stream.userdata);
break; break;
} }

18
rpcs3/Emu/Cell/Modules/sysPrxForUser.cpp
View file

@ -112,31 +112,31 @@ error_code console_write(vm::ptr<char> data, u32 len)
s32 cellGamePs1Emu_61CE2BCD() s32 cellGamePs1Emu_61CE2BCD()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 cellSysconfPs1emu_639ABBDE() s32 cellSysconfPs1emu_639ABBDE()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 cellSysconfPs1emu_6A12D11F() s32 cellSysconfPs1emu_6A12D11F()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 cellSysconfPs1emu_83E79A23() s32 cellSysconfPs1emu_83E79A23()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 cellSysconfPs1emu_EFDDAF6C() s32 cellSysconfPs1emu_EFDDAF6C()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
@ -171,25 +171,25 @@ error_code sys_crash_dump_set_user_log_area(u8 index, vm::ptr<sys_crash_dump_log
s32 sys_get_bd_media_id() s32 sys_get_bd_media_id()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 sys_get_console_id() s32 sys_get_console_id()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 sysPs2Disc_A84FD3C3() s32 sysPs2Disc_A84FD3C3()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }
s32 sysPs2Disc_BB7CD1AE() s32 sysPs2Disc_BB7CD1AE()
{ {
UNIMPLEMENTED_FUNC(logs::HLE); UNIMPLEMENTED_FUNC(sysPrxForUser);
return CELL_OK; return CELL_OK;
} }

4
rpcs3/Emu/Cell/lv2/lv2.cpp
View file

@ -47,7 +47,7 @@ void fmt_class_string<ppu_syscall_code>::format(std::string& out, u64 arg)
static bool null_func(ppu_thread& ppu) static bool null_func(ppu_thread& ppu)
{ {
LOG_TODO(HLE, "Unimplemented syscall %s -> CELL_OK", ppu_syscall_code(ppu.gpr[11])); LOG_TODO(PPU, "Unimplemented syscall %s -> CELL_OK", ppu_syscall_code(ppu.gpr[11]));
ppu.gpr[3] = 0; ppu.gpr[3] = 0;
ppu.cia += 4; ppu.cia += 4;
return false; return false;
@ -55,7 +55,7 @@ static bool null_func(ppu_thread& ppu)
static bool uns_func(ppu_thread& ppu) static bool uns_func(ppu_thread& ppu)
{ {
LOG_TRACE(HLE, "Unused syscall %d -> ENOSYS", ppu.gpr[11]); LOG_TRACE(PPU, "Unused syscall %d -> ENOSYS", ppu.gpr[11]);
ppu.gpr[3] = CELL_ENOSYS; ppu.gpr[3] = CELL_ENOSYS;
ppu.cia += 4; ppu.cia += 4;
return false; return false;

18
rpcs3/Emu/Io/PadHandler.cpp
View file

@ -4,6 +4,8 @@
cfg_input g_cfg_input; cfg_input g_cfg_input;
LOG_CHANNEL(input_log, "Input");
PadHandlerBase::PadHandlerBase(pad_handler type) : m_type(type) PadHandlerBase::PadHandlerBase(pad_handler type) : m_type(type)
{ {
} }
@ -26,7 +28,7 @@ int PadHandlerBase::FindKeyCode(const std::unordered_map<u32, std::string>& map,
if (fallback) if (fallback)
{ {
LOG_ERROR(HLE, "int FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def); input_log.error("int FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def);
if (def_code < 0) if (def_code < 0)
def_code = 0; def_code = 0;
} }
@ -51,7 +53,7 @@ long PadHandlerBase::FindKeyCode(const std::unordered_map<u64, std::string>& map
if (fallback) if (fallback)
{ {
LOG_ERROR(HLE, "long FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def); input_log.error("long FindKeyCode for [name = %s] returned with [def_code = %d] for [def = %s]", nam, def_code, def);
if (def_code < 0) if (def_code < 0)
def_code = 0; def_code = 0;
} }
@ -70,7 +72,7 @@ int PadHandlerBase::FindKeyCodeByString(const std::unordered_map<u32, std::strin
if (fallback) if (fallback)
{ {
LOG_ERROR(HLE, "long FindKeyCodeByString for [name = %s] returned with 0", name); input_log.error("long FindKeyCodeByString for [name = %s] returned with 0", name);
return 0; return 0;
} }
@ -88,7 +90,7 @@ long PadHandlerBase::FindKeyCodeByString(const std::unordered_map<u64, std::stri
if (fallback) if (fallback)
{ {
LOG_ERROR(HLE, "long FindKeyCodeByString for [name = %s] returned with 0", name); input_log.error("long FindKeyCodeByString for [name = %s] returned with 0", name);
return 0; return 0;
} }
@ -344,7 +346,7 @@ void PadHandlerBase::get_next_button_press(const std::string& pad_id, const std:
if (get_blacklist) if (get_blacklist)
{ {
blacklist.emplace_back(keycode); blacklist.emplace_back(keycode);
LOG_ERROR(HLE, "%s Calibration: Added key [ %d = %s ] to blacklist. Value = %d", m_type, keycode, button.second, value); input_log.error("%s Calibration: Added key [ %d = %s ] to blacklist. Value = %d", m_type, keycode, button.second, value);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, button.second }; pressed_button = { value, button.second };
@ -354,7 +356,7 @@ void PadHandlerBase::get_next_button_press(const std::string& pad_id, const std:
if (get_blacklist) if (get_blacklist)
{ {
if (blacklist.empty()) if (blacklist.empty())
LOG_SUCCESS(HLE, "%s Calibration: Blacklist is clear. No input spam detected", m_type); input_log.success("%s Calibration: Blacklist is clear. No input spam detected", m_type);
return; return;
} }
@ -586,7 +588,7 @@ void PadHandlerBase::ThreadProc()
{ {
if (!last_connection_status[i]) if (!last_connection_status[i])
{ {
LOG_SUCCESS(HLE, "%s device %d connected", m_type, i); input_log.success("%s device %d connected", m_type, i);
pad->m_port_status |= CELL_PAD_STATUS_CONNECTED; pad->m_port_status |= CELL_PAD_STATUS_CONNECTED;
pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES; pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
last_connection_status[i] = true; last_connection_status[i] = true;
@ -602,7 +604,7 @@ void PadHandlerBase::ThreadProc()
{ {
if (last_connection_status[i]) if (last_connection_status[i])
{ {
LOG_ERROR(HLE, "%s device %d disconnected", m_type, i); input_log.error("%s device %d disconnected", m_type, i);
pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED; pad->m_port_status &= ~CELL_PAD_STATUS_CONNECTED;
pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES; pad->m_port_status |= CELL_PAD_STATUS_ASSIGN_CHANGES;
last_connection_status[i] = false; last_connection_status[i] = false;

14
rpcs3/Input/ds3_pad_handler.cpp
View file

@ -2,6 +2,8 @@
#include <thread> #include <thread>
LOG_CHANNEL(ds3_log, "DS3");
ds3_pad_handler::ds3_pad_handler() : PadHandlerBase(pad_handler::ds3) ds3_pad_handler::ds3_pad_handler() : PadHandlerBase(pad_handler::ds3)
{ {
button_list = button_list =
@ -67,7 +69,7 @@ bool ds3_pad_handler::init_usb()
{ {
if (hid_init() != 0) if (hid_init() != 0)
{ {
LOG_FATAL(HLE, "[DS3] Failed to init hidapi for the DS3 pad handler"); ds3_log.fatal("Failed to init hidapi for the DS3 pad handler");
return false; return false;
} }
return true; return true;
@ -118,18 +120,18 @@ bool ds3_pad_handler::Init()
if (warn_about_drivers) if (warn_about_drivers)
{ {
LOG_ERROR(HLE, "[DS3] One or more DS3 pads were detected but couldn't be interacted with directly"); ds3_log.error("One or more DS3 pads were detected but couldn't be interacted with directly");
#if defined(_WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)
LOG_ERROR(HLE, "[DS3] Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue"); ds3_log.error("Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue");
#endif #endif
} }
else if (controllers.empty()) else if (controllers.empty())
{ {
LOG_WARNING(HLE, "[DS3] No controllers found!"); ds3_log.warning("No controllers found!");
} }
else else
{ {
LOG_SUCCESS(HLE, "[DS3] Controllers found: %d", controllers.size()); ds3_log.success("Controllers found: %d", controllers.size());
} }
is_init = true; is_init = true;
@ -301,7 +303,7 @@ ds3_pad_handler::DS3Status ds3_pad_handler::get_data(const std::shared_ptr<ds3_d
} }
else else
{ {
LOG_WARNING(HLE, "[DS3] Unknown packet received:0x%02x", dbuf[0]); ds3_log.warning("Unknown packet received:0x%02x", dbuf[0]);
return DS3Status::Connected; return DS3Status::Connected;
} }
} }

22
rpcs3/Input/ds4_pad_handler.cpp
View file

@ -2,6 +2,8 @@
#include <thread> #include <thread>
LOG_CHANNEL(ds4_log, "DS4");
namespace namespace
{ {
const auto THREAD_SLEEP = 1ms; //ds4 has new data every ~4ms, const auto THREAD_SLEEP = 1ms; //ds4 has new data every ~4ms,
@ -242,7 +244,7 @@ std::shared_ptr<ds4_pad_handler::DS4Device> ds4_pad_handler::GetDS4Device(const
if (device->hidDevice) if (device->hidDevice)
{ {
hid_set_nonblocking(device->hidDevice, 1); hid_set_nonblocking(device->hidDevice, 1);
LOG_NOTICE(HLE, "DS4 device %d reconnected", i); ds4_log.notice("DS4 device %d reconnected", i);
} }
} }
break; break;
@ -387,7 +389,7 @@ bool ds4_pad_handler::GetCalibrationData(const std::shared_ptr<DS4Device>& ds4De
const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), (DS4_FEATURE_REPORT_0x05_SIZE - 4), crcTable, crcHdr); const u32 crcCalc = CRCPP::CRC::Calculate(buf.data(), (DS4_FEATURE_REPORT_0x05_SIZE - 4), crcTable, crcHdr);
const u32 crcReported = read_u32(&buf[DS4_FEATURE_REPORT_0x05_SIZE - 4]); const u32 crcReported = read_u32(&buf[DS4_FEATURE_REPORT_0x05_SIZE - 4]);
if (crcCalc != crcReported) if (crcCalc != crcReported)
LOG_WARNING(HLE, "[DS4] Calibration CRC check failed! Will retry up to 3 times. Received 0x%x, Expected 0x%x", crcReported, crcCalc); ds4_log.warning("Calibration CRC check failed! Will retry up to 3 times. Received 0x%x, Expected 0x%x", crcReported, crcCalc);
else break; else break;
if (tries == 2) if (tries == 2)
return false; return false;
@ -398,7 +400,7 @@ bool ds4_pad_handler::GetCalibrationData(const std::shared_ptr<DS4Device>& ds4De
buf[0] = 0x02; buf[0] = 0x02;
if (hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_0x02_SIZE) <= 0) if (hid_get_feature_report(ds4Dev->hidDevice, buf.data(), DS4_FEATURE_REPORT_0x02_SIZE) <= 0)
{ {
LOG_ERROR(HLE, "[DS4] Failed getting calibration data report!"); ds4_log.error("Failed getting calibration data report!");
return false; return false;
} }
} }
@ -497,7 +499,7 @@ void ds4_pad_handler::CheckAddDevice(hid_device* hidDevice, hid_device_info* hid
if (length != DS4_FEATURE_REPORT_0x81_SIZE) if (length != DS4_FEATURE_REPORT_0x81_SIZE)
{ {
// Controller may not be genuine. These controllers do not have feature 0x81 implemented and calibration data is in bluetooth format even in USB mode! // Controller may not be genuine. These controllers do not have feature 0x81 implemented and calibration data is in bluetooth format even in USB mode!
LOG_WARNING(HLE, "DS4 controller may not be genuine. Workaround enabled."); ds4_log.warning("DS4 controller may not be genuine. Workaround enabled.");
// Read feature report 0x12 instead which is what the console uses. // Read feature report 0x12 instead which is what the console uses.
buf[0] = 0x12; buf[0] = 0x12;
@ -628,7 +630,7 @@ bool ds4_pad_handler::Init()
} }
else else
{ {
LOG_ERROR(HLE, "[DS4] hid_open_path failed! Reason: %s", hid_error(dev)); ds4_log.error("hid_open_path failed! Reason: %s", hid_error(dev));
warn_about_drivers = true; warn_about_drivers = true;
} }
devInfo = devInfo->next; devInfo = devInfo->next;
@ -638,18 +640,18 @@ bool ds4_pad_handler::Init()
if (warn_about_drivers) if (warn_about_drivers)
{ {
LOG_ERROR(HLE, "[DS4] One or more DS4 pads were detected but couldn't be interacted with directly"); ds4_log.error("One or more DS4 pads were detected but couldn't be interacted with directly");
#if defined(_WIN32) || defined(__linux__) #if defined(_WIN32) || defined(__linux__)
LOG_ERROR(HLE, "[DS4] Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue"); ds4_log.error("Check https://wiki.rpcs3.net/index.php?title=Help:Controller_Configuration for intructions on how to solve this issue");
#endif #endif
} }
else if (controllers.empty()) else if (controllers.empty())
{ {
LOG_WARNING(HLE, "[DS4] No controllers found!"); ds4_log.warning("No controllers found!");
} }
else else
{ {
LOG_SUCCESS(HLE, "[DS4] Controllers found: %d", controllers.size()); ds4_log.success("Controllers found: %d", controllers.size());
} }
is_init = true; is_init = true;
@ -711,7 +713,7 @@ ds4_pad_handler::DS4DataStatus ds4_pad_handler::GetRawData(const std::shared_ptr
const u32 crcReported = read_u32(&buf[DS4_INPUT_REPORT_0x11_SIZE - 4]); const u32 crcReported = read_u32(&buf[DS4_INPUT_REPORT_0x11_SIZE - 4]);
if (crcCalc != crcReported) if (crcCalc != crcReported)
{ {
LOG_WARNING(HLE, "[DS4] Data packet CRC check failed, ignoring! Received 0x%x, Expected 0x%x", crcReported, crcCalc); ds4_log.warning("Data packet CRC check failed, ignoring! Received 0x%x, Expected 0x%x", crcReported, crcCalc);
return DS4DataStatus::NoNewData; return DS4DataStatus::NoNewData;
} }
} }

26
rpcs3/Input/evdev_joystick_handler.cpp
View file

@ -107,7 +107,7 @@ bool evdev_joystick_handler::Init()
std::string name = node.first; std::string name = node.first;
int code = libevdev_event_code_from_name(EV_ABS, name.c_str()); int code = libevdev_event_code_from_name(EV_ABS, name.c_str());
if (code < 0) if (code < 0)
LOG_ERROR(HLE, "Failed to read axis name from %s. [code = %d] [name = %s]", m_pos_axis_config.cfg_name, code, name); evdev_log.error("Failed to read axis name from %s. [code = %d] [name = %s]", m_pos_axis_config.cfg_name, code, name);
else else
m_positive_axis.emplace_back(code); m_positive_axis.emplace_back(code);
} }
@ -342,7 +342,7 @@ void evdev_joystick_handler::get_next_button_press(const std::string& padId, con
if (get_blacklist) if (get_blacklist)
{ {
blacklist.emplace_back(name); blacklist.emplace_back(name);
LOG_ERROR(HLE, "Evdev Calibration: Added button [ %d = %s = %s ] to blacklist. Value = %d", code, libevdev_event_code_get_name(EV_KEY, code), name, value); evdev_log.error("Evdev Calibration: Added button [ %d = %s = %s ] to blacklist. Value = %d", code, libevdev_event_code_get_name(EV_KEY, code), name, value);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, name }; pressed_button = { value, name };
@ -368,7 +368,7 @@ void evdev_joystick_handler::get_next_button_press(const std::string& padId, con
int min = libevdev_get_abs_minimum(dev, code); int min = libevdev_get_abs_minimum(dev, code);
int max = libevdev_get_abs_maximum(dev, code); int max = libevdev_get_abs_maximum(dev, code);
blacklist.emplace_back(name); blacklist.emplace_back(name);
LOG_ERROR(HLE, "Evdev Calibration: Added axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max); evdev_log.error("Evdev Calibration: Added axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, name }; pressed_button = { value, name };
@ -394,7 +394,7 @@ void evdev_joystick_handler::get_next_button_press(const std::string& padId, con
int min = libevdev_get_abs_minimum(dev, code); int min = libevdev_get_abs_minimum(dev, code);
int max = libevdev_get_abs_maximum(dev, code); int max = libevdev_get_abs_maximum(dev, code);
blacklist.emplace_back(name); blacklist.emplace_back(name);
LOG_ERROR(HLE, "Evdev Calibration: Added rev axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max); evdev_log.error("Evdev Calibration: Added rev axis [ %d = %s = %s ] to blacklist. [ Value = %d ] [ Min = %d ] [ Max = %d ]", code, libevdev_event_code_get_name(EV_ABS, code), name, value, min, max);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, name }; pressed_button = { value, name };
@ -404,7 +404,7 @@ void evdev_joystick_handler::get_next_button_press(const std::string& padId, con
if (get_blacklist) if (get_blacklist)
{ {
if (blacklist.empty()) if (blacklist.empty())
LOG_SUCCESS(HLE, "Evdev Calibration: Blacklist is clear. No input spam detected"); evdev_log.success("Evdev Calibration: Blacklist is clear. No input spam detected");
return; return;
} }
@ -473,7 +473,7 @@ void evdev_joystick_handler::SetRumble(std::shared_ptr<EvdevDevice>device, u16 l
if (ioctl(fd, EVIOCSFF, &effect) == -1) if (ioctl(fd, EVIOCSFF, &effect) == -1)
{ {
LOG_ERROR(HLE, "evdev SetRumble ioctl failed! [large = %d] [small = %d] [fd = %d]", large, small, fd); evdev_log.error("evdev SetRumble ioctl failed! [large = %d] [small = %d] [fd = %d]", large, small, fd);
device->effect_id = -2; device->effect_id = -2;
} }
@ -486,7 +486,7 @@ void evdev_joystick_handler::SetRumble(std::shared_ptr<EvdevDevice>device, u16 l
if (write(fd, &play, sizeof(play)) == -1) if (write(fd, &play, sizeof(play)) == -1)
{ {
LOG_ERROR(HLE, "evdev SetRumble write failed! [large = %d] [small = %d] [fd = %d] [effect_id = %d]", large, small, fd, device->effect_id); evdev_log.error("evdev SetRumble write failed! [large = %d] [small = %d] [fd = %d] [effect_id = %d]", large, small, fd, device->effect_id);
device->effect_id = -2; device->effect_id = -2;
} }
@ -500,13 +500,13 @@ void evdev_joystick_handler::SetPadData(const std::string& padId, u32 largeMotor
auto dev = get_evdev_device(padId); auto dev = get_evdev_device(padId);
if (!dev) if (!dev)
{ {
LOG_ERROR(HLE, "evdev TestVibration: Device [%s] not found! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor); evdev_log.error("evdev TestVibration: Device [%s] not found! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor);
return; return;
} }
if (!dev->has_rumble) if (!dev->has_rumble)
{ {
LOG_ERROR(HLE, "evdev TestVibration: Device [%s] does not support rumble features! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor); evdev_log.error("evdev TestVibration: Device [%s] does not support rumble features! [largeMotor = %d] [smallMotor = %d]", padId, largeMotor, smallMotor);
return; return;
} }
@ -751,7 +751,7 @@ void evdev_joystick_handler::get_mapping(const std::shared_ptr<PadDevice>& devic
if (direction < 0) if (direction < 0)
{ {
LOG_ERROR(HLE, "FindAxisDirection = %d, Button Nr.%d, value = %d", direction, i, value); evdev_log.error("FindAxisDirection = %d, Button Nr.%d, value = %d", direction, i, value);
continue; continue;
} }
else if (direction != (m_is_negative ? 1 : 0)) else if (direction != (m_is_negative ? 1 : 0))
@ -784,7 +784,7 @@ void evdev_joystick_handler::get_mapping(const std::shared_ptr<PadDevice>& devic
m_dev->cur_dir = min_direction; m_dev->cur_dir = min_direction;
if (min_direction < 0) if (min_direction < 0)
LOG_ERROR(HLE, "keyCodeMin FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", min_direction, idx, index, value); evdev_log.error("keyCodeMin FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", min_direction, idx, index, value);
else else
is_direction_min = m_is_negative == (min_direction == 1); is_direction_min = m_is_negative == (min_direction == 1);
} }
@ -810,7 +810,7 @@ void evdev_joystick_handler::get_mapping(const std::shared_ptr<PadDevice>& devic
m_dev->cur_dir = max_direction; m_dev->cur_dir = max_direction;
if (max_direction < 0) if (max_direction < 0)
LOG_ERROR(HLE, "keyCodeMax FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", max_direction, idx, index, value); evdev_log.error("keyCodeMax FindAxisDirection = %d, Axis Nr.%d, Button Nr.%d, value = %d", max_direction, idx, index, value);
else else
is_direction_max = m_is_negative == (max_direction == 1); is_direction_max = m_is_negative == (max_direction == 1);
} }
@ -989,7 +989,7 @@ bool evdev_joystick_handler::bindPadToDevice(std::shared_ptr<Pad> pad, const std
m_dev->axis_orientations = axis_orientations; m_dev->axis_orientations = axis_orientations;
if (add_device(device, pad, false) < 0) if (add_device(device, pad, false) < 0)
LOG_WARNING(HLE, "evdev add_device in bindPadToDevice failed for device %s", device); evdev_log.warning("evdev add_device in bindPadToDevice failed for device %s", device);
update_devs(); update_devs();
return true; return true;

8
rpcs3/Input/mm_joystick_handler.cpp
View file

@ -234,7 +234,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const
if (get_blacklist) if (get_blacklist)
{ {
blacklist.emplace_back(keycode); blacklist.emplace_back(keycode);
LOG_ERROR(HLE, "MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); input_log.error("MMJOY Calibration: Added axis [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, button.second }; pressed_button = { value, button.second };
@ -254,7 +254,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const
if (get_blacklist) if (get_blacklist)
{ {
blacklist.emplace_back(keycode); blacklist.emplace_back(keycode);
LOG_ERROR(HLE, "MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); input_log.error("MMJOY Calibration: Added pov [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, button.second }; pressed_button = { value, button.second };
@ -274,7 +274,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const
if (get_blacklist) if (get_blacklist)
{ {
blacklist.emplace_back(keycode); blacklist.emplace_back(keycode);
LOG_ERROR(HLE, "MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value); input_log.error("MMJOY Calibration: Added button [ %d = %s ] to blacklist. Value = %d", keycode, button.second, value);
} }
else if (value > pressed_button.first) else if (value > pressed_button.first)
pressed_button = { value, button.second }; pressed_button = { value, button.second };
@ -284,7 +284,7 @@ void mm_joystick_handler::get_next_button_press(const std::string& padId, const
if (get_blacklist) if (get_blacklist)
{ {
if (blacklist.empty()) if (blacklist.empty())
LOG_SUCCESS(HLE, "MMJOY Calibration: Blacklist is clear. No input spam detected"); input_log.success("MMJOY Calibration: Blacklist is clear. No input spam detected");
return; return;
} }

4
rpcs3/rpcs3qt/auto_pause_settings_dialog.cpp
View file

@ -1,6 +1,8 @@
 
#include "auto_pause_settings_dialog.h" #include "auto_pause_settings_dialog.h"
LOG_CHANNEL(autopause_log, "AutoPause");
constexpr auto qstr = QString::fromStdString; constexpr auto qstr = QString::fromStdString;
auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent) auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialog(parent)
@ -46,7 +48,7 @@ auto_pause_settings_dialog::auto_pause_settings_dialog(QWidget *parent) : QDialo
connect(saveButton, &QAbstractButton::clicked, [=] connect(saveButton, &QAbstractButton::clicked, [=]
{ {
SaveEntries(); SaveEntries();
LOG_SUCCESS(HLE, "Auto Pause: File pause.bin was updated."); autopause_log.success("File pause.bin was updated.");
}); });
connect(cancelButton, &QAbstractButton::clicked, this, &QWidget::close); connect(cancelButton, &QAbstractButton::clicked, this, &QWidget::close);

10
rpcs3/rpcs3qt/pad_settings_dialog.cpp
View file

@ -387,7 +387,7 @@ void pad_settings_dialog::InitButtons()
return; return;
} }
LOG_NOTICE(HLE, "get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, pad_name, name, val); cfg_log.notice("get_next_button_press: %s device %s button %s pressed with value %d", m_handler->m_type, pad_name, name, val);
if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end) if (m_button_id > button_ids::id_pad_begin && m_button_id < button_ids::id_pad_end)
{ {
m_cfg_entries[m_button_id].key = name; m_cfg_entries[m_button_id].key = name;
@ -658,7 +658,7 @@ void pad_settings_dialog::keyPressEvent(QKeyEvent *keyEvent)
if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end) if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
{ {
LOG_NOTICE(HLE, "Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id); cfg_log.notice("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
} }
else else
{ {
@ -683,7 +683,7 @@ void pad_settings_dialog::mouseReleaseEvent(QMouseEvent* event)
if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end) if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
{ {
LOG_NOTICE(HLE, "Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id); cfg_log.notice("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
} }
else else
{ {
@ -708,7 +708,7 @@ void pad_settings_dialog::wheelEvent(QWheelEvent *event)
if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end) if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
{ {
LOG_NOTICE(HLE, "Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id); cfg_log.notice("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
return; return;
} }
@ -764,7 +764,7 @@ void pad_settings_dialog::mouseMoveEvent(QMouseEvent* /*event*/)
if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end) if (m_button_id <= button_ids::id_pad_begin || m_button_id >= button_ids::id_pad_end)
{ {
LOG_NOTICE(HLE, "Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id); cfg_log.notice("Pad Settings: Handler Type: %d, Unknown button ID: %d", static_cast<int>(m_handler->m_type), m_button_id);
} }
else else
{ {