diff options
| author | 2015-09-16 08:38:12 -0400 | |
|---|---|---|
| committer | 2015-09-16 08:51:53 -0400 | |
| commit | 751fbfdcc33420cb39aee30158706984efb4da40 (patch) | |
| tree | 570330019bba030c78af7d7715b89a5b3de7ccc6 /src/core/hle/service | |
| parent | Merge pull request #1097 from yuriks/cfg-blocks (diff) | |
| download | yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.gz yuzu-751fbfdcc33420cb39aee30158706984efb4da40.tar.xz yuzu-751fbfdcc33420cb39aee30158706984efb4da40.zip | |
general: Silence some warnings when using clang
Diffstat (limited to 'src/core/hle/service')
| -rw-r--r-- | src/core/hle/service/cfg/cfg.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/cfg/cfg.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/dsp_dsp.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 6f2cf0190..715a9b8c3 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp | |||
| @@ -77,10 +77,10 @@ static const ConsoleCountryInfo COUNTRY_INFO = { { 0, 0, 0 }, UNITED_STATES_COUN | |||
| 77 | * for example Nintendo Zone | 77 | * for example Nintendo Zone |
| 78 | * Thanks Normmatt for providing this information | 78 | * Thanks Normmatt for providing this information |
| 79 | */ | 79 | */ |
| 80 | static const std::array<float, 8> STEREO_CAMERA_SETTINGS = { | 80 | static const std::array<float, 8> STEREO_CAMERA_SETTINGS = {{ |
| 81 | 62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f, | 81 | 62.0f, 289.0f, 76.80000305175781f, 46.08000183105469f, |
| 82 | 10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f | 82 | 10.0f, 5.0f, 55.58000183105469f, 21.56999969482422f |
| 83 | }; | 83 | }}; |
| 84 | static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20, "STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes"); | 84 | static_assert(sizeof(STEREO_CAMERA_SETTINGS) == 0x20, "STEREO_CAMERA_SETTINGS must be exactly 0x20 bytes"); |
| 85 | 85 | ||
| 86 | static const u32 CONFIG_SAVEFILE_SIZE = 0x8000; | 86 | static const u32 CONFIG_SAVEFILE_SIZE = 0x8000; |
diff --git a/src/core/hle/service/cfg/cfg.h b/src/core/hle/service/cfg/cfg.h index 7b7a76b08..231528fd6 100644 --- a/src/core/hle/service/cfg/cfg.h +++ b/src/core/hle/service/cfg/cfg.h | |||
| @@ -44,7 +44,7 @@ struct SaveConfigBlockEntry { | |||
| 44 | // TODO(Link Mauve): use a constexpr once MSVC starts supporting it. | 44 | // TODO(Link Mauve): use a constexpr once MSVC starts supporting it. |
| 45 | #define C(code) (u16)((code)[0] | ((code)[1] << 8)) | 45 | #define C(code) (u16)((code)[0] | ((code)[1] << 8)) |
| 46 | 46 | ||
| 47 | static const std::array<u16, 187> country_codes = { | 47 | static const std::array<u16, 187> country_codes = {{ |
| 48 | 0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7 | 48 | 0, C("JP"), 0, 0, 0, 0, 0, 0, // 0-7 |
| 49 | C("AI"), C("AG"), C("AR"), C("AW"), C("BS"), C("BB"), C("BZ"), C("BO"), // 8-15 | 49 | C("AI"), C("AG"), C("AR"), C("AW"), C("BS"), C("BB"), C("BZ"), C("BO"), // 8-15 |
| 50 | C("BR"), C("VG"), C("CA"), C("KY"), C("CL"), C("CO"), C("CR"), C("DM"), // 16-23 | 50 | C("BR"), C("VG"), C("CA"), C("KY"), C("CL"), C("CO"), C("CR"), C("DM"), // 16-23 |
| @@ -69,7 +69,7 @@ static const std::array<u16, 187> country_codes = { | |||
| 69 | C("AE"), C("IN"), C("EG"), C("OM"), C("QA"), C("KW"), C("SA"), C("SY"), // 168-175 | 69 | C("AE"), C("IN"), C("EG"), C("OM"), C("QA"), C("KW"), C("SA"), C("SY"), // 168-175 |
| 70 | C("BH"), C("JO"), 0, 0, 0, 0, 0, 0, // 176-183 | 70 | C("BH"), C("JO"), 0, 0, 0, 0, 0, 0, // 176-183 |
| 71 | C("SM"), C("VA"), C("BM") // 184-186 | 71 | C("SM"), C("VA"), C("BM") // 184-186 |
| 72 | }; | 72 | }}; |
| 73 | 73 | ||
| 74 | #undef C | 74 | #undef C |
| 75 | 75 | ||
diff --git a/src/core/hle/service/dsp_dsp.cpp b/src/core/hle/service/dsp_dsp.cpp index a8cb15d60..ce5619069 100644 --- a/src/core/hle/service/dsp_dsp.cpp +++ b/src/core/hle/service/dsp_dsp.cpp | |||
| @@ -212,10 +212,10 @@ static void ReadPipeIfPossible(Service::Interface* self) { | |||
| 212 | 212 | ||
| 213 | // Canned DSP responses that games expect. These were taken from HW by 3dmoo team. | 213 | // Canned DSP responses that games expect. These were taken from HW by 3dmoo team. |
| 214 | // TODO: Remove this hack :) | 214 | // TODO: Remove this hack :) |
| 215 | static const std::array<u16, 16> canned_read_pipe = { | 215 | static const std::array<u16, 16> canned_read_pipe = {{ |
| 216 | 0x000F, 0xBFFF, 0x9E8E, 0x8680, 0xA78E, 0x9430, 0x8400, 0x8540, | 216 | 0x000F, 0xBFFF, 0x9E8E, 0x8680, 0xA78E, 0x9430, 0x8400, 0x8540, |
| 217 | 0x948E, 0x8710, 0x8410, 0xA90E, 0xAA0E, 0xAACE, 0xAC4E, 0xAC58 | 217 | 0x948E, 0x8710, 0x8410, 0xA90E, 0xAA0E, 0xAACE, 0xAC4E, 0xAC58 |
| 218 | }; | 218 | }}; |
| 219 | 219 | ||
| 220 | u32 initial_size = read_pipe_count; | 220 | u32 initial_size = read_pipe_count; |
| 221 | 221 | ||
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index c35b13b25..2e1e5c3e9 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -35,14 +35,14 @@ static Kernel::SharedPtr<Kernel::Event> event_debug_pad; | |||
| 35 | static u32 next_pad_index; | 35 | static u32 next_pad_index; |
| 36 | static u32 next_touch_index; | 36 | static u32 next_touch_index; |
| 37 | 37 | ||
| 38 | const std::array<Service::HID::PadState, Settings::NativeInput::NUM_INPUTS> pad_mapping = { | 38 | const std::array<Service::HID::PadState, Settings::NativeInput::NUM_INPUTS> pad_mapping = {{ |
| 39 | Service::HID::PAD_A, Service::HID::PAD_B, Service::HID::PAD_X, Service::HID::PAD_Y, | 39 | Service::HID::PAD_A, Service::HID::PAD_B, Service::HID::PAD_X, Service::HID::PAD_Y, |
| 40 | Service::HID::PAD_L, Service::HID::PAD_R, Service::HID::PAD_ZL, Service::HID::PAD_ZR, | 40 | Service::HID::PAD_L, Service::HID::PAD_R, Service::HID::PAD_ZL, Service::HID::PAD_ZR, |
| 41 | Service::HID::PAD_START, Service::HID::PAD_SELECT, Service::HID::PAD_NONE, | 41 | Service::HID::PAD_START, Service::HID::PAD_SELECT, Service::HID::PAD_NONE, |
| 42 | Service::HID::PAD_UP, Service::HID::PAD_DOWN, Service::HID::PAD_LEFT, Service::HID::PAD_RIGHT, | 42 | Service::HID::PAD_UP, Service::HID::PAD_DOWN, Service::HID::PAD_LEFT, Service::HID::PAD_RIGHT, |
| 43 | Service::HID::PAD_CIRCLE_UP, Service::HID::PAD_CIRCLE_DOWN, Service::HID::PAD_CIRCLE_LEFT, Service::HID::PAD_CIRCLE_RIGHT, | 43 | Service::HID::PAD_CIRCLE_UP, Service::HID::PAD_CIRCLE_DOWN, Service::HID::PAD_CIRCLE_LEFT, Service::HID::PAD_CIRCLE_RIGHT, |
| 44 | Service::HID::PAD_C_UP, Service::HID::PAD_C_DOWN, Service::HID::PAD_C_LEFT, Service::HID::PAD_C_RIGHT | 44 | Service::HID::PAD_C_UP, Service::HID::PAD_C_DOWN, Service::HID::PAD_C_LEFT, Service::HID::PAD_C_RIGHT |
| 45 | }; | 45 | }}; |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | // TODO(peachum): | 48 | // TODO(peachum): |