diff options
| author |  bunnei | 2014-06-14 12:13:16 -0400 |
|---|---|---|
| committer | bunnei | 2014-06-14 12:13:16 -0400 |
| commit | 004df767953a949817da89bddcd5d1379240f769 (patch) | |
| tree | b2d54928dcbf3cb4dde0cd5d3277afe7999b7bd9 /src/core/hle/service/hid.cpp | |
| parent | GPU debugger: Const correctness and build fix. (diff) | |
| parent | Kernel: Removed unnecessary "#pragma once". (diff) | |
| download | yuzu-004df767953a949817da89bddcd5d1379240f769.tar.gz yuzu-004df767953a949817da89bddcd5d1379240f769.tar.xz yuzu-004df767953a949817da89bddcd5d1379240f769.zip | |
Merge branch 'threading' of https://github.com/bunnei/citra
Conflicts:
src/core/hle/function_wrappers.h
src/core/hle/service/gsp.cpp
Diffstat (limited to 'src/core/hle/service/hid.cpp')
| -rw-r--r-- | src/core/hle/service/hid.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/service/hid.cpp b/src/core/hle/service/hid.cpp index 5542e5bf2..ab78f47d7 100644 --- a/src/core/hle/service/hid.cpp +++ b/src/core/hle/service/hid.cpp | |||
| @@ -13,11 +13,11 @@ | |||
| 13 | namespace HID_User { | 13 | namespace HID_User { |
| 14 | 14 | ||
| 15 | const Interface::FunctionInfo FunctionTable[] = { | 15 | const Interface::FunctionInfo FunctionTable[] = { |
| 16 | {0x000A0000, NULL, "GetIPCHandles"}, | 16 | {0x000A0000, nullptr, "GetIPCHandles"}, |
| 17 | {0x00110000, NULL, "EnableAccelerometer"}, | 17 | {0x00110000, nullptr, "EnableAccelerometer"}, |
| 18 | {0x00130000, NULL, "EnableGyroscopeLow"}, | 18 | {0x00130000, nullptr, "EnableGyroscopeLow"}, |
| 19 | {0x00150000, NULL, "GetGyroscopeLowRawToDpsCoefficient"}, | 19 | {0x00150000, nullptr, "GetGyroscopeLowRawToDpsCoefficient"}, |
| 20 | {0x00160000, NULL, "GetGyroscopeLowCalibrateParam"}, | 20 | {0x00160000, nullptr, "GetGyroscopeLowCalibrateParam"}, |
| 21 | }; | 21 | }; |
| 22 | 22 | ||
| 23 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 23 | //////////////////////////////////////////////////////////////////////////////////////////////////// |