diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp index 024f06faba..7154101804 100644 --- a/src/core/file_sys/program_metadata.cpp +++ b/src/core/file_sys/program_metadata.cpp @@ -140,7 +140,7 @@ void ProgramMetadata::LoadManual(bool is_64_bit, ProgramAddressSpaceType address } bool ProgramMetadata::Is64BitProgram() const { - return npdm_header.has_64_bit_instructions; + return bool(npdm_header.has_64_bit_instructions); } ProgramAddressSpaceType ProgramMetadata::GetAddressSpaceType() const { diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp index 1c2d1a464f..36c9a0f02f 100644 --- a/src/hid_core/frontend/emulated_controller.cpp +++ b/src/hid_core/frontend/emulated_controller.cpp @@ -1662,17 +1662,17 @@ bool EmulatedController::IsControllerFullkey(bool use_temporary_value) const { bool EmulatedController::IsControllerSupported(bool use_temporary_value) const { const auto type = is_configuring.load() && use_temporary_value ? tmp_npad_type.load() : npad_type.load(); switch (type) { - case NpadStyleIndex::Fullkey: return supported_style_tag.fullkey; - case NpadStyleIndex::Handheld: return supported_style_tag.handheld; - case NpadStyleIndex::JoyconDual: return supported_style_tag.joycon_dual; - case NpadStyleIndex::JoyconLeft: return supported_style_tag.joycon_left; - case NpadStyleIndex::JoyconRight: return supported_style_tag.joycon_right; - case NpadStyleIndex::GameCube: return supported_style_tag.gamecube; - case NpadStyleIndex::Pokeball: return supported_style_tag.palma; - case NpadStyleIndex::NES: return supported_style_tag.lark; - case NpadStyleIndex::SNES: return supported_style_tag.lucia; - case NpadStyleIndex::N64: return supported_style_tag.lagoon; - case NpadStyleIndex::SegaGenesis: return supported_style_tag.lager; + case NpadStyleIndex::Fullkey: return bool(supported_style_tag.fullkey); + case NpadStyleIndex::Handheld: return bool(supported_style_tag.handheld); + case NpadStyleIndex::JoyconDual: return bool(supported_style_tag.joycon_dual); + case NpadStyleIndex::JoyconLeft: return bool(supported_style_tag.joycon_left); + case NpadStyleIndex::JoyconRight: return bool(supported_style_tag.joycon_right); + case NpadStyleIndex::GameCube: return bool(supported_style_tag.gamecube); + case NpadStyleIndex::Pokeball: return bool(supported_style_tag.palma); + case NpadStyleIndex::NES: return bool(supported_style_tag.lark); + case NpadStyleIndex::SNES: return bool(supported_style_tag.lucia); + case NpadStyleIndex::N64: return bool(supported_style_tag.lagoon); + case NpadStyleIndex::SegaGenesis: return bool(supported_style_tag.lager); default: return false; } } diff --git a/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp index de84a5ec28..a33525b72e 100644 --- a/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp +++ b/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp @@ -66,7 +66,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState() { continue; } auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)]; - UpdateSixaxisInternalState(npad_entry, data->aruid, data->flag.enable_six_axis_sensor); + UpdateSixaxisInternalState(npad_entry, data->aruid, bool(data->flag.enable_six_axis_sensor)); } return ResultSuccess; } @@ -78,7 +78,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState(u64 aruid) { return ResultSuccess; } auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)]; - UpdateSixaxisInternalState(npad_entry, data->aruid, data->flag.enable_six_axis_sensor); + UpdateSixaxisInternalState(npad_entry, data->aruid, bool(data->flag.enable_six_axis_sensor)); return ResultSuccess; } @@ -89,7 +89,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState2(u64 aruid) { return ResultSuccess; } auto& npad_internal_state = aruid_data->shared_memory_format->npad.npad_entry[npad_index]; - UpdateSixaxisInternalState(npad_internal_state, aruid, aruid_data->flag.enable_six_axis_sensor); + UpdateSixaxisInternalState(npad_internal_state, aruid, bool(aruid_data->flag.enable_six_axis_sensor)); return ResultSuccess; } diff --git a/src/hid_core/resources/npad/npad_data.cpp b/src/hid_core/resources/npad/npad_data.cpp index 4b0bf44488..2e067f9e8a 100644 --- a/src/hid_core/resources/npad/npad_data.cpp +++ b/src/hid_core/resources/npad/npad_data.cpp @@ -24,7 +24,7 @@ void NPadData::SetNpadAnalogStickUseCenterClamp(bool is_enabled) { } bool NPadData::GetNpadAnalogStickUseCenterClamp() const { - return status.use_center_clamp; + return bool(status.use_center_clamp); } void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) { @@ -32,7 +32,7 @@ void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) { } bool NPadData::GetNpadSystemExtState() const { - return status.system_ext_state; + return bool(status.system_ext_state); } Result NPadData::SetSupportedNpadIdType(std::span list) { @@ -42,18 +42,14 @@ Result NPadData::SetSupportedNpadIdType(std::span l } supported_npad_id_types_count = list.size(); - memcpy(supported_npad_id_types.data(), list.data(), - list.size() * sizeof(Core::HID::NpadIdType)); - + std::memcpy(supported_npad_id_types.data(), list.data(), list.size() * sizeof(Core::HID::NpadIdType)); return ResultSuccess; } std::size_t NPadData::GetSupportedNpadIdType(std::span out_list) const { std::size_t out_size = (std::min)(supported_npad_id_types_count, out_list.size()); - memcpy(out_list.data(), supported_npad_id_types.data(), - out_size * sizeof(Core::HID::NpadIdType)); - + std::memcpy(out_list.data(), supported_npad_id_types.data(), out_size * sizeof(Core::HID::NpadIdType)); return out_size; } @@ -154,27 +150,27 @@ bool NPadData::IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index) Core::HID::NpadStyleTag style = {supported_npad_style_set}; switch (style_index) { case Core::HID::NpadStyleIndex::Fullkey: - return style.fullkey; + return bool(style.fullkey); case Core::HID::NpadStyleIndex::Handheld: - return style.handheld; + return bool(style.handheld); case Core::HID::NpadStyleIndex::JoyconDual: - return style.joycon_dual; + return bool(style.joycon_dual); case Core::HID::NpadStyleIndex::JoyconLeft: - return style.joycon_left; + return bool(style.joycon_left); case Core::HID::NpadStyleIndex::JoyconRight: - return style.joycon_right; + return bool(style.joycon_right); case Core::HID::NpadStyleIndex::GameCube: - return style.gamecube; + return bool(style.gamecube); case Core::HID::NpadStyleIndex::Pokeball: - return style.palma; + return bool(style.palma); case Core::HID::NpadStyleIndex::NES: - return style.lark; + return bool(style.lark); case Core::HID::NpadStyleIndex::SNES: - return style.lucia; + return bool(style.lucia); case Core::HID::NpadStyleIndex::N64: - return style.lagoon; + return bool(style.lagoon); case Core::HID::NpadStyleIndex::SegaGenesis: - return style.lager; + return bool(style.lager); default: return false; } @@ -185,7 +181,7 @@ void NPadData::SetLrAssignmentMode(bool is_enabled) { } bool NPadData::GetLrAssignmentMode() const { - return status.lr_assignment_mode; + return bool(status.lr_assignment_mode); } void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) { @@ -193,7 +189,7 @@ void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) { } bool NPadData::GetAssigningSingleOnSlSrPress() const { - return status.assigning_single_on_sl_sr_press; + return bool(status.assigning_single_on_sl_sr_press); } void NPadData::SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id) { diff --git a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp index b5d17ad55e..b095d6b458 100644 --- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp +++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp @@ -548,7 +548,7 @@ void TouchResource::OnTouchUpdate(s64 timestamp) { } auto& touch_shared = applet_data->shared_memory_format->touch_screen; - StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, applet_data->flag.enable_touchscreen); + StorePreviousTouchState(previous_touch_state, data.finger_map, current_touch_state, bool(applet_data->flag.enable_touchscreen)); touch_shared.touch_screen_lifo.WriteNextEntry(current_touch_state); } }