Skip to content

Commit 8e76bf6

Browse files
authored
Merge pull request #4508 from kegilbert/kg-doxygen-framework-hal-rtos
Doxygen combined HAL, RTOS, and features/Framework updates to not produce warnings and errors [DOC Changes Only]
2 parents 52fde55 + 090e63f commit 8e76bf6

File tree

11 files changed

+35
-27
lines changed

11 files changed

+35
-27
lines changed

doxyfile_options

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,14 +840,12 @@ EXCLUDE_PATTERNS = */tools/* \
840840
*/TESTS/* \
841841
*/targets/* \
842842
*/BUILD/* \
843-
*/rtos/* \
843+
*/rtos/rtx* \
844844
*/cmsis/* \
845-
*/hal/* \
846845
*/FEATURE_* \
847846
*/features/mbedtls/* \
848847
*/features/storage/* \
849848
*/features/unsupported/* \
850-
*/features/frameworks/* \
851849
*/features/filesystem/* \
852850

853851
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names

doxygen_options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"PREDEFINED": "DOXYGEN_ONLY \"MBED_DEPRECATED_SINCE(f, g)=\" \"MBED_ENABLE_IF_CALLBACK_COMPATIBLE(F, M)=\"",
99
"EXPAND_AS_DEFINED": "",
1010
"SKIP_FUNCTION_MACROS": "NO",
11-
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/frameworks/* */features/filesystem/* */BUILD/* */rtos/* */cmsis/* */hal/* */features/FEATURES_*"
11+
"EXCLUDE_PATTERNS": "*/tools/* */TESTS/* */targets/* */FEATURE_*/* */features/mbedtls/* */features/storage/* */features/unsupported/* */features/filesystem/* */BUILD/* */rtos/rtx*/* */cmsis/* */features/FEATURES_*"
1212
}

features/frameworks/utest/utest/utest_case.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace v1 {
3636
*
3737
* @warning Initialization of handlers with either default_handler or
3838
* ignore_handler helpers will prevent the object to be a POD. Prefer usage
39-
* of NULL in favor of ignore_handler or <handler_type>(1) for default
39+
* of NULL in favor of ignore_handler or \verbatim <handler_type>(1) \endverbatim for default
4040
* handler.
4141
*
4242
* @see Case.

features/frameworks/utest/utest/utest_default_handlers.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ namespace v1 {
3838
*/
3939
static const struct
4040
{
41+
///@cond IGNORE
42+
// Doxygen can't parse these implicit conversion operators properly, remove from
43+
// doc build
4144
operator test_setup_handler_t() const { return test_setup_handler_t(1); }
4245
operator test_teardown_handler_t() const { return test_teardown_handler_t(1); }
4346
operator test_failure_handler_t() const { return test_failure_handler_t(1); }
4447

4548
operator case_setup_handler_t() const { return case_setup_handler_t(1); }
4649
operator case_teardown_handler_t() const { return case_teardown_handler_t(1); }
4750
operator case_failure_handler_t() const { return case_failure_handler_t(1); }
51+
///@endcond
4852
} default_handler;
4953

5054
/** Ignore handler hint.
@@ -55,6 +59,9 @@ namespace v1 {
5559
*/
5660
static const struct
5761
{
62+
///@cond IGNORE
63+
// Doxygen can't parse these implicit conversion operators properly, remove from
64+
// doc build
5865
operator case_handler_t() const { return case_handler_t(NULL); }
5966
operator case_control_handler_t() const { return case_control_handler_t(NULL); }
6067
operator case_call_count_handler_t() const { return case_call_count_handler_t(NULL); }
@@ -66,6 +73,7 @@ namespace v1 {
6673
operator case_setup_handler_t() const { return case_setup_handler_t(NULL); }
6774
operator case_teardown_handler_t() const { return case_teardown_handler_t(NULL); }
6875
operator case_failure_handler_t() const { return case_failure_handler_t(NULL); }
76+
///@endcond
6977
} ignore_handler;
7078

7179
/** A table of handlers.

features/frameworks/utest/utest/utest_types.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ namespace utest {
3030
/** @{*/
3131
namespace v1 {
3232

33+
/// repeat_t
3334
enum repeat_t {
3435
REPEAT_UNDECLR = 0,
3536
REPEAT_NONE = 1, ///< continue with the next test case
@@ -47,12 +48,14 @@ namespace v1 {
4748
REPEAT_HANDLER = REPEAT_CASE_ONLY | REPEAT_ON_VALIDATE ///< repeat only the handler
4849
};
4950

51+
/// status_t
5052
enum status_t {
5153
STATUS_CONTINUE = -1, ///< continues testing
5254
STATUS_IGNORE = -2, ///< ignores failure and continues testing
5355
STATUS_ABORT = -3 ///< stops testing
5456
};
5557

58+
/// failure_reason_t
5659
enum failure_reason_t {
5760
REASON_NONE = 0, ///< No failure occurred
5861

@@ -74,6 +77,7 @@ namespace v1 {
7477
REASON_IGNORE = 0x8000 ///< The failure may be ignored
7578
};
7679

80+
/// location_t
7781
enum location_t {
7882
LOCATION_NONE = 0, ///< No location information
7983
LOCATION_TEST_SETUP, ///< A failure occurred in the test setup

hal/gpio_api.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,38 +83,38 @@ int gpio_read(gpio_t *obj);
8383

8484
/** Init the input pin and set mode to PullDefault
8585
*
86-
* @param obj The GPIO object
87-
* @param pin The pin name
86+
* @param gpio The GPIO object
87+
* @param pin The pin name
8888
*/
8989
void gpio_init_in(gpio_t* gpio, PinName pin);
9090

9191
/** Init the input pin and set the mode
9292
*
93-
* @param obj The GPIO object
94-
* @param pin The pin name
95-
* @param mode The pin mode to be set
93+
* @param gpio The GPIO object
94+
* @param pin The pin name
95+
* @param mode The pin mode to be set
9696
*/
9797
void gpio_init_in_ex(gpio_t* gpio, PinName pin, PinMode mode);
9898

9999
/** Init the output pin as an output, with predefined output value 0
100100
*
101-
* @param obj The GPIO object
102-
* @param pin The pin name
103-
* @return An integer value 1 or 0
101+
* @param gpio The GPIO object
102+
* @param pin The pin name
103+
* @return An integer value 1 or 0
104104
*/
105105
void gpio_init_out(gpio_t* gpio, PinName pin);
106106

107107
/** Init the pin as an output and set the output value
108108
*
109-
* @param obj The GPIO object
109+
* @param gpio The GPIO object
110110
* @param pin The pin name
111111
* @param value The value to be set
112112
*/
113113
void gpio_init_out_ex(gpio_t* gpio, PinName pin, int value);
114114

115115
/** Init the pin to be in/out
116116
*
117-
* @param obj The GPIO object
117+
* @param gpio The GPIO object
118118
* @param pin The pin name
119119
* @param direction The pin direction to be set
120120
* @param mode The pin mode to be set

hal/storage_abstraction/Driver_Storage.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,9 @@ typedef struct _ARM_DRIVER_STORAGE {
615615
*
616616
* This optional function erases the complete device. If the device does not
617617
* support global erase then the function returns the error value \ref
618-
* ARM_DRIVER_ERROR_UNSUPPORTED. The data field \em 'erase_all' =
619-
* \token{1} of the structure \ref ARM_STORAGE_CAPABILITIES encodes that
620-
* \ref ARM_STORAGE_EraseAll is supported.
618+
* ARM_DRIVER_ERROR_UNSUPPORTED. The data field \em 'erase_all' = 1
619+
* of the structure \ref ARM_STORAGE_CAPABILITIES encodes that
620+
* ARM_STORAGE_EraseAll is supported.
621621
*
622622
* @note This API may execute asynchronously if
623623
* ARM_STORAGE_CAPABILITIES::asynchronous_ops is set. Asynchronous

hal/ticker_api.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,8 @@ us_timestamp_t ticker_read_us(const ticker_data_t *const ticker);
163163

164164
/** Read the next event's timestamp
165165
*
166-
* @param ticker The ticker object.
166+
* @param ticker The ticker object.
167+
* @param timestamp The timestamp object.
167168
* @return 1 if timestamp is pending event, 0 if there's no event pending
168169
*/
169170
int ticker_get_next_timestamp(const ticker_data_t *const ticker, timestamp_t *timestamp);

rtos/MemoryPool.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ class MemoryPool {
7676
}
7777

7878
/** Free a memory block.
79-
@param address of the allocated memory block to be freed.
80-
@return status code that indicates the execution status of the function.
79+
@param block address of the allocated memory block to be freed.
80+
@return status code that indicates the execution status of the function.
8181
*/
8282
osStatus free(T *block) {
8383
return osMemoryPoolFree(_id, (void*)block);

rtos/Semaphore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace rtos {
4040
class Semaphore {
4141
public:
4242
/** Create and Initialize a Semaphore object used for managing resources.
43-
@param number of available resources; maximum index value is (count-1). (default: 0).
43+
@param count number of available resources; maximum index value is (count-1). (default: 0).
4444
*/
4545
Semaphore(int32_t count=0);
4646

rtos/Thread.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ class Thread {
8585

8686
/** Create a new thread, and start it executing the specified function.
8787
@param task function to be executed by this thread.
88-
@param argument pointer that is passed to the thread function as start argument. (default: NULL).
8988
@param priority initial priority of the thread function. (default: osPriorityNormal).
9089
@param stack_size stack size (in bytes) requirements for the thread function. (default: OS_STACK_SIZE).
9190
@param stack_mem pointer to the stack area to be used by this thread (default: NULL).
@@ -112,9 +111,8 @@ class Thread {
112111
}
113112

114113
/** Create a new thread, and start it executing the specified function.
115-
@param obj argument to task.
116-
@param method function to be executed by this thread.
117114
@param argument pointer that is passed to the thread function as start argument. (default: NULL).
115+
@param task argument to task.
118116
@param priority initial priority of the thread function. (default: osPriorityNormal).
119117
@param stack_size stack size (in bytes) requirements for the thread function. (default: OS_STACK_SIZE).
120118
@param stack_mem pointer to the stack area to be used by this thread (default: NULL).
@@ -143,9 +141,8 @@ class Thread {
143141
}
144142

145143
/** Create a new thread, and start it executing the specified function.
146-
@param obj argument to task.
147-
@param method function to be executed by this thread.
148144
@param argument pointer that is passed to the thread function as start argument. (default: NULL).
145+
@param task argument to task.
149146
@param priority initial priority of the thread function. (default: osPriorityNormal).
150147
@param stack_size stack size (in bytes) requirements for the thread function. (default: OS_STACK_SIZE).
151148
@param stack_mem pointer to the stack area to be used by this thread (default: NULL).

0 commit comments

Comments
 (0)