diff options
| -rw-r--r-- | README.md | 2 | ||||
| -rwxr-xr-x | hooks/pre-commit | 2 | ||||
| -rw-r--r-- | src/audio_core/hle/dsp.cpp | 4 | ||||
| -rw-r--r-- | src/audio_core/hle/pipe.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_vertex_shader.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/registers.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/game_list_p.h | 2 | ||||
| -rw-r--r-- | src/common/hash.cpp | 2 | ||||
| -rw-r--r-- | src/common/logging/text_formatter.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/thread.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/service/ldr_ro/cro_helper.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/ncch.cpp | 2 | ||||
| -rw-r--r-- | src/core/loader/ncch.h | 2 | ||||
| -rw-r--r-- | src/video_core/command_processor.cpp | 2 |
15 files changed, 18 insertions, 18 deletions
| @@ -35,4 +35,4 @@ If you like, you can [donate by PayPal](https://www.paypal.com/cgi-bin/webscr?cm | |||
| 35 | * Eventually 3D displays to get proper 3D output working | 35 | * Eventually 3D displays to get proper 3D output working |
| 36 | * ... etc ... | 36 | * ... etc ... |
| 37 | 37 | ||
| 38 | We also more than gladly accept used 3DS consoles, preferrably ones with firmware 4.5 or lower! If you would like to give yours away, don't hesitate to join our IRC channel #citra on [Freenode](http://webchat.freenode.net/?channels=citra) and talk to neobrain or bunnei. Mind you, IRC is slow-paced, so it might be a while until people reply. If you're in a hurry you can just leave contact details in the channel or via private message and we'll get back to you. | 38 | We also more than gladly accept used 3DS consoles, preferably ones with firmware 4.5 or lower! If you would like to give yours away, don't hesitate to join our IRC channel #citra on [Freenode](http://webchat.freenode.net/?channels=citra) and talk to neobrain or bunnei. Mind you, IRC is slow-paced, so it might be a while until people reply. If you're in a hurry you can just leave contact details in the channel or via private message and we'll get back to you. |
diff --git a/hooks/pre-commit b/hooks/pre-commit index 6dd281c4a..ec2b5b77e 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit | |||
| @@ -10,7 +10,7 @@ if ! git diff --cached --check -- $paths_to_check ; then | |||
| 10 | cat<<END | 10 | cat<<END |
| 11 | 11 | ||
| 12 | Error: This commit would contain trailing spaces or tabs, which is against this repo's policy. | 12 | Error: This commit would contain trailing spaces or tabs, which is against this repo's policy. |
| 13 | Please correct those issues before commiting. (Use 'git diff --check' for more details) | 13 | Please correct those issues before committing. (Use 'git diff --check' for more details) |
| 14 | If you know what you are doing, you can try 'git commit --no-verify' to bypass the check | 14 | If you know what you are doing, you can try 'git commit --no-verify' to bypass the check |
| 15 | END | 15 | END |
| 16 | exit 1 | 16 | exit 1 |
diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp index 58690970a..31421fdc6 100644 --- a/src/audio_core/hle/dsp.cpp +++ b/src/audio_core/hle/dsp.cpp | |||
| @@ -23,12 +23,12 @@ static size_t CurrentRegionIndex() { | |||
| 23 | // This function only returns a 0 or 1. | 23 | // This function only returns a 0 or 1. |
| 24 | 24 | ||
| 25 | if (g_regions[0].frame_counter == 0xFFFFu && g_regions[1].frame_counter != 0xFFFEu) { | 25 | if (g_regions[0].frame_counter == 0xFFFFu && g_regions[1].frame_counter != 0xFFFEu) { |
| 26 | // Wraparound has occured. | 26 | // Wraparound has occurred. |
| 27 | return 1; | 27 | return 1; |
| 28 | } | 28 | } |
| 29 | 29 | ||
| 30 | if (g_regions[1].frame_counter == 0xFFFFu && g_regions[0].frame_counter != 0xFFFEu) { | 30 | if (g_regions[1].frame_counter == 0xFFFFu && g_regions[0].frame_counter != 0xFFFEu) { |
| 31 | // Wraparound has occured. | 31 | // Wraparound has occurred. |
| 32 | return 0; | 32 | return 0; |
| 33 | } | 33 | } |
| 34 | 34 | ||
diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp index b472c81d8..bc69acbc2 100644 --- a/src/audio_core/hle/pipe.cpp +++ b/src/audio_core/hle/pipe.cpp | |||
| @@ -117,7 +117,7 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | |||
| 117 | } | 117 | } |
| 118 | 118 | ||
| 119 | enum class StateChange { | 119 | enum class StateChange { |
| 120 | Initalize = 0, | 120 | Initialize = 0, |
| 121 | Shutdown = 1, | 121 | Shutdown = 1, |
| 122 | Wakeup = 2, | 122 | Wakeup = 2, |
| 123 | Sleep = 3, | 123 | Sleep = 3, |
| @@ -130,7 +130,7 @@ void PipeWrite(DspPipe pipe_number, const std::vector<u8>& buffer) { | |||
| 130 | // sleeping and reset it back after wakeup on behalf of the DSP. | 130 | // sleeping and reset it back after wakeup on behalf of the DSP. |
| 131 | 131 | ||
| 132 | switch (static_cast<StateChange>(buffer[0])) { | 132 | switch (static_cast<StateChange>(buffer[0])) { |
| 133 | case StateChange::Initalize: | 133 | case StateChange::Initialize: |
| 134 | LOG_INFO(Audio_DSP, "Application has requested initialization of DSP hardware"); | 134 | LOG_INFO(Audio_DSP, "Application has requested initialization of DSP hardware"); |
| 135 | ResetPipes(); | 135 | ResetPipes(); |
| 136 | AudioPipeWriteStructAddresses(); | 136 | AudioPipeWriteStructAddresses(); |
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp index 0b4320da5..96b40db1e 100644 --- a/src/citra_qt/debugger/graphics_vertex_shader.cpp +++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp | |||
| @@ -424,7 +424,7 @@ GraphicsVertexShaderWidget::GraphicsVertexShaderWidget( | |||
| 424 | // Create an HBoxLayout to store the widgets used to specify a particular attribute | 424 | // Create an HBoxLayout to store the widgets used to specify a particular attribute |
| 425 | // and store it in a QWidget to allow for easy hiding and unhiding. | 425 | // and store it in a QWidget to allow for easy hiding and unhiding. |
| 426 | auto row_layout = new QHBoxLayout; | 426 | auto row_layout = new QHBoxLayout; |
| 427 | // Remove unecessary padding between rows | 427 | // Remove unnecessary padding between rows |
| 428 | row_layout->setContentsMargins(0, 0, 0, 0); | 428 | row_layout->setContentsMargins(0, 0, 0, 0); |
| 429 | 429 | ||
| 430 | row_layout->addWidget(new QLabel(tr("Attribute %1").arg(i, 2))); | 430 | row_layout->addWidget(new QLabel(tr("Attribute %1").arg(i, 2))); |
| @@ -590,7 +590,7 @@ void GraphicsVertexShaderWidget::OnCycleIndexChanged(int index) { | |||
| 590 | .arg(record.dest_out.w.ToFloat32()); | 590 | .arg(record.dest_out.w.ToFloat32()); |
| 591 | 591 | ||
| 592 | if (record.mask & Pica::Shader::DebugDataRecord::ADDR_REG_OUT) | 592 | if (record.mask & Pica::Shader::DebugDataRecord::ADDR_REG_OUT) |
| 593 | text += tr("Addres Registers: %1, %2\n") | 593 | text += tr("Address Registers: %1, %2\n") |
| 594 | .arg(record.address_registers[0]) | 594 | .arg(record.address_registers[0]) |
| 595 | .arg(record.address_registers[1]); | 595 | .arg(record.address_registers[1]); |
| 596 | if (record.mask & Pica::Shader::DebugDataRecord::CMP_RESULT) | 596 | if (record.mask & Pica::Shader::DebugDataRecord::CMP_RESULT) |
diff --git a/src/citra_qt/debugger/registers.cpp b/src/citra_qt/debugger/registers.cpp index 0b644432f..4c529d3c3 100644 --- a/src/citra_qt/debugger/registers.cpp +++ b/src/citra_qt/debugger/registers.cpp | |||
| @@ -136,7 +136,7 @@ void RegistersWidget::UpdateCPSRValues() { | |||
| 136 | cpsr->child(2)->setText(1, QString::number((cpsr_val >> 6) & 1)); // F - FIQ disable | 136 | cpsr->child(2)->setText(1, QString::number((cpsr_val >> 6) & 1)); // F - FIQ disable |
| 137 | cpsr->child(3)->setText(1, QString::number((cpsr_val >> 7) & 1)); // I - IRQ disable | 137 | cpsr->child(3)->setText(1, QString::number((cpsr_val >> 7) & 1)); // I - IRQ disable |
| 138 | cpsr->child(4)->setText(1, QString::number((cpsr_val >> 8) & 1)); // A - Imprecise abort | 138 | cpsr->child(4)->setText(1, QString::number((cpsr_val >> 8) & 1)); // A - Imprecise abort |
| 139 | cpsr->child(5)->setText(1, QString::number((cpsr_val >> 9) & 1)); // E - Data endianess | 139 | cpsr->child(5)->setText(1, QString::number((cpsr_val >> 9) & 1)); // E - Data endianness |
| 140 | cpsr->child(6)->setText(1, | 140 | cpsr->child(6)->setText(1, |
| 141 | QString::number((cpsr_val >> 10) & 0x3F)); // IT - If-Then state (DNM) | 141 | QString::number((cpsr_val >> 10) & 0x3F)); // IT - If-Then state (DNM) |
| 142 | cpsr->child(7)->setText(1, | 142 | cpsr->child(7)->setText(1, |
diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index 60ab4cf02..5ca3fe991 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h | |||
| @@ -64,7 +64,7 @@ public: | |||
| 64 | * A specialization of GameListItem for path values. | 64 | * A specialization of GameListItem for path values. |
| 65 | * This class ensures that for every full path value it holds, a correct string representation | 65 | * This class ensures that for every full path value it holds, a correct string representation |
| 66 | * of just the filename (with no extension) will be displayed to the user. | 66 | * of just the filename (with no extension) will be displayed to the user. |
| 67 | * If this class recieves valid SMDH data, it will also display game icons and titles. | 67 | * If this class receives valid SMDH data, it will also display game icons and titles. |
| 68 | */ | 68 | */ |
| 69 | class GameListItemPath : public GameListItem { | 69 | class GameListItemPath : public GameListItem { |
| 70 | 70 | ||
diff --git a/src/common/hash.cpp b/src/common/hash.cpp index 5aa5118eb..2309320bb 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp | |||
| @@ -31,7 +31,7 @@ static FORCE_INLINE u64 fmix64(u64 k) { | |||
| 31 | return k; | 31 | return k; |
| 32 | } | 32 | } |
| 33 | 33 | ||
| 34 | // This is the 128-bit variant of the MurmurHash3 hash function that is targetted for 64-bit | 34 | // This is the 128-bit variant of the MurmurHash3 hash function that is targeted for 64-bit |
| 35 | // platforms (MurmurHash3_x64_128). It was taken from: | 35 | // platforms (MurmurHash3_x64_128). It was taken from: |
| 36 | // https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp | 36 | // https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp |
| 37 | void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { | 37 | void MurmurHash3_128(const void* key, int len, u32 seed, void* out) { |
diff --git a/src/common/logging/text_formatter.h b/src/common/logging/text_formatter.h index 0da102bc6..749268310 100644 --- a/src/common/logging/text_formatter.h +++ b/src/common/logging/text_formatter.h | |||
| @@ -17,7 +17,7 @@ struct Entry; | |||
| 17 | * | 17 | * |
| 18 | * @param path The input file path as a null-terminated string | 18 | * @param path The input file path as a null-terminated string |
| 19 | * @param root The name of the root source directory as a null-terminated string. Path up to and | 19 | * @param root The name of the root source directory as a null-terminated string. Path up to and |
| 20 | * including the last occurence of this name will be stripped | 20 | * including the last occurrence of this name will be stripped |
| 21 | * @return A pointer to the same string passed as `path`, but starting at the trimmed portion | 21 | * @return A pointer to the same string passed as `path`, but starting at the trimmed portion |
| 22 | */ | 22 | */ |
| 23 | const char* TrimSourcePath(const char* path, const char* root = "src"); | 23 | const char* TrimSourcePath(const char* path, const char* root = "src"); |
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index e65fd5c41..33c165197 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp | |||
| @@ -23,7 +23,7 @@ namespace Kernel { | |||
| 23 | 23 | ||
| 24 | static MemoryRegionInfo memory_regions[3]; | 24 | static MemoryRegionInfo memory_regions[3]; |
| 25 | 25 | ||
| 26 | /// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each sytem | 26 | /// Size of the APPLICATION, SYSTEM and BASE memory regions (respectively) for each system |
| 27 | /// memory configuration type. | 27 | /// memory configuration type. |
| 28 | static const u32 memory_region_sizes[8][3] = { | 28 | static const u32 memory_region_sizes[8][3] = { |
| 29 | // Old 3DS layouts | 29 | // Old 3DS layouts |
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp index c4eeeee56..84d6d24c6 100644 --- a/src/core/hle/kernel/thread.cpp +++ b/src/core/hle/kernel/thread.cpp | |||
| @@ -204,7 +204,7 @@ static std::tuple<u32*, u32*> GetWaitSynchTimeoutParameterRegister(Thread* threa | |||
| 204 | } | 204 | } |
| 205 | 205 | ||
| 206 | /** | 206 | /** |
| 207 | * Updates the WaitSynchronization timeout paramter according to the difference | 207 | * Updates the WaitSynchronization timeout parameter according to the difference |
| 208 | * between ticks of the last WaitSynchronization call and the incoming one. | 208 | * between ticks of the last WaitSynchronization call and the incoming one. |
| 209 | * @param timeout_low a pointer to the register for the low part of the timeout parameter | 209 | * @param timeout_low a pointer to the register for the low part of the timeout parameter |
| 210 | * @param timeout_high a pointer to the register for the high part of the timeout parameter | 210 | * @param timeout_high a pointer to the register for the high part of the timeout parameter |
diff --git a/src/core/hle/service/ldr_ro/cro_helper.cpp b/src/core/hle/service/ldr_ro/cro_helper.cpp index b7d250312..4f0aa77eb 100644 --- a/src/core/hle/service/ldr_ro/cro_helper.cpp +++ b/src/core/hle/service/ldr_ro/cro_helper.cpp | |||
| @@ -1227,7 +1227,7 @@ ResultCode CROHelper::Link(VAddr crs_address, bool link_on_load_bug_fix) { | |||
| 1227 | // The bug itself is: | 1227 | // The bug itself is: |
| 1228 | // If a relocation target is in .data segment, it will relocate to the | 1228 | // If a relocation target is in .data segment, it will relocate to the |
| 1229 | // user-specified buffer. But if this is linking during loading, | 1229 | // user-specified buffer. But if this is linking during loading, |
| 1230 | // the .data segment hasn't been tranfer from CRO to the buffer, | 1230 | // the .data segment hasn't been transfer from CRO to the buffer, |
| 1231 | // thus the relocation will be overwritten by data transfer. | 1231 | // thus the relocation will be overwritten by data transfer. |
| 1232 | // To fix this bug, we need temporarily restore the old .data segment | 1232 | // To fix this bug, we need temporarily restore the old .data segment |
| 1233 | // offset and apply imported symbols. | 1233 | // offset and apply imported symbols. |
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 2e4510857..fadd7b16b 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp | |||
| @@ -163,7 +163,7 @@ ResultStatus AppLoader_NCCH::LoadExec() { | |||
| 163 | Kernel::g_current_process->ideal_processor = | 163 | Kernel::g_current_process->ideal_processor = |
| 164 | exheader_header.arm11_system_local_caps.ideal_processor; | 164 | exheader_header.arm11_system_local_caps.ideal_processor; |
| 165 | 165 | ||
| 166 | // Copy data while converting endianess | 166 | // Copy data while converting endianness |
| 167 | std::array<u32, ARRAY_SIZE(exheader_header.arm11_kernel_caps.descriptors)> kernel_caps; | 167 | std::array<u32, ARRAY_SIZE(exheader_header.arm11_kernel_caps.descriptors)> kernel_caps; |
| 168 | std::copy_n(exheader_header.arm11_kernel_caps.descriptors, kernel_caps.size(), | 168 | std::copy_n(exheader_header.arm11_kernel_caps.descriptors, kernel_caps.size(), |
| 169 | begin(kernel_caps)); | 169 | begin(kernel_caps)); |
diff --git a/src/core/loader/ncch.h b/src/core/loader/ncch.h index 04350d006..f8718d063 100644 --- a/src/core/loader/ncch.h +++ b/src/core/loader/ncch.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include "core/loader/loader.h" | 11 | #include "core/loader/loader.h" |
| 12 | 12 | ||
| 13 | //////////////////////////////////////////////////////////////////////////////////////////////////// | 13 | //////////////////////////////////////////////////////////////////////////////////////////////////// |
| 14 | /// NCCH header (Note: "NCCH" appears to be a publically unknown acronym) | 14 | /// NCCH header (Note: "NCCH" appears to be a publicly unknown acronym) |
| 15 | 15 | ||
| 16 | struct NCCH_Header { | 16 | struct NCCH_Header { |
| 17 | u8 signature[0x100]; | 17 | u8 signature[0x100]; |
diff --git a/src/video_core/command_processor.cpp b/src/video_core/command_processor.cpp index bb618cacd..fda91e29c 100644 --- a/src/video_core/command_processor.cpp +++ b/src/video_core/command_processor.cpp | |||
| @@ -292,7 +292,7 @@ static void WritePicaReg(u32 id, u32 value, u32 mask) { | |||
| 292 | } | 292 | } |
| 293 | } | 293 | } |
| 294 | 294 | ||
| 295 | // Retreive vertex from register data | 295 | // Retrieve vertex from register data |
| 296 | Shader::OutputVertex output_vertex = output_registers.ToVertex(regs.vs); | 296 | Shader::OutputVertex output_vertex = output_registers.ToVertex(regs.vs); |
| 297 | 297 | ||
| 298 | // Send to renderer | 298 | // Send to renderer |