diff options
| author | 2016-09-18 09:38:01 +0900 | |
|---|---|---|
| committer | 2016-09-18 09:38:01 +0900 | |
| commit | dc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch) | |
| tree | 569a7f13128450bbab973236615587ff00bced5f /src/audio_core/hle/pipe.cpp | |
| parent | Travis: Import Dolphin’s clang-format hook. (diff) | |
| download | yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip | |
Sources: Run clang-format on everything.
Diffstat (limited to 'src/audio_core/hle/pipe.cpp')
| -rw-r--r-- | src/audio_core/hle/pipe.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp index 44dff1345..fe67d2503 100644 --- a/src/audio_core/hle/pipe.cpp +++ b/src/audio_core/hle/pipe.cpp | |||
| @@ -44,8 +44,10 @@ std::vector<u8> PipeRead(DspPipe pipe_number, u32 length) { | |||
| 44 | std::vector<u8>& data = pipe_data[pipe_index]; | 44 | std::vector<u8>& data = pipe_data[pipe_index]; |
| 45 | 45 | ||
| 46 | if (length > data.size()) { | 46 | if (length > data.size()) { |
| 47 | LOG_WARNING(Audio_DSP, "pipe_number = %zu is out of data, application requested read of %u but %zu remain", | 47 | LOG_WARNING( |
| 48 | pipe_index, length, data.size()); | 48 | Audio_DSP, |
| 49 | "pipe_number = %zu is out of data, application requested read of %u but %zu remain", | ||
| 50 | pipe_index, length, data.size()); | ||
| 49 | length = static_cast<u32>(data.size()); | 51 | length = static_cast<u32>(data.size()); |
| 50 | } | 52 | } |
| 51 | 53 | ||
| @@ -95,8 +97,7 @@ static void AudioPipeWriteStructAddresses() { | |||
| 95 | 0x8000 + offsetof(SharedMemory, unknown11) / 2, | 97 | 0x8000 + offsetof(SharedMemory, unknown11) / 2, |
| 96 | 0x8000 + offsetof(SharedMemory, unknown12) / 2, | 98 | 0x8000 + offsetof(SharedMemory, unknown12) / 2, |
| 97 | 0x8000 + offsetof(SharedMemory, unknown13) / 2, | 99 | 0x8000 + offsetof(SharedMemory, unknown13) / 2, |
| 98 | 0x8000 + offsetof(SharedMemory, unknown14) / 2 | 100 | 0x8000 + offsetof(SharedMemory, unknown14) / 2}; |
| 99 | }; | ||
| 100 | 101 | ||
| 101 | // Begin with a u16 denoting the number of structs. | 102 | // Begin with a u16 denoting the number of structs. |
| 102 | WriteU16(DspPipe::Audio, static_cast<u16>(struct_addresses.size())); | 103 | WriteU16(DspPipe::Audio, static_cast<u16>(struct_addresses.size())); |
| @@ -112,16 +113,12 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | |||
| 112 | switch (pipe_number) { | 113 | switch (pipe_number) { |
| 113 | case DspPipe::Audio: { | 114 | case DspPipe::Audio: { |
| 114 | if (buffer.size() != 4) { | 115 | if (buffer.size() != 4) { |
| 115 | LOG_ERROR(Audio_DSP, "DspPipe::Audio: Unexpected buffer length %zu was written", buffer.size()); | 116 | LOG_ERROR(Audio_DSP, "DspPipe::Audio: Unexpected buffer length %zu was written", |
| 117 | buffer.size()); | ||
| 116 | return; | 118 | return; |
| 117 | } | 119 | } |
| 118 | 120 | ||
| 119 | enum class StateChange { | 121 | enum class StateChange { Initalize = 0, Shutdown = 1, Wakeup = 2, Sleep = 3 }; |
| 120 | Initalize = 0, | ||
| 121 | Shutdown = 1, | ||
| 122 | Wakeup = 2, | ||
| 123 | Sleep = 3 | ||
| 124 | }; | ||
| 125 | 122 | ||
| 126 | // The difference between Initialize and Wakeup is that Input state is maintained | 123 | // The difference between Initialize and Wakeup is that Input state is maintained |
| 127 | // when sleeping but isn't when turning it off and on again. (TODO: Implement this.) | 124 | // when sleeping but isn't when turning it off and on again. (TODO: Implement this.) |
| @@ -152,7 +149,9 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | |||
| 152 | dsp_state = DspState::Sleeping; | 149 | dsp_state = DspState::Sleeping; |
| 153 | break; | 150 | break; |
| 154 | default: | 151 | default: |
| 155 | LOG_ERROR(Audio_DSP, "Application has requested unknown state transition of DSP hardware %hhu", buffer[0]); | 152 | LOG_ERROR(Audio_DSP, |
| 153 | "Application has requested unknown state transition of DSP hardware %hhu", | ||
| 154 | buffer[0]); | ||
| 156 | dsp_state = DspState::Off; | 155 | dsp_state = DspState::Off; |
| 157 | break; | 156 | break; |
| 158 | } | 157 | } |
| @@ -160,7 +159,8 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | |||
| 160 | return; | 159 | return; |
| 161 | } | 160 | } |
| 162 | default: | 161 | default: |
| 163 | LOG_CRITICAL(Audio_DSP, "pipe_number = %zu unimplemented", static_cast<size_t>(pipe_number)); | 162 | LOG_CRITICAL(Audio_DSP, "pipe_number = %zu unimplemented", |
| 163 | static_cast<size_t>(pipe_number)); | ||
| 164 | UNIMPLEMENTED(); | 164 | UNIMPLEMENTED(); |
| 165 | return; | 165 | return; |
| 166 | } | 166 | } |