From 7f3ad4fc2ce57bac49480000f1f95260e5a626c1 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 5 Apr 2024 18:50:40 +0200 Subject: [PATCH 1/2] lv2_socket: reset queue after move --- rpcs3/Emu/Cell/lv2/sys_net.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp index ed879028f7d3..79b5067c87c6 100644 --- a/rpcs3/Emu/Cell/lv2/sys_net.cpp +++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp @@ -1735,6 +1735,7 @@ error_code lv2_socket::abort_socket(s32 flags) } qcopy = std::move(queue); + queue = {}; events.store({}); } From 9a4c8233664e2a5f96109acdfbb4ce2e01c42941 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Fri, 5 Apr 2024 18:22:43 +0200 Subject: [PATCH 2/2] cellCamera: fix config from_string --- rpcs3/Emu/Cell/Modules/cellCamera.cpp | 32 +++++++++++++-------------- rpcs3/Emu/Io/camera_config.h | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 020878e933a2..b18d782d7b78 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -498,7 +498,7 @@ error_code cellCameraEnd() error_code cellCameraOpen(s32 dev_num, vm::ptr info) { - cellCamera.todo("cellCameraOpen(dev_num=%d, info=*0x%x)", dev_num, info); + cellCamera.notice("cellCameraOpen(dev_num=%d, info=*0x%x)", dev_num, info); if (!info) { @@ -639,7 +639,7 @@ error_code cellCameraOpenPost() error_code cellCameraClose(s32 dev_num) { - cellCamera.todo("cellCameraClose(dev_num=%d)", dev_num); + cellCamera.notice("cellCameraClose(dev_num=%d)", dev_num); if (error_code error = check_init_and_open(dev_num)) { @@ -714,7 +714,7 @@ error_code cellCameraGetDeviceGUID(s32 dev_num, vm::ptr guid) error_code cellCameraGetType(s32 dev_num, vm::ptr type) { - cellCamera.todo("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type); + cellCamera.trace("cellCameraGetType(dev_num=%d, type=*0x%x)", dev_num, type); auto& g_camera = g_fxo->get(); @@ -780,7 +780,7 @@ s32 cellCameraIsAvailable(s32 dev_num) s32 cellCameraIsAttached(s32 dev_num) { - cellCamera.warning("cellCameraIsAttached(dev_num=%d)", dev_num); + cellCamera.trace("cellCameraIsAttached(dev_num=%d)", dev_num); if (g_cfg.io.camera == camera_handler::null) { @@ -879,7 +879,7 @@ s32 cellCameraIsStarted(s32 dev_num) error_code cellCameraGetAttribute(s32 dev_num, s32 attrib, vm::ptr arg1, vm::ptr arg2) { const auto attr_name = get_camera_attr_name(attrib); - cellCamera.todo("cellCameraGetAttribute(dev_num=%d, attrib=%d=%s, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, attr_name, arg1, arg2); + cellCamera.notice("cellCameraGetAttribute(dev_num=%d, attrib=%d=%s, arg1=*0x%x, arg2=*0x%x)", dev_num, attrib, attr_name, arg1, arg2); auto& g_camera = g_fxo->get(); @@ -991,7 +991,7 @@ error_code cellCameraResetAttribute() error_code cellCameraGetBufferSize(s32 dev_num, vm::ptr info) { - cellCamera.todo("cellCameraGetBufferSize(dev_num=%d, info=*0x%x)", dev_num, info); + cellCamera.notice("cellCameraGetBufferSize(dev_num=%d, info=*0x%x)", dev_num, info); auto& g_camera = g_fxo->get(); @@ -1085,7 +1085,7 @@ error_code check_get_camera_info(s32 dev_num, bool is_valid_info_struct) error_code cellCameraGetBufferInfo(s32 dev_num, vm::ptr info) { - cellCamera.todo("cellCameraGetBufferInfo(dev_num=%d, info=0x%x)", dev_num, info); + cellCamera.notice("cellCameraGetBufferInfo(dev_num=%d, info=0x%x)", dev_num, info); // called by cellCameraGetBufferInfoEx @@ -1112,7 +1112,7 @@ error_code cellCameraGetBufferInfo(s32 dev_num, vm::ptr info) error_code cellCameraGetBufferInfoEx(s32 dev_num, vm::ptr info) { - cellCamera.todo("cellCameraGetBufferInfoEx(dev_num=%d, info=0x%x)", dev_num, info); + cellCamera.notice("cellCameraGetBufferInfoEx(dev_num=%d, info=0x%x)", dev_num, info); // calls cellCameraGetBufferInfo @@ -1244,7 +1244,7 @@ error_code cellCameraResetPost() error_code cellCameraStart(s32 dev_num) { - cellCamera.todo("cellCameraStart(dev_num=%d)", dev_num); + cellCamera.notice("cellCameraStart(dev_num=%d)", dev_num); if (error_code error = check_init_and_open(dev_num)) { @@ -1291,7 +1291,7 @@ error_code cellCameraStartPost() error_code cellCameraRead(s32 dev_num, vm::ptr frame_num, vm::ptr bytes_read) { - cellCamera.notice("cellCameraRead(dev_num=%d, frame_num=*0x%x, bytes_read=*0x%x)", dev_num, frame_num, bytes_read); + cellCamera.trace("cellCameraRead(dev_num=%d, frame_num=*0x%x, bytes_read=*0x%x)", dev_num, frame_num, bytes_read); vm::ptr read_ex = vm::make_var({}); @@ -1321,7 +1321,7 @@ error_code cellCameraRead2() error_code cellCameraReadEx(s32 dev_num, vm::ptr read) { - cellCamera.notice("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, read); + cellCamera.trace("cellCameraReadEx(dev_num=%d, read=0x%x)", dev_num, read); auto& g_camera = g_fxo->get(); @@ -1421,7 +1421,7 @@ error_code cellCameraReadComplete(s32 dev_num, u32 bufnum, u32 arg2) error_code cellCameraStop(s32 dev_num) { - cellCamera.todo("cellCameraStop(dev_num=%d)", dev_num); + cellCamera.notice("cellCameraStop(dev_num=%d)", dev_num); if (error_code error = check_init_and_open(dev_num)) { @@ -1466,7 +1466,7 @@ error_code cellCameraStopPost() error_code cellCameraSetNotifyEventQueue(u64 key) { - cellCamera.todo("cellCameraSetNotifyEventQueue(key=0x%x)", key); + cellCamera.notice("cellCameraSetNotifyEventQueue(key=0x%x)", key); auto& g_camera = g_fxo->get(); @@ -1492,7 +1492,7 @@ error_code cellCameraSetNotifyEventQueue(u64 key) error_code cellCameraRemoveNotifyEventQueue(u64 key) { - cellCamera.todo("cellCameraRemoveNotifyEventQueue(key=0x%x)", key); + cellCamera.notice("cellCameraRemoveNotifyEventQueue(key=0x%x)", key); auto& g_camera = g_fxo->get(); @@ -1518,7 +1518,7 @@ error_code cellCameraRemoveNotifyEventQueue(u64 key) error_code cellCameraSetNotifyEventQueue2(u64 key, u64 source, u64 flag) { - cellCamera.todo("cellCameraSetNotifyEventQueue2(key=0x%x, source=%d, flag=%d)", key, source, flag); + cellCamera.notice("cellCameraSetNotifyEventQueue2(key=0x%x, source=%d, flag=%d)", key, source, flag); auto& g_camera = g_fxo->get(); @@ -1544,7 +1544,7 @@ error_code cellCameraSetNotifyEventQueue2(u64 key, u64 source, u64 flag) error_code cellCameraRemoveNotifyEventQueue2(u64 key) { - cellCamera.todo("cellCameraRemoveNotifyEventQueue2(key=0x%x)", key); + cellCamera.notice("cellCameraRemoveNotifyEventQueue2(key=0x%x)", key); return cellCameraRemoveNotifyEventQueue(key); } diff --git a/rpcs3/Emu/Io/camera_config.h b/rpcs3/Emu/Io/camera_config.h index 07836a064dd7..a918dea458fb 100644 --- a/rpcs3/Emu/Io/camera_config.h +++ b/rpcs3/Emu/Io/camera_config.h @@ -16,7 +16,7 @@ struct cfg_camera final : cfg::node double max_fps = 0; int format = 0; - static const u32 member_count = 7; + static constexpr u32 member_count = 5; std::string to_string() const; void from_string(const std::string& text); @@ -26,7 +26,7 @@ struct cfg_camera final : cfg::node const std::string path; - cfg::map_entry cameras{ this, "Cameras" }; // : ,,,,,, + cfg::map_entry cameras{ this, "Cameras" }; // : ,,,, }; extern cfg_camera g_cfg_camera;