summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/audio_core/hle/filter.h2
-rw-r--r--src/audio_core/interpolate.h2
-rw-r--r--src/audio_core/sink.h2
-rw-r--r--src/audio_core/time_stretch.h2
-rw-r--r--src/citra_qt/game_list_p.h8
-rw-r--r--src/citra_qt/hotkeys.h2
-rw-r--r--src/core/file_sys/archive_extsavedata.h2
-rw-r--r--src/core/frontend/camera/factory.h4
-rw-r--r--src/core/gdbstub/gdbstub.cpp1
-rw-r--r--src/core/hle/ipc.h4
-rw-r--r--src/core/hle/kernel/server_session.h3
-rw-r--r--src/core/hle/service/cam/cam.h2
-rw-r--r--src/core/hle/service/gsp_gpu.cpp6
-rw-r--r--src/core/hle/service/ldr_ro/cro_helper.h4
-rw-r--r--src/core/loader/loader.h2
-rw-r--r--src/video_core/debug_utils/debug_utils.h2
-rw-r--r--src/video_core/shader/shader_interpreter.h3
-rw-r--r--src/video_core/shader/shader_jit_x64_compiler.h3
18 files changed, 31 insertions, 23 deletions
diff --git a/src/audio_core/hle/filter.h b/src/audio_core/hle/filter.h
index 4281a5898..5350e2857 100644
--- a/src/audio_core/hle/filter.h
+++ b/src/audio_core/hle/filter.h
@@ -27,7 +27,7 @@ public:
27 * See also: SourceConfiguration::Configuration::simple_filter_enabled, 27 * See also: SourceConfiguration::Configuration::simple_filter_enabled,
28 * SourceConfiguration::Configuration::biquad_filter_enabled. 28 * SourceConfiguration::Configuration::biquad_filter_enabled.
29 * @param simple If true, enables the simple filter. If false, disables it. 29 * @param simple If true, enables the simple filter. If false, disables it.
30 * @param simple If true, enables the biquad filter. If false, disables it. 30 * @param biquad If true, enables the biquad filter. If false, disables it.
31 */ 31 */
32 void Enable(bool simple, bool biquad); 32 void Enable(bool simple, bool biquad);
33 33
diff --git a/src/audio_core/interpolate.h b/src/audio_core/interpolate.h
index dd06fdda9..19a7b66cb 100644
--- a/src/audio_core/interpolate.h
+++ b/src/audio_core/interpolate.h
@@ -21,6 +21,7 @@ struct State {
21 21
22/** 22/**
23 * No interpolation. This is equivalent to a zero-order hold. There is a two-sample predelay. 23 * No interpolation. This is equivalent to a zero-order hold. There is a two-sample predelay.
24 * @param state Interpolation state.
24 * @param input Input buffer. 25 * @param input Input buffer.
25 * @param rate_multiplier Stretch factor. Must be a positive non-zero value. 26 * @param rate_multiplier Stretch factor. Must be a positive non-zero value.
26 * rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0 27 * rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0
@@ -31,6 +32,7 @@ StereoBuffer16 None(State& state, const StereoBuffer16& input, float rate_multip
31 32
32/** 33/**
33 * Linear interpolation. This is equivalent to a first-order hold. There is a two-sample predelay. 34 * Linear interpolation. This is equivalent to a first-order hold. There is a two-sample predelay.
35 * @param state Interpolation state.
34 * @param input Input buffer. 36 * @param input Input buffer.
35 * @param rate_multiplier Stretch factor. Must be a positive non-zero value. 37 * @param rate_multiplier Stretch factor. Must be a positive non-zero value.
36 * rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0 38 * rate_multiplier > 1.0 performs decimation and rate_multipler < 1.0
diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h
index 558c8c0fe..c69cb2c74 100644
--- a/src/audio_core/sink.h
+++ b/src/audio_core/sink.h
@@ -34,7 +34,7 @@ public:
34 34
35 /** 35 /**
36 * Sets the desired output device. 36 * Sets the desired output device.
37 * @paran device_id Id of the desired device. 37 * @param device_id ID of the desired device.
38 */ 38 */
39 virtual void SetDevice(int device_id) = 0; 39 virtual void SetDevice(int device_id) = 0;
40 40
diff --git a/src/audio_core/time_stretch.h b/src/audio_core/time_stretch.h
index e3e4dc353..c98b16705 100644
--- a/src/audio_core/time_stretch.h
+++ b/src/audio_core/time_stretch.h
@@ -25,7 +25,7 @@ public:
25 /** 25 /**
26 * Add samples to be processed. 26 * Add samples to be processed.
27 * @param sample_buffer Buffer of samples in interleaved stereo PCM16 format. 27 * @param sample_buffer Buffer of samples in interleaved stereo PCM16 format.
28 * @param num_sample Number of samples. 28 * @param num_samples Number of samples.
29 */ 29 */
30 void AddSamples(const s16* sample_buffer, size_t num_samples); 30 void AddSamples(const s16* sample_buffer, size_t num_samples);
31 31
diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h
index a15f06c5f..3c11b6dd1 100644
--- a/src/citra_qt/game_list_p.h
+++ b/src/citra_qt/game_list_p.h
@@ -16,8 +16,8 @@
16#include "video_core/utils.h" 16#include "video_core/utils.h"
17 17
18/** 18/**
19 * Gets game icon from SMDH 19 * Gets the game icon from SMDH data.
20 * @param sdmh SMDH data 20 * @param smdh SMDH data
21 * @param large If true, returns large icon (48x48), otherwise returns small icon (24x24) 21 * @param large If true, returns large icon (48x48), otherwise returns small icon (24x24)
22 * @return QPixmap game icon 22 * @return QPixmap game icon
23 */ 23 */
@@ -42,8 +42,8 @@ static QPixmap GetDefaultIcon(bool large) {
42} 42}
43 43
44/** 44/**
45 * Gets the short game title fromn SMDH 45 * Gets the short game title from SMDH data.
46 * @param sdmh SMDH data 46 * @param smdh SMDH data
47 * @param language title language 47 * @param language title language
48 * @return QString short title 48 * @return QString short title
49 */ 49 */
diff --git a/src/citra_qt/hotkeys.h b/src/citra_qt/hotkeys.h
index 46f48c2d8..a4ccc193b 100644
--- a/src/citra_qt/hotkeys.h
+++ b/src/citra_qt/hotkeys.h
@@ -29,6 +29,8 @@ void RegisterHotkey(const QString& group, const QString& action,
29/** 29/**
30 * Returns a QShortcut object whose activated() signal can be connected to other QObjects' slots. 30 * Returns a QShortcut object whose activated() signal can be connected to other QObjects' slots.
31 * 31 *
32 * @param group General group this hotkey belongs to (e.g. "Main Window", "Debugger").
33 * @param action Name of the action (e.g. "Start Emulation", "Load Image").
32 * @param widget Parent widget of the returned QShortcut. 34 * @param widget Parent widget of the returned QShortcut.
33 * @warning If multiple QWidgets' call this function for the same action, the returned QShortcut 35 * @warning If multiple QWidgets' call this function for the same action, the returned QShortcut
34 * will be the same. Thus, you shouldn't rely on the caller really being the QShortcut's parent. 36 * will be the same. Thus, you shouldn't rely on the caller really being the QShortcut's parent.
diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h
index 6a3431e94..f705ade1c 100644
--- a/src/core/file_sys/archive_extsavedata.h
+++ b/src/core/file_sys/archive_extsavedata.h
@@ -52,7 +52,7 @@ private:
52 52
53 /** 53 /**
54 * This holds the full directory path for this archive, it is only set after a successful call 54 * This holds the full directory path for this archive, it is only set after a successful call
55 * to Open, this is formed as <base extsavedatapath>/<type>/<high>/<low>. 55 * to Open, this is formed as `<base extsavedatapath>/<type>/<high>/<low>`.
56 * See GetExtSaveDataPath for the code that extracts this data from an archive path. 56 * See GetExtSaveDataPath for the code that extracts this data from an archive path.
57 */ 57 */
58 std::string mount_point; 58 std::string mount_point;
diff --git a/src/core/frontend/camera/factory.h b/src/core/frontend/camera/factory.h
index d68be16e5..f46413fa7 100644
--- a/src/core/frontend/camera/factory.h
+++ b/src/core/frontend/camera/factory.h
@@ -16,8 +16,8 @@ public:
16 16
17 /** 17 /**
18 * Creates a camera object based on the configuration string. 18 * Creates a camera object based on the configuration string.
19 * @params config Configuration string to create the camera. The implementation can decide the 19 * @param config Configuration string to create the camera. The implementation can decide the
20 * meaning of this string. 20 * meaning of this string.
21 * @returns a unique_ptr to the created camera object. 21 * @returns a unique_ptr to the created camera object.
22 */ 22 */
23 virtual std::unique_ptr<CameraInterface> Create(const std::string& config) const = 0; 23 virtual std::unique_ptr<CameraInterface> Create(const std::string& config) const = 0;
diff --git a/src/core/gdbstub/gdbstub.cpp b/src/core/gdbstub/gdbstub.cpp
index 5cf45ada5..123fe7cd4 100644
--- a/src/core/gdbstub/gdbstub.cpp
+++ b/src/core/gdbstub/gdbstub.cpp
@@ -230,6 +230,7 @@ static void GdbHexToMem(u8* dest, const u8* src, size_t len) {
230 * Convert a u32 into a gdb-formatted hex string. 230 * Convert a u32 into a gdb-formatted hex string.
231 * 231 *
232 * @param dest Pointer to buffer to store output hex string characters. 232 * @param dest Pointer to buffer to store output hex string characters.
233 * @param v Value to convert.
233 */ 234 */
234static void IntToGdbHex(u8* dest, u32 v) { 235static void IntToGdbHex(u8* dest, u32 v) {
235 for (int i = 0; i < 8; i += 2) { 236 for (int i = 0; i < 8; i += 2) {
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index bbaae8b79..cd9a5863d 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -72,8 +72,8 @@ union Header {
72 * through modifications and checks by the kernel. 72 * through modifications and checks by the kernel.
73 * The translate parameters are described by headers generated with the IPC::*Desc functions. 73 * The translate parameters are described by headers generated with the IPC::*Desc functions.
74 * 74 *
75 * @note While #normal_params_size is equivalent to the number of normal parameters, 75 * @note While @p normal_params_size is equivalent to the number of normal parameters,
76 * #translate_params_size includes the size occupied by the translate parameters headers. 76 * @p translate_params_size includes the size occupied by the translate parameters headers.
77 */ 77 */
78inline u32 MakeHeader(u16 command_id, unsigned int normal_params_size, 78inline u32 MakeHeader(u16 command_id, unsigned int normal_params_size,
79 unsigned int translate_params_size) { 79 unsigned int translate_params_size) {
diff --git a/src/core/hle/kernel/server_session.h b/src/core/hle/kernel/server_session.h
index 4ffe97b78..761fc4781 100644
--- a/src/core/hle/kernel/server_session.h
+++ b/src/core/hle/kernel/server_session.h
@@ -45,7 +45,8 @@ public:
45 45
46 /** 46 /**
47 * Creates a pair of ServerSession and an associated ClientSession. 47 * Creates a pair of ServerSession and an associated ClientSession.
48 * @param name Optional name of the ports 48 * @param name Optional name of the ports.
49 * @param hle_handler Optional HLE handler for this server session.
49 * @return The created session tuple 50 * @return The created session tuple
50 */ 51 */
51 static SessionPair CreateSessionPair( 52 static SessionPair CreateSessionPair(
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h
index f6bff8bc6..34a9c8479 100644
--- a/src/core/hle/service/cam/cam.h
+++ b/src/core/hle/service/cam/cam.h
@@ -518,7 +518,7 @@ void FlipImage(Service::Interface* self);
518void SetDetailSize(Service::Interface* self); 518void SetDetailSize(Service::Interface* self);
519 519
520/** 520/**
521 * Sets camera resolution from preset resolution parameters. . 521 * Sets camera resolution from preset resolution parameters.
522 * Inputs: 522 * Inputs:
523 * 0: 0x001F00C0 523 * 0: 0x001F00C0
524 * 1: u8 selected camera 524 * 1: u8 selected camera
diff --git a/src/core/hle/service/gsp_gpu.cpp b/src/core/hle/service/gsp_gpu.cpp
index 097ed87e4..a960778a7 100644
--- a/src/core/hle/service/gsp_gpu.cpp
+++ b/src/core/hle/service/gsp_gpu.cpp
@@ -119,10 +119,10 @@ static ResultCode WriteHWRegs(u32 base_address, u32 size_in_bytes, VAddr data_va
119 * Updates sequential GSP GPU hardware registers using parallel arrays of source data and masks. 119 * Updates sequential GSP GPU hardware registers using parallel arrays of source data and masks.
120 * For each register, the value is updated only where the mask is high 120 * For each register, the value is updated only where the mask is high
121 * 121 *
122 * @param base_address The address of the first register in the sequence 122 * @param base_address The address of the first register in the sequence
123 * @param size_in_bytes The number of registers to update (size of data) 123 * @param size_in_bytes The number of registers to update (size of data)
124 * @param data A pointer to the source data to use for updates 124 * @param data_vaddr A virtual address to the source data to use for updates
125 * @param masks A pointer to the masks 125 * @param masks_vaddr A virtual address to the masks
126 * @return RESULT_SUCCESS if the parameters are valid, error code otherwise 126 * @return RESULT_SUCCESS if the parameters are valid, error code otherwise
127 */ 127 */
128static ResultCode WriteHWRegsWithMask(u32 base_address, u32 size_in_bytes, VAddr data_vaddr, 128static ResultCode WriteHWRegsWithMask(u32 base_address, u32 size_in_bytes, VAddr data_vaddr,
diff --git a/src/core/hle/service/ldr_ro/cro_helper.h b/src/core/hle/service/ldr_ro/cro_helper.h
index 060d5a55f..3bc10dbdc 100644
--- a/src/core/hle/service/ldr_ro/cro_helper.h
+++ b/src/core/hle/service/ldr_ro/cro_helper.h
@@ -57,7 +57,7 @@ public:
57 * @param is_crs true if the module itself is the static module 57 * @param is_crs true if the module itself is the static module
58 * @returns ResultCode RESULT_SUCCESS on success, otherwise error code. 58 * @returns ResultCode RESULT_SUCCESS on success, otherwise error code.
59 */ 59 */
60 ResultCode Rebase(VAddr crs_address, u32 cro_size, VAddr data_segment_addresss, 60 ResultCode Rebase(VAddr crs_address, u32 cro_size, VAddr data_segment_address,
61 u32 data_segment_size, VAddr bss_segment_address, u32 bss_segment_size, 61 u32 data_segment_size, VAddr bss_segment_address, u32 bss_segment_size,
62 bool is_crs); 62 bool is_crs);
63 63
@@ -102,7 +102,7 @@ public:
102 /** 102 /**
103 * Registers this module and adds it to the module list. 103 * Registers this module and adds it to the module list.
104 * @param crs_address the virtual address of the static module 104 * @param crs_address the virtual address of the static module
105 * @auto_link whether to register as an auto link module 105 * @param auto_link whether to register as an auto link module
106 */ 106 */
107 void Register(VAddr crs_address, bool auto_link); 107 void Register(VAddr crs_address, bool auto_link);
108 108
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index a6c2a745f..1d80766ae 100644
--- a/src/core/loader/loader.h
+++ b/src/core/loader/loader.h
@@ -54,7 +54,7 @@ FileType IdentifyFile(const std::string& file_name);
54 * @return FileType of file. Note: this will return FileType::Unknown if it is unable to determine 54 * @return FileType of file. Note: this will return FileType::Unknown if it is unable to determine
55 * a filetype, and will never return FileType::Error. 55 * a filetype, and will never return FileType::Error.
56 */ 56 */
57FileType GuessFromExtension(const std::string& extension_); 57FileType GuessFromExtension(const std::string& extension);
58 58
59/** 59/**
60 * Convert a FileType into a string which can be displayed to the user. 60 * Convert a FileType into a string which can be displayed to the user.
diff --git a/src/video_core/debug_utils/debug_utils.h b/src/video_core/debug_utils/debug_utils.h
index 89e418e27..c1f29c527 100644
--- a/src/video_core/debug_utils/debug_utils.h
+++ b/src/video_core/debug_utils/debug_utils.h
@@ -87,7 +87,7 @@ public:
87 * @param data Optional data pointer (if unused, this is a nullptr) 87 * @param data Optional data pointer (if unused, this is a nullptr)
88 * @note This function will perform nothing unless it is overridden in the child class. 88 * @note This function will perform nothing unless it is overridden in the child class.
89 */ 89 */
90 virtual void OnPicaBreakPointHit(Event, void*) {} 90 virtual void OnPicaBreakPointHit(Event event, void* data) {}
91 91
92 /** 92 /**
93 * Action to perform when emulation is resumed from a breakpoint. 93 * Action to perform when emulation is resumed from a breakpoint.
diff --git a/src/video_core/shader/shader_interpreter.h b/src/video_core/shader/shader_interpreter.h
index 5682b3a39..50fd7c69d 100644
--- a/src/video_core/shader/shader_interpreter.h
+++ b/src/video_core/shader/shader_interpreter.h
@@ -18,7 +18,8 @@ public:
18 18
19 /** 19 /**
20 * Produce debug information based on the given shader and input vertex 20 * Produce debug information based on the given shader and input vertex
21 * @param input Input vertex into the shader 21 * @param setup Shader engine state
22 * @param input Input vertex into the shader
22 * @param config Configuration object for the shader pipeline 23 * @param config Configuration object for the shader pipeline
23 * @return Debug information for this shader with regards to the given vertex 24 * @return Debug information for this shader with regards to the given vertex
24 */ 25 */
diff --git a/src/video_core/shader/shader_jit_x64_compiler.h b/src/video_core/shader/shader_jit_x64_compiler.h
index 599e43ffd..f27675560 100644
--- a/src/video_core/shader/shader_jit_x64_compiler.h
+++ b/src/video_core/shader/shader_jit_x64_compiler.h
@@ -93,7 +93,8 @@ private:
93 93
94 /** 94 /**
95 * Assertion evaluated at compile-time, but only triggered if executed at runtime. 95 * Assertion evaluated at compile-time, but only triggered if executed at runtime.
96 * @param msg Message to be logged if the assertion fails. 96 * @param condition Condition to be evaluated.
97 * @param msg Message to be logged if the assertion fails.
97 */ 98 */
98 void Compile_Assert(bool condition, const char* msg); 99 void Compile_Assert(bool condition, const char* msg);
99 100