Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-10-20 16:50:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[msvc] fix error with new <T>bitfields (#4196)

Browse source 
fixes MSVC build errors

Signed-off-by: lizzie <lizzie@eden-emu.dev>

Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/4196
Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
This commit is contained in:
lizzie 2026-07-13 21:12:13 +02:00 • committed by crueter
parent defb8bf2e2
commit 9a0e6b3c28
No known key found for this signature in database
GPG key ID: 425ACD2D4830EBC6
5 changed files with 33 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/file_sys/program_metadata.cpp
View file

@ -140,7 +140,7 @@ void ProgramMetadata::LoadManual(bool is_64_bit, ProgramAddressSpaceType address
} }
bool ProgramMetadata::Is64BitProgram() const { bool ProgramMetadata::Is64BitProgram() const {
return npdm_header.has_64_bit_instructions; return bool(npdm_header.has_64_bit_instructions);
} }
ProgramAddressSpaceType ProgramMetadata::GetAddressSpaceType() const { ProgramAddressSpaceType ProgramMetadata::GetAddressSpaceType() const {

22
src/hid_core/frontend/emulated_controller.cpp
View file

@ -1662,17 +1662,17 @@ bool EmulatedController::IsControllerFullkey(bool use_temporary_value) const {
bool EmulatedController::IsControllerSupported(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(); const auto type = is_configuring.load() && use_temporary_value ? tmp_npad_type.load() : npad_type.load();
switch (type) { switch (type) {
case NpadStyleIndex::Fullkey: return supported_style_tag.fullkey; case NpadStyleIndex::Fullkey: return bool(supported_style_tag.fullkey);
case NpadStyleIndex::Handheld: return supported_style_tag.handheld; case NpadStyleIndex::Handheld: return bool(supported_style_tag.handheld);
case NpadStyleIndex::JoyconDual: return supported_style_tag.joycon_dual; case NpadStyleIndex::JoyconDual: return bool(supported_style_tag.joycon_dual);
case NpadStyleIndex::JoyconLeft: return supported_style_tag.joycon_left; case NpadStyleIndex::JoyconLeft: return bool(supported_style_tag.joycon_left);
case NpadStyleIndex::JoyconRight: return supported_style_tag.joycon_right; case NpadStyleIndex::JoyconRight: return bool(supported_style_tag.joycon_right);
case NpadStyleIndex::GameCube: return supported_style_tag.gamecube; case NpadStyleIndex::GameCube: return bool(supported_style_tag.gamecube);
case NpadStyleIndex::Pokeball: return supported_style_tag.palma; case NpadStyleIndex::Pokeball: return bool(supported_style_tag.palma);
case NpadStyleIndex::NES: return supported_style_tag.lark; case NpadStyleIndex::NES: return bool(supported_style_tag.lark);
case NpadStyleIndex::SNES: return supported_style_tag.lucia; case NpadStyleIndex::SNES: return bool(supported_style_tag.lucia);
case NpadStyleIndex::N64: return supported_style_tag.lagoon; case NpadStyleIndex::N64: return bool(supported_style_tag.lagoon);
case NpadStyleIndex::SegaGenesis: return supported_style_tag.lager; case NpadStyleIndex::SegaGenesis: return bool(supported_style_tag.lager);
default: return false; default: return false;
} }
} }

6
src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp
View file

@ -66,7 +66,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState() {
continue; continue;
} }
auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)]; 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; return ResultSuccess;
} }
@ -78,7 +78,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState(u64 aruid) {
return ResultSuccess; return ResultSuccess;
} }
auto& npad_entry = data->shared_memory_format->npad.npad_entry[NpadIdTypeToIndex(npad_id)]; 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; return ResultSuccess;
} }
@ -89,7 +89,7 @@ Result NpadAbstractSixAxisHandler::UpdateSixAxisState2(u64 aruid) {
return ResultSuccess; return ResultSuccess;
} }
auto& npad_internal_state = aruid_data->shared_memory_format->npad.npad_entry[npad_index]; 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; return ResultSuccess;
} }

38
src/hid_core/resources/npad/npad_data.cpp
View file

@ -24,7 +24,7 @@ void NPadData::SetNpadAnalogStickUseCenterClamp(bool is_enabled) {
} }
bool NPadData::GetNpadAnalogStickUseCenterClamp() const { bool NPadData::GetNpadAnalogStickUseCenterClamp() const {
return status.use_center_clamp; return bool(status.use_center_clamp);
} }
void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) { void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
@ -32,7 +32,7 @@ void NPadData::SetNpadSystemExtStateEnabled(bool is_enabled) {
} }
bool NPadData::GetNpadSystemExtState() const { bool NPadData::GetNpadSystemExtState() const {
return status.system_ext_state; return bool(status.system_ext_state);
} }
Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list) { Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> list) {
@ -42,18 +42,14 @@ Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> l
} }
supported_npad_id_types_count = list.size(); supported_npad_id_types_count = list.size();
memcpy(supported_npad_id_types.data(), list.data(), std::memcpy(supported_npad_id_types.data(), list.data(), list.size() * sizeof(Core::HID::NpadIdType));
list.size() * sizeof(Core::HID::NpadIdType));
return ResultSuccess; return ResultSuccess;
} }
std::size_t NPadData::GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const { std::size_t NPadData::GetSupportedNpadIdType(std::span<Core::HID::NpadIdType> out_list) const {
std::size_t out_size = (std::min)(supported_npad_id_types_count, out_list.size()); std::size_t out_size = (std::min)(supported_npad_id_types_count, out_list.size());
memcpy(out_list.data(), supported_npad_id_types.data(), std::memcpy(out_list.data(), supported_npad_id_types.data(), out_size * sizeof(Core::HID::NpadIdType));
out_size * sizeof(Core::HID::NpadIdType));
return out_size; return out_size;
} }
@ -154,27 +150,27 @@ bool NPadData::IsNpadStyleIndexSupported(Core::HID::NpadStyleIndex style_index)
Core::HID::NpadStyleTag style = {supported_npad_style_set}; Core::HID::NpadStyleTag style = {supported_npad_style_set};
switch (style_index) { switch (style_index) {
case Core::HID::NpadStyleIndex::Fullkey: case Core::HID::NpadStyleIndex::Fullkey:
return style.fullkey; return bool(style.fullkey);
case Core::HID::NpadStyleIndex::Handheld: case Core::HID::NpadStyleIndex::Handheld:
return style.handheld; return bool(style.handheld);
case Core::HID::NpadStyleIndex::JoyconDual: case Core::HID::NpadStyleIndex::JoyconDual:
return style.joycon_dual; return bool(style.joycon_dual);
case Core::HID::NpadStyleIndex::JoyconLeft: case Core::HID::NpadStyleIndex::JoyconLeft:
return style.joycon_left; return bool(style.joycon_left);
case Core::HID::NpadStyleIndex::JoyconRight: case Core::HID::NpadStyleIndex::JoyconRight:
return style.joycon_right; return bool(style.joycon_right);
case Core::HID::NpadStyleIndex::GameCube: case Core::HID::NpadStyleIndex::GameCube:
return style.gamecube; return bool(style.gamecube);
case Core::HID::NpadStyleIndex::Pokeball: case Core::HID::NpadStyleIndex::Pokeball:
return style.palma; return bool(style.palma);
case Core::HID::NpadStyleIndex::NES: case Core::HID::NpadStyleIndex::NES:
return style.lark; return bool(style.lark);
case Core::HID::NpadStyleIndex::SNES: case Core::HID::NpadStyleIndex::SNES:
return style.lucia; return bool(style.lucia);
case Core::HID::NpadStyleIndex::N64: case Core::HID::NpadStyleIndex::N64:
return style.lagoon; return bool(style.lagoon);
case Core::HID::NpadStyleIndex::SegaGenesis: case Core::HID::NpadStyleIndex::SegaGenesis:
return style.lager; return bool(style.lager);
default: default:
return false; return false;
} }
@ -185,7 +181,7 @@ void NPadData::SetLrAssignmentMode(bool is_enabled) {
} }
bool NPadData::GetLrAssignmentMode() const { bool NPadData::GetLrAssignmentMode() const {
return status.lr_assignment_mode; return bool(status.lr_assignment_mode);
} }
void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) { void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
@ -193,7 +189,7 @@ void NPadData::SetAssigningSingleOnSlSrPress(bool is_enabled) {
} }
bool NPadData::GetAssigningSingleOnSlSrPress() const { 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) { void NPadData::SetHomeProtectionEnabled(bool is_enabled, Core::HID::NpadIdType npad_id) {

2
src/hid_core/resources/touch_screen/touch_screen_resource.cpp
View file

@ -548,7 +548,7 @@ void TouchResource::OnTouchUpdate(s64 timestamp) {
} }
auto& touch_shared = applet_data->shared_memory_format->touch_screen; 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); touch_shared.touch_screen_lifo.WriteNextEntry(current_touch_state);
} }
} }