aboutsummaryrefslogtreecommitdiff
path: root/src/hid_core
diff options
context:
space:
mode:
authorlizzie <lizzie@eden-emu.dev>2025-09-09 20:47:49 +0200
committercrueter <crueter@eden-emu.dev>2025-09-09 20:47:49 +0200
commit9d2681ecc9565681db623fb71799e76381998512 (patch)
tree3133129860a1569a8be8e7e0c9c5985adbd992ca /src/hid_core
parent428f136a754096e34c7bfec902684e2546a43ca4 (diff)
[cmake] enable clang-cl and WoA builds (#348)
Compilation and CMake fixes for both Windows on ARM and clang-cl, meaning Windows can now be built on both MSVC and clang on both amd64 and aarch64. Compiling on clang is *dramatically* faster so this should be useful for CI. Co-authored-by: crueter <crueter@eden-emu.dev> Co-authored-by: crueter <crueter@crueter.xyz> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/348 Reviewed-by: CamilleLaVey <camillelavey99@gmail.com> Reviewed-by: crueter <crueter@eden-emu.dev> Co-authored-by: lizzie <lizzie@eden-emu.dev> Co-committed-by: lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src/hid_core')
-rw-r--r--src/hid_core/frontend/emulated_controller.cpp4
-rw-r--r--src/hid_core/hidbus/ringcon.cpp2
-rw-r--r--src/hid_core/irsensor/image_transfer_processor.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_battery_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_button_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_led_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_mcu_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_nfc_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_pad.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_pad_holder.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_palma_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp2
-rw-r--r--src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp2
-rw-r--r--src/hid_core/resources/applet_resource.cpp2
-rw-r--r--src/hid_core/resources/npad/npad.cpp2
-rw-r--r--src/hid_core/resources/npad/npad_data.cpp2
-rw-r--r--src/hid_core/resources/npad/npad_resource.cpp2
-rw-r--r--src/hid_core/resources/palma/palma.cpp2
-rw-r--r--src/hid_core/resources/touch_screen/gesture_handler.cpp2
-rw-r--r--src/hid_core/resources/touch_screen/touch_screen_resource.cpp8
22 files changed, 26 insertions, 26 deletions
diff --git a/src/hid_core/frontend/emulated_controller.cpp b/src/hid_core/frontend/emulated_controller.cpp
index 5bdad4a0ad..8a6922c49f 100644
--- a/src/hid_core/frontend/emulated_controller.cpp
+++ b/src/hid_core/frontend/emulated_controller.cpp
@@ -1308,9 +1308,9 @@ bool EmulatedController::SetVibration(DeviceIndex device_index, const VibrationV
: Common::Input::VibrationAmplificationType::Linear;
const Common::Input::VibrationStatus status = {
- .low_amplitude = std::min(vibration.low_amplitude * strength, 1.0f),
+ .low_amplitude = (std::min)(vibration.low_amplitude * strength, 1.0f),
.low_frequency = vibration.low_frequency,
- .high_amplitude = std::min(vibration.high_amplitude * strength, 1.0f),
+ .high_amplitude = (std::min)(vibration.high_amplitude * strength, 1.0f),
.high_frequency = vibration.high_frequency,
.type = type,
};
diff --git a/src/hid_core/hidbus/ringcon.cpp b/src/hid_core/hidbus/ringcon.cpp
index 4f5eaa5053..a2bfd82636 100644
--- a/src/hid_core/hidbus/ringcon.cpp
+++ b/src/hid_core/hidbus/ringcon.cpp
@@ -283,7 +283,7 @@ u8 RingController::GetCrcValue(const std::vector<u8>& data) const {
template <typename T>
u64 RingController::GetData(const T& reply, std::span<u8> out_data) const {
static_assert(std::is_trivially_copyable_v<T>);
- const auto data_size = static_cast<u64>(std::min(sizeof(reply), out_data.size()));
+ const auto data_size = static_cast<u64>((std::min)(sizeof(reply), out_data.size()));
std::memcpy(out_data.data(), &reply, data_size);
return data_size;
}
diff --git a/src/hid_core/irsensor/image_transfer_processor.cpp b/src/hid_core/irsensor/image_transfer_processor.cpp
index 2b5a50ef6f..9040390946 100644
--- a/src/hid_core/irsensor/image_transfer_processor.cpp
+++ b/src/hid_core/irsensor/image_transfer_processor.cpp
@@ -146,7 +146,7 @@ void ImageTransferProcessor::SetTransferMemoryAddress(Common::ProcessAddress t_m
Core::IrSensor::ImageTransferProcessorState ImageTransferProcessor::GetState(
std::span<u8> data) const {
- const auto size = std::min(GetDataSize(current_config.trimming_format), data.size());
+ const auto size = (std::min)(GetDataSize(current_config.trimming_format), data.size());
system.ApplicationMemory().ReadBlock(transfer_memory, data.data(), size);
return processor_state;
}
diff --git a/src/hid_core/resources/abstracted_pad/abstract_battery_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_battery_handler.cpp
index 62fbbb0a7e..b3e17b389d 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_battery_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_battery_handler.cpp
@@ -30,7 +30,7 @@ void NpadAbstractBatteryHandler::SetPropertiesHandler(NpadAbstractPropertiesHand
}
Result NpadAbstractBatteryHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_button_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_button_handler.cpp
index 5871694335..e4166b3735 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_button_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_button_handler.cpp
@@ -30,7 +30,7 @@ void NpadAbstractButtonHandler::SetPropertiesHandler(NpadAbstractPropertiesHandl
}
Result NpadAbstractButtonHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp
index e399edfd70..4367dcaa56 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_ir_sensor_handler.cpp
@@ -24,7 +24,7 @@ void NpadAbstractIrSensorHandler::SetPropertiesHandler(NpadAbstractPropertiesHan
}
Result NpadAbstractIrSensorHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_led_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_led_handler.cpp
index 0b2bfe88da..b4375e57f3 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_led_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_led_handler.cpp
@@ -29,7 +29,7 @@ void NpadAbstractLedHandler::SetPropertiesHandler(NpadAbstractPropertiesHandler*
}
Result NpadAbstractLedHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_mcu_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_mcu_handler.cpp
index 6f35bd95cc..accbfe0def 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_mcu_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_mcu_handler.cpp
@@ -22,7 +22,7 @@ void NpadAbstractMcuHandler::SetPropertiesHandler(NpadAbstractPropertiesHandler*
}
Result NpadAbstractMcuHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_nfc_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_nfc_handler.cpp
index bd9b79333c..7a47786d42 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_nfc_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_nfc_handler.cpp
@@ -24,7 +24,7 @@ void NpadAbstractNfcHandler::SetPropertiesHandler(NpadAbstractPropertiesHandler*
}
Result NpadAbstractNfcHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_pad.cpp b/src/hid_core/resources/abstracted_pad/abstract_pad.cpp
index 435b095f02..39906fe33f 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_pad.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_pad.cpp
@@ -68,7 +68,7 @@ void AbstractPad::SetNpadId(Core::HID::NpadIdType npad_id) {
}
Result AbstractPad::Activate() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
diff --git a/src/hid_core/resources/abstracted_pad/abstract_pad_holder.cpp b/src/hid_core/resources/abstracted_pad/abstract_pad_holder.cpp
index 8334dc34f6..80f86459b9 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_pad_holder.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_pad_holder.cpp
@@ -73,7 +73,7 @@ u64 NpadAbstractedPadHolder::RemoveAbstractPadByAssignmentStyle(
}
u32 NpadAbstractedPadHolder::GetAbstractedPads(std::span<IAbstractedPad*> list) const {
- u32 num_elements = std::min(static_cast<u32>(list.size()), list_size);
+ u32 num_elements = (std::min)(static_cast<u32>(list.size()), list_size);
for (std::size_t i = 0; i < num_elements; i++) {
list[i] = assignment_list[i].abstracted_pad;
}
diff --git a/src/hid_core/resources/abstracted_pad/abstract_palma_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_palma_handler.cpp
index 04d276d617..c10d0c4070 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_palma_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_palma_handler.cpp
@@ -25,7 +25,7 @@ void NpadAbstractPalmaHandler::SetPalmaResource(PalmaResource* resource) {
}
Result NpadAbstractPalmaHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp
index 36b630c7f4..90c46cbe8c 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_properties_handler.cpp
@@ -38,7 +38,7 @@ Core::HID::NpadIdType NpadAbstractPropertiesHandler::GetNpadId() const {
}
Result NpadAbstractPropertiesHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
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 0dde244ef8..10c00ef95c 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_sixaxis_handler.cpp
@@ -33,7 +33,7 @@ void NpadAbstractSixAxisHandler::SetSixaxisResource(SixAxisResource* resource) {
}
Result NpadAbstractSixAxisHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp
index ca64b0a437..07a35b2147 100644
--- a/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp
+++ b/src/hid_core/resources/abstracted_pad/abstract_vibration_handler.cpp
@@ -55,7 +55,7 @@ void NpadAbstractVibrationHandler::SetGcVibration(NpadGcVibrationDevice* gc_devi
}
Result NpadAbstractVibrationHandler::IncrementRefCounter() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadHandlerOverflow;
}
ref_counter++;
diff --git a/src/hid_core/resources/applet_resource.cpp b/src/hid_core/resources/applet_resource.cpp
index 243beb1c7f..a533ca4319 100644
--- a/src/hid_core/resources/applet_resource.cpp
+++ b/src/hid_core/resources/applet_resource.cpp
@@ -271,7 +271,7 @@ void AppletResource::EnablePalmaBoostMode(u64 aruid, bool is_enabled) {
}
Result AppletResource::RegisterCoreAppletResource() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultAppletResourceOverflow;
}
if (ref_counter == 0) {
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index ca1ccd659c..f1f5ee5e9f 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -55,7 +55,7 @@ NPad::~NPad() {
}
Result NPad::Activate() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultNpadResourceOverflow;
}
diff --git a/src/hid_core/resources/npad/npad_data.cpp b/src/hid_core/resources/npad/npad_data.cpp
index 29ad5cb08c..fbcc3ef89a 100644
--- a/src/hid_core/resources/npad/npad_data.cpp
+++ b/src/hid_core/resources/npad/npad_data.cpp
@@ -46,7 +46,7 @@ Result NPadData::SetSupportedNpadIdType(std::span<const Core::HID::NpadIdType> l
}
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(),
out_size * sizeof(Core::HID::NpadIdType));
diff --git a/src/hid_core/resources/npad/npad_resource.cpp b/src/hid_core/resources/npad/npad_resource.cpp
index 79f7d74c0c..21a514dce6 100644
--- a/src/hid_core/resources/npad/npad_resource.cpp
+++ b/src/hid_core/resources/npad/npad_resource.cpp
@@ -126,7 +126,7 @@ Result NPadResource::Activate(u64 aruid) {
}
Result NPadResource::Activate() {
- if (ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultAppletResourceOverflow;
}
if (ref_counter == 0) {
diff --git a/src/hid_core/resources/palma/palma.cpp b/src/hid_core/resources/palma/palma.cpp
index be3d3c0edd..9210b456e2 100644
--- a/src/hid_core/resources/palma/palma.cpp
+++ b/src/hid_core/resources/palma/palma.cpp
@@ -62,7 +62,7 @@ Result Palma::GetPalmaOperationInfo(const PalmaConnectionHandle& handle,
}
operation_type = static_cast<PalmaOperationType>(operation.operation);
std::memcpy(out_data.data(), operation.data.data(),
- std::min(out_data.size(), operation.data.size()));
+ (std::min)(out_data.size(), operation.data.size()));
return ResultSuccess;
}
diff --git a/src/hid_core/resources/touch_screen/gesture_handler.cpp b/src/hid_core/resources/touch_screen/gesture_handler.cpp
index 4fcaf6ecf1..6309019796 100644
--- a/src/hid_core/resources/touch_screen/gesture_handler.cpp
+++ b/src/hid_core/resources/touch_screen/gesture_handler.cpp
@@ -16,7 +16,7 @@ GestureHandler::~GestureHandler() {}
void GestureHandler::SetTouchState(std::span<TouchState> touch_state, u32 count, s64 timestamp) {
gesture = {};
- gesture.active_points = std::min(MaxPoints, static_cast<std::size_t>(count));
+ gesture.active_points = (std::min)(MaxPoints, static_cast<std::size_t>(count));
for (size_t id = 0; id < gesture.active_points; ++id) {
const auto& [active_x, active_y] = touch_state[id].position;
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 79ddaa4dfa..51b94b2466 100644
--- a/src/hid_core/resources/touch_screen/touch_screen_resource.cpp
+++ b/src/hid_core/resources/touch_screen/touch_screen_resource.cpp
@@ -25,8 +25,8 @@ TouchResource::~TouchResource() {
};
Result TouchResource::ActivateTouch() {
- if (global_ref_counter == std::numeric_limits<s32>::max() - 1 ||
- touch_ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (global_ref_counter == (std::numeric_limits<s32>::max)() - 1 ||
+ touch_ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultTouchOverflow;
}
@@ -91,8 +91,8 @@ Result TouchResource::ActivateTouch(u64 aruid) {
}
Result TouchResource::ActivateGesture() {
- if (global_ref_counter == std::numeric_limits<s32>::max() - 1 ||
- gesture_ref_counter == std::numeric_limits<s32>::max() - 1) {
+ if (global_ref_counter == (std::numeric_limits<s32>::max)() - 1 ||
+ gesture_ref_counter == (std::numeric_limits<s32>::max)() - 1) {
return ResultGestureOverflow;
}