mirror of
				https://github.com/PabloMK7/citra.git
				synced 2025-10-30 21:30:04 +00:00 
			
		
		
		
	Address review comments
This commit is contained in:
		
							parent
							
								
									cb3ef488c7
								
							
						
					
					
						commit
						cf8b1726df
					
				
					 11 changed files with 4 additions and 18 deletions
				
			
		|  | @ -12,7 +12,6 @@ | ||||||
| #include "citra/emu_window/emu_window_sdl2.h" | #include "citra/emu_window/emu_window_sdl2.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/scm_rev.h" | #include "common/scm_rev.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/3ds.h" | #include "core/3ds.h" | ||||||
| #include "core/settings.h" | #include "core/settings.h" | ||||||
| #include "input_common/keyboard.h" | #include "input_common/keyboard.h" | ||||||
|  |  | ||||||
|  | @ -3,13 +3,11 @@ | ||||||
| #include <QKeyEvent> | #include <QKeyEvent> | ||||||
| #include <QScreen> | #include <QScreen> | ||||||
| #include <QWindow> | #include <QWindow> | ||||||
| 
 |  | ||||||
| #include <fmt/format.h> | #include <fmt/format.h> | ||||||
| 
 | 
 | ||||||
| #include "citra_qt/bootmanager.h" | #include "citra_qt/bootmanager.h" | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/scm_rev.h" | #include "common/scm_rev.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/3ds.h" | #include "core/3ds.h" | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
| #include "core/settings.h" | #include "core/settings.h" | ||||||
|  |  | ||||||
|  | @ -27,7 +27,6 @@ | ||||||
| #include "citra_qt/ui_settings.h" | #include "citra_qt/ui_settings.h" | ||||||
| #include "common/common_paths.h" | #include "common/common_paths.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/hle/service/fs/archive.h" | #include "core/hle/service/fs/archive.h" | ||||||
| #include "core/loader/loader.h" | #include "core/loader/loader.h" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -50,7 +50,6 @@ | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/scm_rev.h" | #include "common/scm_rev.h" | ||||||
| #include "common/scope_exit.h" | #include "common/scope_exit.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
| #include "core/file_sys/archive_source_sd_savedata.h" | #include "core/file_sys/archive_source_sd_savedata.h" | ||||||
| #include "core/frontend/applets/default_applets.h" | #include "core/frontend/applets/default_applets.h" | ||||||
|  |  | ||||||
|  | @ -3,11 +3,8 @@ | ||||||
| // Refer to the license.txt file included.
 | // Refer to the license.txt file included.
 | ||||||
| 
 | 
 | ||||||
| #include <ctime> | #include <ctime> | ||||||
| 
 |  | ||||||
| #include <fmt/format.h> | #include <fmt/format.h> | ||||||
| 
 |  | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "common/timer.h" | #include "common/timer.h" | ||||||
| 
 | 
 | ||||||
| namespace Common { | namespace Common { | ||||||
|  |  | ||||||
|  | @ -9,7 +9,6 @@ | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "common/file_util.h" | #include "common/file_util.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/file_sys/archive_extsavedata.h" | #include "core/file_sys/archive_extsavedata.h" | ||||||
| #include "core/file_sys/disk_archive.h" | #include "core/file_sys/disk_archive.h" | ||||||
| #include "core/file_sys/errors.h" | #include "core/file_sys/errors.h" | ||||||
|  |  | ||||||
|  | @ -5,7 +5,6 @@ | ||||||
| #include <fmt/format.h> | #include <fmt/format.h> | ||||||
| #include "common/file_util.h" | #include "common/file_util.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/file_sys/archive_source_sd_savedata.h" | #include "core/file_sys/archive_source_sd_savedata.h" | ||||||
| #include "core/file_sys/errors.h" | #include "core/file_sys/errors.h" | ||||||
| #include "core/file_sys/savedata_archive.h" | #include "core/file_sys/savedata_archive.h" | ||||||
|  |  | ||||||
|  | @ -9,7 +9,6 @@ | ||||||
| #include <fmt/format.h> | #include <fmt/format.h> | ||||||
| #include "common/common_types.h" | #include "common/common_types.h" | ||||||
| #include "common/file_util.h" | #include "common/file_util.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/file_sys/archive_systemsavedata.h" | #include "core/file_sys/archive_systemsavedata.h" | ||||||
| #include "core/file_sys/errors.h" | #include "core/file_sys/errors.h" | ||||||
| #include "core/file_sys/savedata_archive.h" | #include "core/file_sys/savedata_archive.h" | ||||||
|  |  | ||||||
|  | @ -32,7 +32,6 @@ | ||||||
| #endif | #endif | ||||||
| 
 | 
 | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/arm/arm_interface.h" | #include "core/arm/arm_interface.h" | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
| #include "core/gdbstub/gdbstub.h" | #include "core/gdbstub/gdbstub.h" | ||||||
|  |  | ||||||
|  | @ -9,7 +9,6 @@ | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/microprofile.h" | #include "common/microprofile.h" | ||||||
| #include "common/scope_exit.h" | #include "common/scope_exit.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/arm/arm_interface.h" | #include "core/arm/arm_interface.h" | ||||||
| #include "core/core_timing.h" | #include "core/core_timing.h" | ||||||
| #include "core/hle/function_wrappers.h" | #include "core/hle/function_wrappers.h" | ||||||
|  | @ -826,7 +825,7 @@ static ResultCode SetThreadPriority(Handle handle, u32 priority) { | ||||||
| /// Create a mutex
 | /// Create a mutex
 | ||||||
| static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { | static ResultCode CreateMutex(Handle* out_handle, u32 initial_locked) { | ||||||
|     SharedPtr<Mutex> mutex = Mutex::Create(initial_locked != 0); |     SharedPtr<Mutex> mutex = Mutex::Create(initial_locked != 0); | ||||||
|     mutex->name = fmt::format("mutex-{:08X}", Core::CPU().GetReg(14)); |     mutex->name = fmt::format("mutex-{:08x}", Core::CPU().GetReg(14)); | ||||||
|     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); |     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(mutex))); | ||||||
| 
 | 
 | ||||||
|     LOG_TRACE(Kernel_SVC, "called initial_locked={} : created handle=0x{:08X}", |     LOG_TRACE(Kernel_SVC, "called initial_locked={} : created handle=0x{:08X}", | ||||||
|  | @ -889,7 +888,7 @@ static ResultCode GetThreadId(u32* thread_id, Handle handle) { | ||||||
| /// Creates a semaphore
 | /// Creates a semaphore
 | ||||||
| static ResultCode CreateSemaphore(Handle* out_handle, s32 initial_count, s32 max_count) { | static ResultCode CreateSemaphore(Handle* out_handle, s32 initial_count, s32 max_count) { | ||||||
|     CASCADE_RESULT(SharedPtr<Semaphore> semaphore, Semaphore::Create(initial_count, max_count)); |     CASCADE_RESULT(SharedPtr<Semaphore> semaphore, Semaphore::Create(initial_count, max_count)); | ||||||
|     semaphore->name = fmt::format("semaphore-{:08X}", Core::CPU().GetReg(14)); |     semaphore->name = fmt::format("semaphore-{:08x}", Core::CPU().GetReg(14)); | ||||||
|     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(semaphore))); |     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(semaphore))); | ||||||
| 
 | 
 | ||||||
|     LOG_TRACE(Kernel_SVC, "called initial_count={}, max_count={}, created handle=0x{:08X}", |     LOG_TRACE(Kernel_SVC, "called initial_count={}, max_count={}, created handle=0x{:08X}", | ||||||
|  | @ -940,7 +939,7 @@ static ResultCode QueryMemory(MemoryInfo* memory_info, PageInfo* page_info, u32 | ||||||
| /// Create an event
 | /// Create an event
 | ||||||
| static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { | static ResultCode CreateEvent(Handle* out_handle, u32 reset_type) { | ||||||
|     SharedPtr<Event> evt = Event::Create(static_cast<ResetType>(reset_type), |     SharedPtr<Event> evt = Event::Create(static_cast<ResetType>(reset_type), | ||||||
|                                          fmt::format("event-{:08X}", Core::CPU().GetReg(14))); |                                          fmt::format("event-{:08x}", Core::CPU().GetReg(14))); | ||||||
|     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt))); |     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(evt))); | ||||||
| 
 | 
 | ||||||
|     LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, |     LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, | ||||||
|  | @ -983,7 +982,7 @@ static ResultCode ClearEvent(Handle handle) { | ||||||
| /// Creates a timer
 | /// Creates a timer
 | ||||||
| static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { | static ResultCode CreateTimer(Handle* out_handle, u32 reset_type) { | ||||||
|     SharedPtr<Timer> timer = Timer::Create(static_cast<ResetType>(reset_type), |     SharedPtr<Timer> timer = Timer::Create(static_cast<ResetType>(reset_type), | ||||||
|                                            fmt ::format("timer-{:08X}", Core::CPU().GetReg(14))); |                                            fmt ::format("timer-{:08x}", Core::CPU().GetReg(14))); | ||||||
|     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(timer))); |     CASCADE_RESULT(*out_handle, g_handle_table.Create(std::move(timer))); | ||||||
| 
 | 
 | ||||||
|     LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, |     LOG_TRACE(Kernel_SVC, "called reset_type=0x{:08X} : created handle=0x{:08X}", reset_type, | ||||||
|  |  | ||||||
|  | @ -6,7 +6,6 @@ | ||||||
| #include <fmt/format.h> | #include <fmt/format.h> | ||||||
| #include "common/assert.h" | #include "common/assert.h" | ||||||
| #include "common/logging/log.h" | #include "common/logging/log.h" | ||||||
| #include "common/string_util.h" |  | ||||||
| #include "core/core.h" | #include "core/core.h" | ||||||
| #include "core/hle/ipc.h" | #include "core/hle/ipc.h" | ||||||
| #include "core/hle/kernel/client_port.h" | #include "core/hle/kernel/client_port.h" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue