yuzu-emu/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2024-11-26 18:25:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

service/hid: Silence -Wunused and -Wswitch

Browse Source
This commit is contained in:
ReinUsesLisp 2019-10-04 22:57:50 +00:00
parent ab6f8d8a1e
commit 0759df0aff
15 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/hid/controllers/debug_pad.cpp
View File

@ -11,11 +11,10 @@
namespace Service::HID { namespace Service::HID {
constexpr s32 HID_JOYSTICK_MAX = 0x7fff; constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
constexpr s32 HID_JOYSTICK_MIN = -0x7fff; [[maybe_unused]] constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right }; enum class JoystickId : std::size_t { Joystick_Left, Joystick_Right };
Controller_DebugPad::Controller_DebugPad(Core::System& system) Controller_DebugPad::Controller_DebugPad(Core::System& system) : ControllerBase(system) {}
: ControllerBase(system), system(system) {}
Controller_DebugPad::~Controller_DebugPad() = default; Controller_DebugPad::~Controller_DebugPad() = default;
void Controller_DebugPad::OnInit() {} void Controller_DebugPad::OnInit() {}

1
src/core/hle/service/hid/controllers/debug_pad.h
View File

@ -89,6 +89,5 @@ private:
buttons; buttons;
std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID> std::array<std::unique_ptr<Input::AnalogDevice>, Settings::NativeAnalog::NUM_STICKS_HID>
analogs; analogs;
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

3
src/core/hle/service/hid/controllers/gesture.cpp
View File

@ -10,8 +10,7 @@
namespace Service::HID { namespace Service::HID {
constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00; constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3BA00;
Controller_Gesture::Controller_Gesture(Core::System& system) Controller_Gesture::Controller_Gesture(Core::System& system) : ControllerBase(system) {}
: ControllerBase(system) {}
Controller_Gesture::~Controller_Gesture() = default; Controller_Gesture::~Controller_Gesture() = default;
void Controller_Gesture::OnInit() {} void Controller_Gesture::OnInit() {}

3
src/core/hle/service/hid/controllers/keyboard.cpp
View File

@ -12,8 +12,7 @@ namespace Service::HID {
constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800; constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3800;
constexpr u8 KEYS_PER_BYTE = 8; constexpr u8 KEYS_PER_BYTE = 8;
Controller_Keyboard::Controller_Keyboard(Core::System& system) Controller_Keyboard::Controller_Keyboard(Core::System& system) : ControllerBase(system) {}
: ControllerBase(system), system(system) {}
Controller_Keyboard::~Controller_Keyboard() = default; Controller_Keyboard::~Controller_Keyboard() = default;
void Controller_Keyboard::OnInit() {} void Controller_Keyboard::OnInit() {}

1
src/core/hle/service/hid/controllers/keyboard.h
View File

@ -53,6 +53,5 @@ private:
keyboard_keys; keyboard_keys;
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeKeyboard::NumKeyboardMods> std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeKeyboard::NumKeyboardMods>
keyboard_mods; keyboard_mods;
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

2
src/core/hle/service/hid/controllers/mouse.cpp
View File

@ -11,7 +11,7 @@
namespace Service::HID { namespace Service::HID {
constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400; constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3400;
Controller_Mouse::Controller_Mouse(Core::System& system) : ControllerBase(system), system(system) {} Controller_Mouse::Controller_Mouse(Core::System& system) : ControllerBase(system) {}
Controller_Mouse::~Controller_Mouse() = default; Controller_Mouse::~Controller_Mouse() = default;
void Controller_Mouse::OnInit() {} void Controller_Mouse::OnInit() {}

1
src/core/hle/service/hid/controllers/mouse.h
View File

@ -53,6 +53,5 @@ private:
std::unique_ptr<Input::MouseDevice> mouse_device; std::unique_ptr<Input::MouseDevice> mouse_device;
std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeMouseButton::NumMouseButtons> std::array<std::unique_ptr<Input::ButtonDevice>, Settings::NativeMouseButton::NumMouseButtons>
mouse_button_devices; mouse_button_devices;
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

8
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -20,7 +20,7 @@
namespace Service::HID { namespace Service::HID {
constexpr s32 HID_JOYSTICK_MAX = 0x7fff; constexpr s32 HID_JOYSTICK_MAX = 0x7fff;
constexpr s32 HID_JOYSTICK_MIN = -0x7fff; [[maybe_unused]] constexpr s32 HID_JOYSTICK_MIN = -0x7fff;
constexpr std::size_t NPAD_OFFSET = 0x9A00; constexpr std::size_t NPAD_OFFSET = 0x9A00;
constexpr u32 BATTERY_FULL = 2; constexpr u32 BATTERY_FULL = 2;
constexpr u32 MAX_NPAD_ID = 7; constexpr u32 MAX_NPAD_ID = 7;
@ -105,6 +105,8 @@ void Controller_NPad::InitNewlyAddedControler(std::size_t controller_idx) {
controller.joy_styles.raw = 0; // Zero out controller.joy_styles.raw = 0; // Zero out
controller.device_type.raw = 0; controller.device_type.raw = 0;
switch (controller_type) { switch (controller_type) {
case NPadControllerType::None:
UNREACHABLE();
case NPadControllerType::Handheld: case NPadControllerType::Handheld:
controller.joy_styles.handheld.Assign(1); controller.joy_styles.handheld.Assign(1);
controller.device_type.handheld.Assign(1); controller.device_type.handheld.Assign(1);
@ -239,7 +241,7 @@ void Controller_NPad::OnRelease() {}
void Controller_NPad::RequestPadStateUpdate(u32 npad_id) { void Controller_NPad::RequestPadStateUpdate(u32 npad_id) {
const auto controller_idx = NPadIdToIndex(npad_id); const auto controller_idx = NPadIdToIndex(npad_id);
const auto controller_type = connected_controllers[controller_idx].type; [[maybe_unused]] const auto controller_type = connected_controllers[controller_idx].type;
if (!connected_controllers[controller_idx].is_connected) { if (!connected_controllers[controller_idx].is_connected) {
return; return;
} }
@ -346,6 +348,8 @@ void Controller_NPad::OnUpdate(const Core::Timing::CoreTiming& core_timing, u8*
libnx_entry.connection_status.raw = 0; libnx_entry.connection_status.raw = 0;
switch (controller_type) { switch (controller_type) {
case NPadControllerType::None:
UNREACHABLE();
case NPadControllerType::Handheld: case NPadControllerType::Handheld:
handheld_entry.connection_status.raw = 0; handheld_entry.connection_status.raw = 0;
handheld_entry.connection_status.IsWired.Assign(1); handheld_entry.connection_status.IsWired.Assign(1);

3
src/core/hle/service/hid/controllers/stubbed.cpp
View File

@ -9,8 +9,7 @@
namespace Service::HID { namespace Service::HID {
Controller_Stubbed::Controller_Stubbed(Core::System& system) Controller_Stubbed::Controller_Stubbed(Core::System& system) : ControllerBase(system) {}
: ControllerBase(system), system(system) {}
Controller_Stubbed::~Controller_Stubbed() = default; Controller_Stubbed::~Controller_Stubbed() = default;
void Controller_Stubbed::OnInit() {} void Controller_Stubbed::OnInit() {}

1
src/core/hle/service/hid/controllers/stubbed.h
View File

@ -30,6 +30,5 @@ public:
private: private:
bool smart_update{}; bool smart_update{};
std::size_t common_offset{}; std::size_t common_offset{};
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

3
src/core/hle/service/hid/controllers/touchscreen.cpp
View File

@ -13,8 +13,7 @@
namespace Service::HID { namespace Service::HID {
constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400; constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400;
Controller_Touchscreen::Controller_Touchscreen(Core::System& system) Controller_Touchscreen::Controller_Touchscreen(Core::System& system) : ControllerBase(system) {}
: ControllerBase(system), system(system) {}
Controller_Touchscreen::~Controller_Touchscreen() = default; Controller_Touchscreen::~Controller_Touchscreen() = default;
void Controller_Touchscreen::OnInit() {} void Controller_Touchscreen::OnInit() {}

1
src/core/hle/service/hid/controllers/touchscreen.h
View File

@ -69,6 +69,5 @@ private:
TouchScreenSharedMemory shared_memory{}; TouchScreenSharedMemory shared_memory{};
std::unique_ptr<Input::TouchDevice> touch_device; std::unique_ptr<Input::TouchDevice> touch_device;
s64_le last_touch{}; s64_le last_touch{};
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

2
src/core/hle/service/hid/controllers/xpad.cpp
View File

@ -10,7 +10,7 @@
namespace Service::HID { namespace Service::HID {
constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00; constexpr std::size_t SHARED_MEMORY_OFFSET = 0x3C00;
Controller_XPad::Controller_XPad(Core::System& system) : ControllerBase(system), system(system) {} Controller_XPad::Controller_XPad(Core::System& system) : ControllerBase(system) {}
Controller_XPad::~Controller_XPad() = default; Controller_XPad::~Controller_XPad() = default;
void Controller_XPad::OnInit() {} void Controller_XPad::OnInit() {}

1
src/core/hle/service/hid/controllers/xpad.h
View File

@ -56,6 +56,5 @@ private:
}; };
static_assert(sizeof(SharedMemory) == 0x1000, "SharedMemory is an invalid size"); static_assert(sizeof(SharedMemory) == 0x1000, "SharedMemory is an invalid size");
SharedMemory shared_memory{}; SharedMemory shared_memory{};
Core::System& system;
}; };
} // namespace Service::HID } // namespace Service::HID

6
src/core/hle/service/hid/hid.cpp
View File

@ -38,8 +38,10 @@ namespace Service::HID {
// Updating period for each HID device. // Updating period for each HID device.
// TODO(ogniK): Find actual polling rate of hid // TODO(ogniK): Find actual polling rate of hid
constexpr s64 pad_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 66); constexpr s64 pad_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 66);
constexpr s64 accelerometer_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100); [[maybe_unused]] constexpr s64 accelerometer_update_ticks =
constexpr s64 gyroscope_update_ticks = static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100); static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
[[maybe_unused]] constexpr s64 gyroscope_update_ticks =
static_cast<s64>(Core::Timing::BASE_CLOCK_RATE / 100);
constexpr std::size_t SHARED_MEMORY_SIZE = 0x40000; constexpr std::size_t SHARED_MEMORY_SIZE = 0x40000;
IAppletResource::IAppletResource(Core::System& system) IAppletResource::IAppletResource(Core::System& system)