summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-15 08:14:11 +0200
committerGitHub <noreply@github.com>2020-08-15 08:14:11 +0200
commit2b601e86360ea47df5b3cb1a280177f428763837 (patch)
tree650bd7ad43701989bb87f06dc00e5c62fb50e0c3 /src/core/hle/service
parentMerge pull request #4527 from lioncash/pessimizing2 (diff)
parentcore: Resolve several -Wextra-semi warnings (diff)
downloadyuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.gz
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.bz2
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.lz
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.xz
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.tar.zst
yuzu-2b601e86360ea47df5b3cb1a280177f428763837.zip
Diffstat (limited to 'src/core/hle/service')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp4
-rw-r--r--src/core/hle/service/nvdrv/devices/nvdevice.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index ef67ad690..0e7794dc7 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -90,7 +90,7 @@ u32 Controller_NPad::IndexToNPad(std::size_t index) {
default:
UNIMPLEMENTED_MSG("Unknown npad index {}", index);
return 0;
- };
+ }
}
Controller_NPad::Controller_NPad(Core::System& system) : ControllerBase(system), system(system) {}
@@ -630,7 +630,7 @@ Controller_NPad::LedPattern Controller_NPad::GetLedPattern(u32 npad_id) {
default:
UNIMPLEMENTED_MSG("Unhandled npad_id {}", npad_id);
return LedPattern{0, 0, 0, 0};
- };
+ }
}
void Controller_NPad::SetVibrationEnabled(bool can_vibrate) {
diff --git a/src/core/hle/service/nvdrv/devices/nvdevice.h b/src/core/hle/service/nvdrv/devices/nvdevice.h
index 1b52511a5..0240d6643 100644
--- a/src/core/hle/service/nvdrv/devices/nvdevice.h
+++ b/src/core/hle/service/nvdrv/devices/nvdevice.h
@@ -21,8 +21,9 @@ namespace Service::Nvidia::Devices {
/// implement the ioctl interface.
class nvdevice {
public:
- explicit nvdevice(Core::System& system) : system{system} {};
+ explicit nvdevice(Core::System& system) : system{system} {}
virtual ~nvdevice() = default;
+
union Ioctl {
u32_le raw;
BitField<0, 8, u32> cmd;