ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cellMic: remove cellMicRead error spam

This commit is contained in:
Megamouse 2022-03-12 01:56:13 +01:00
parent 78b8bd80e4
commit 686d2759f4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/Cell/Modules/cellMic.cpp
View File

@ -931,6 +931,8 @@ error_code cellMicReadRaw(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
{ {
cellMic.trace("cellMicReadRaw(dev_num=%d, data=0x%x, maxBytes=%d)", dev_num, data, max_bytes); cellMic.trace("cellMicReadRaw(dev_num=%d, data=0x%x, maxBytes=%d)", dev_num, data, max_bytes);
// TODO: CELL_MICIN_ERROR_PARAM
auto& mic_thr = g_fxo->get<mic_thread>(); auto& mic_thr = g_fxo->get<mic_thread>();
const std::lock_guard lock(mic_thr.mutex); const std::lock_guard lock(mic_thr.mutex);
if (!mic_thr.init) if (!mic_thr.init)
@ -944,13 +946,15 @@ error_code cellMicReadRaw(s32 dev_num, vm::ptr<void> data, s32 max_bytes)
if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_RAW)) if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_RAW))
return CELL_MICIN_ERROR_NOT_OPEN; return CELL_MICIN_ERROR_NOT_OPEN;
return mic.read_raw(vm::_ptr<u8>(data.addr()), max_bytes); return not_an_error(mic.read_raw(vm::_ptr<u8>(data.addr()), max_bytes));
} }
error_code cellMicRead(s32 dev_num, vm::ptr<void> data, u32 max_bytes) error_code cellMicRead(s32 dev_num, vm::ptr<void> data, u32 max_bytes)
{ {
cellMic.warning("cellMicRead(dev_num=%d, data=0x%x, maxBytes=0x%x)", dev_num, data, max_bytes); cellMic.warning("cellMicRead(dev_num=%d, data=0x%x, maxBytes=0x%x)", dev_num, data, max_bytes);
// TODO: CELL_MICIN_ERROR_PARAM
auto& mic_thr = g_fxo->get<mic_thread>(); auto& mic_thr = g_fxo->get<mic_thread>();
const std::lock_guard lock(mic_thr.mutex); const std::lock_guard lock(mic_thr.mutex);
if (!mic_thr.init) if (!mic_thr.init)
@ -964,7 +968,7 @@ error_code cellMicRead(s32 dev_num, vm::ptr<void> data, u32 max_bytes)
if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_DSP)) if (!mic.is_opened() || !(mic.get_signal_types() & CELLMIC_SIGTYPE_DSP))
return CELL_MICIN_ERROR_NOT_OPEN; return CELL_MICIN_ERROR_NOT_OPEN;
return mic.read_dsp(vm::_ptr<u8>(data.addr()), max_bytes); return not_an_error(mic.read_dsp(vm::_ptr<u8>(data.addr()), max_bytes));
} }
error_code cellMicReadAux(s32 dev_num, vm::ptr<void> data, s32 max_bytes) error_code cellMicReadAux(s32 dev_num, vm::ptr<void> data, s32 max_bytes)

5
rpcs3/Emu/Cell/Modules/cellMic.h
View File

@ -121,8 +121,7 @@ enum CellMicType : s32
enum enum
{ {
MaxNumMicInputs = 8, CELL_MAX_MICS = 8,
CELL_MAX_MICS = MaxNumMicInputs,
MAX_MICS_PERMISSABLE = 4, MAX_MICS_PERMISSABLE = 4,
NullDeviceID = -1, NullDeviceID = -1,
@ -198,6 +197,8 @@ public:
u32 read_bytes(u8* buf, const u32 size) u32 read_bytes(u8* buf, const u32 size)
{ {
ensure(buf);
u32 to_read = size > m_used ? m_used : size; u32 to_read = size > m_used ? m_used : size;
if (!to_read) if (!to_read)
return 0; return 0;