Skip to content

Commit 2ae9981

Browse files
committed
Merge branch 'platform-doxy-typo-fix' of https://github.com/kegilbert/mbed-os into dev_rollup
2 parents 4cbcd64 + 766359c commit 2ae9981

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

platform/CallChain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class CallChain : private NonCopyable<CallChain> {
147147
* @param method pointer to the member function to be called
148148
*
149149
* @returns
150-
* The function object created for 'tptr' and 'mptr'
150+
* The function object created for the object and method pointers
151151
*
152152
* @deprecated
153153
* The add_front function does not support cv-qualifiers. Replaced by

platform/SharedPtr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ namespace mbed {
2929
/** Shared pointer class.
3030
*
3131
* A shared pointer is a "smart" pointer that retains ownership of an object using
32-
* reference counting accross all smart pointers referencing that object.
32+
* reference counting across all smart pointers referencing that object.
3333
*
3434
* @code
3535
* #include "platform/SharedPtr.h"

platform/mbed_error.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -86,24 +86,24 @@ extern "C" {
8686
\endverbatim
8787
*
8888
* The error status value range for each error type is as follows:\n
89-
* Posix Error Status-es - 0xFFFFFFFF to 0xFFFFFF01(-1 -255) - This corresponds to Posix error codes represented as negative.\n
89+
* POSIX Error Status-es - 0xFFFFFFFF to 0xFFFFFF01(-1 -255) - This corresponds to POSIX error codes represented as negative.\n
9090
* System Error Status-es - 0x80XX0100 to 0x80XX0FFF - This corresponds to System error codes range(all values are negative). Bits 23-16 will be module type(marked with XX)\n
9191
* Custom Error Status-es - 0xA0XX1000 to 0xA0XXFFFF - This corresponds to Custom error codes range(all values are negative). Bits 23-16 will be module type(marked with XX)\n\n
9292
*
9393
* The ERROR CODE(values encoded into ERROR CODE bit-field in mbed_error_status_t) value range for each error type is also separated as below:\n
94-
* Posix Error Codes - 1 to 255.\n
94+
* POSIX Error Codes - 1 to 255.\n
9595
* System Error Codes - 256 to 4095.\n
9696
* Custom Error Codes - 4096 to 65535.\n
9797
*
98-
* @note Posix error codes are always encoded as negative of their actual value. For example, EPERM is encoded as -EPERM.
99-
* And, the MODULE TYPE for Posix error codes are always encoded as MBED_MODULE_UNKNOWN.\n
100-
* This is to enable easy injection of Posix error codes into MbedOS error handling system without altering the actual Posix error values.\n
101-
* Accordingly, Posix error codes are represented as -1 to -255 under MbedOS error status representation.
98+
* @note POSIX error codes are always encoded as negative of their actual value. For example, EPERM is encoded as -EPERM.
99+
* And, the MODULE TYPE for POSIX error codes are always encoded as MBED_MODULE_UNKNOWN.\n
100+
* This is to enable easy injection of POSIX error codes into MbedOS error handling system without altering the actual POSIX error values.\n
101+
* Accordingly, POSIX error codes are represented as -1 to -255 under MbedOS error status representation.
102102
*/
103103
typedef int mbed_error_status_t;
104104

105105
/**
106-
* Macro for defining a Posix error status. This macro is mainly used to define Posix error values in mbed_error_code_t enumeration.
106+
* Macro for defining a POSIX error status. This macro is mainly used to define POSIX error values in mbed_error_code_t enumeration.
107107
* @param error_name Name of the error without the ERROR_ prefix
108108
* @param error_code Error code value to be used, must be between 1 and 255(inclusive).
109109
*
@@ -201,7 +201,7 @@ typedef int mbed_error_status_t;
201201
* See mbed_error_status_t description for more info.\n
202202
* MBED_ERROR_TYPE_SYSTEM - Used to indicate that the error status is of System defined Error type.\n
203203
* MBED_ERROR_TYPE_CUSTOM - Used to indicate that the error status is of Custom defined Error type.\n
204-
* MBED_ERROR_TYPE_POSIX - Used to indicate that the error status is of Posix error type.\n
204+
* MBED_ERROR_TYPE_POSIX - Used to indicate that the error status is of POSIX error type.\n
205205
*
206206
*/
207207
typedef enum _mbed_error_type_t {
@@ -301,23 +301,23 @@ typedef enum _mbed_module_type {
301301
/** mbed_error_code_t definition
302302
*
303303
* mbed_error_code_t enumeration defines the Error codes and Error status values for MBED_MODULE_UNKNOWN.\n
304-
* It defines all of Posix Error Codes/Statuses and Mbed System Error Codes/Statuses.\n\n
304+
* It defines all of POSIX Error Codes/Statuses and Mbed System Error Codes/Statuses.\n\n
305305
*
306306
* @note
307-
* Posix Error codes are defined using the macro MBED_DEFINE_POSIX_ERROR\n
307+
* POSIX Error codes are defined using the macro MBED_DEFINE_POSIX_ERROR\n
308308
* For example MBED_DEFINE_POSIX_ERROR( EPERM, EPERM ). This effectively defines the following values:\n
309309
* ERROR_CODE_EPERM = EPERM\n
310310
* ERROR_EPERM = -EPERM\n
311311
*
312-
* Posix Error codes are defined using the macro MBED_DEFINE_POSIX_ERROR\n
312+
* POSIX Error codes are defined using the macro MBED_DEFINE_POSIX_ERROR\n
313313
* For example MBED_DEFINE_POSIX_ERROR( EPERM, EPERM ). This macro defines the following values:\n
314314
* ERROR_CODE_EPERM = MBED_POSIX_ERROR_BASE+EPERM\n
315315
* ERROR_EPERM = -(MBED_POSIX_ERROR_BASE+EPERM)\n
316316
* Its effectively equivalent to:\n
317317
* ERROR_CODE_EPERM = 1\n
318318
* ERROR_EPERM = -1\n
319-
* All Posix error codes currently supported by MbedOS(defined in mbed_retarget.h) are defined using the MBED_DEFINE_POSIX_ERROR macro.\n\n
320-
* Below are the Posic error codes and the description:\n
319+
* All POSIX error codes currently supported by MbedOS(defined in mbed_retarget.h) are defined using the MBED_DEFINE_POSIX_ERROR macro.\n\n
320+
* Below are the POSIX error codes and the description:\n
321321
* \verbatim
322322
EPERM 1 Operation not permitted
323323
ENOENT 2 No such file or directory
@@ -546,9 +546,9 @@ typedef enum _mbed_module_type {
546546
*
547547
* @note
548548
* **Using error codes:** \n
549-
* Posix error codes may be used in modules/functions currently using Posix error codes and switching them to Mbed-OS error codes
549+
* POSIX error codes may be used in modules/functions currently using POSIX error codes and switching them to Mbed-OS error codes
550550
* may cause interoperability issues. For example, some of the filesystem, network stack implementations may need to use
551-
* Posix error codes in order to keep them compatible with other modules interfacing with them, and may continue to use Posix error codes.
551+
* POSIX error codes in order to keep them compatible with other modules interfacing with them, and may continue to use POSIX error codes.
552552
*
553553
* In all other cases, like for any native development of Mbed-OS modules Mbed-OS error codes should be used.
554554
* This makes it easy to use Mbed-OS error reporting/logging infrastructure and makes debugging error scenarios
@@ -576,7 +576,7 @@ typedef enum _mbed_module_type {
576576

577577
typedef enum _mbed_error_code {
578578
//Below are POSIX ERROR CODE definitions, which starts at MBED_POSIX_ERROR_BASE(=0)
579-
//POSIX ERROR CODE definitions starts at offset 0(MBED_POSIX_ERROR_BASE) to align them with actual Posix Error Code
579+
//POSIX ERROR CODE definitions starts at offset 0(MBED_POSIX_ERROR_BASE) to align them with actual POSIX Error Code
580580
//defintions in mbed_retarget.h
581581
// Error Name Error Code
582582
MBED_DEFINE_POSIX_ERROR(EPERM, EPERM), /* 1 Operation not permitted */

platform/mbed_mem_trace.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,13 @@ void mbed_mem_trace_set_callback(mbed_mem_trace_cb_t cb);
8080
void mbed_mem_trace_disable();
8181

8282
/**
83-
* Renable the memory trace output with the cb in use when disable was called
83+
* Re-enable the memory trace output with the cb in use when disable was called
8484
*/
8585
void mbed_mem_trace_enable();
8686

8787
/**
8888
* Trace lock.
89-
* @note Locking prevent recursive tracing of malloc/free inside relloc/calloc
89+
* @note Locking prevent recursive tracing of malloc/free inside realloc/calloc
9090
*/
9191
void mbed_mem_trace_lock();
9292

@@ -141,7 +141,7 @@ void mbed_mem_trace_free(void *ptr, void *caller);
141141
*
142142
* @param op identifies the memory operation ('m' for 'malloc', 'r' for 'realloc',
143143
* 'c' for 'calloc' and 'f' for 'free').
144-
* @param res (base 16) is the result of the memor operation. This is always NULL
144+
* @param res (base 16) is the result of the memory operation. This is always NULL
145145
* for 'free', since 'free' doesn't return anything.
146146
* @param caller (base 16) is the caller of the memory operation. Note that the value
147147
* of 'caller' might be unreliable.

platform/mbed_stats.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ typedef struct {
6565
uint32_t thread_id; /**< Identifier for the thread that owns the stack or 0 if representing accumulated statistics */
6666
uint32_t max_size; /**< Maximum number of bytes used on the stack since the thread was started */
6767
uint32_t reserved_size; /**< Current number of bytes reserved for the stack */
68-
uint32_t stack_cnt; /**< The number of stacks represented in the accumulated statistics or 1 if repesenting a single stack */
68+
uint32_t stack_cnt; /**< The number of stacks represented in the accumulated statistics or 1 if representing a single stack */
6969
} mbed_stats_stack_t;
7070

7171
/**

platform/mbed_toolchain.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,8 @@
237237

238238
/** MBED_UNREACHABLE
239239
* An unreachable statement. If the statement is reached,
240-
* behaviour is undefined. Useful in situations where the compiler
241-
* cannot deduce the unreachability of code.
240+
* behavior is undefined. Useful in situations where the compiler
241+
* cannot deduce if the code is unreachable.
242242
*
243243
* @code
244244
* #include "mbed_toolchain.h"

0 commit comments

Comments
 (0)