Skip to content

Commit 27c0aff

Browse files
authored
Merge pull request #8578 from cmonr/rollup
Rollup PR: Samll docs changes
2 parents 5ed07c2 + 8b58ed7 commit 27c0aff

File tree

15 files changed

+46
-46
lines changed

15 files changed

+46
-46
lines changed

drivers/PwmOut.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ class PwmOut {
219219

220220
pwmout_t _pwm;
221221
bool _deep_sleep_locked;
222-
};
223222
#endif
223+
};
224224

225225
} // namespace mbed
226226

features/netsocket/CellularBase.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class CellularBase: public NetworkInterface {
2727
/** Get the default cellular interface.
2828
*
2929
* This is provided as a weak method so applications can override.
30-
* Default behaviour is to get the target's default interface, if
30+
* Default behavior is to get the target's default interface, if
3131
* any.
3232
*
3333
* @return pointer to interface, if any.
@@ -36,7 +36,7 @@ class CellularBase: public NetworkInterface {
3636

3737
/** Set the cellular network credentials.
3838
*
39-
* Please check documentation of connect() for default behaviour of APN settings.
39+
* Please check documentation of connect() for default behavior of APN settings.
4040
*
4141
* @param apn Access point name.
4242
* @param uname Username (optional).

features/netsocket/EMAC.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
/**
2828
* This interface should be used to abstract low level access to networking hardware
29-
* All operations receive a `void *` hw pointer which an emac device provides when
29+
* All operations receive a `void *` hardware pointer which an EMAC device provides when
3030
* it is registered with a stack.
3131
*/
3232
class EMAC {
@@ -40,15 +40,15 @@ class EMAC {
4040
static EMAC &get_default_instance();
4141

4242
/**
43-
* Callback to be register with Emac interface and to be called for received packets
43+
* Callback to be register with EMAC interface and to be called for received packets
4444
*
4545
* @param buf Received data
4646
*/
4747
//typedef void (*emac_link_input_fn)(void *data, emac_mem_buf_t *buf);
4848
typedef mbed::Callback<void (emac_mem_buf_t *buf)> emac_link_input_cb_t;
4949

5050
/**
51-
* Callback to be register with Emac interface and to be called for link status changes
51+
* Callback to be register with EMAC interface and to be called for link status changes
5252
*
5353
* @param up Link status
5454
*/
@@ -65,7 +65,7 @@ class EMAC {
6565
/**
6666
* Gets memory buffer alignment preference
6767
*
68-
* Gets preferred memory buffer alignment of the Emac device. IP stack may or may not
68+
* Gets preferred memory buffer alignment of the EMAC device. IP stack may or may not
6969
* align link out memory buffer chains using the alignment.
7070
*
7171
* @return Memory alignment requirement in bytes
@@ -107,7 +107,7 @@ class EMAC {
107107
* Provided address has to be of correct size, see @a get_hwaddr_size
108108
*
109109
* Called to set the MAC address to actually use - if @a get_hwaddr is provided
110-
* the stack would normally use that, but it could be overridden, eg for test
110+
* the stack would normally use that, but it could be overridden, for example for test
111111
* purposes.
112112
*
113113
* @param addr Address to be set
@@ -179,7 +179,7 @@ class EMAC {
179179

180180

181181
/** These need to be defined by targets wishing to provide an Ethernet driver using EMAC interface. It will
182-
* be used by the EMACInterface class's default constructor to initialise the networking subsystem.
182+
* be used by the EMACInterface class's default constructor to initialize the networking subsystem.
183183
*/
184184
//extern const emac_interface_ops_t mbed_emac_eth_ops_default;
185185
//extern void *mbed_emac_eth_hw_default;

features/netsocket/EMACInterface.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* Drivers derived from EMACInterface should be constructed so that their
3333
* EMAC is functional without the need to call `connect()`. For example
3434
* a Wi-Fi driver should permit `WiFi::get_emac().power_up()` as soon as
35-
* the credentials have been set. This is necessary to support specialised
35+
* the credentials have been set. This is necessary to support specialized
3636
* applications such as 6LoWPAN mesh border routers.
3737
*/
3838
class EMACInterface : public virtual NetworkInterface {
@@ -99,21 +99,21 @@ class EMACInterface : public virtual NetworkInterface {
9999
/** Get the local IP address
100100
*
101101
* @return Null-terminated representation of the local IP address
102-
* or null if no IP address has been recieved
102+
* or null if no IP address has been received
103103
*/
104104
virtual const char *get_ip_address();
105105

106106
/** Get the local network mask
107107
*
108108
* @return Null-terminated representation of the local network mask
109-
* or null if no network mask has been recieved
109+
* or null if no network mask has been received
110110
*/
111111
virtual const char *get_netmask();
112112

113113
/** Get the local gateways
114114
*
115115
* @return Null-terminated representation of the local gateway
116-
* or null if no network mask has been recieved
116+
* or null if no network mask has been received
117117
*/
118118
virtual const char *get_gateway();
119119

features/netsocket/EthInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class EthInterface : public virtual NetworkInterface {
3838
/** Get the default Ethernet interface.
3939
*
4040
* This is provided as a weak method so applications can override.
41-
* Default behaviour is to get the target's default interface, if
41+
* Default behavior is to get the target's default interface, if
4242
* any.
4343
*
4444
* @return Pointer to interface, if one exists.

features/netsocket/MeshInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class MeshInterface : public virtual NetworkInterface {
3737
/** Get the default Mesh interface.
3838
*
3939
* This is provided as a weak method so applications can override.
40-
* Default behaviour is to get the target's default interface, if
40+
* Default behavior is to get the target's default interface, if
4141
* any.
4242
*
4343
* @return pointer to interface, if any.

features/netsocket/NetworkInterface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class NetworkInterface: public DNS {
4949
* wifiInterface(), meshInterface(), cellularBase(), emacInterface() and checking
5050
* for NULL pointers.
5151
*
52-
* The default behaviour is to return the default interface for the
52+
* The default behavior is to return the default interface for the
5353
* interface type specified by target.network-default-interface-type. Targets
5454
* should set this in their targets.json to guide default selection,
5555
* and applications may override.
@@ -306,7 +306,7 @@ class NetworkInterface: public DNS {
306306
* need to override in simple cases.
307307
*
308308
* If a target has more elaborate interface selection, it can completely
309-
* override this behaviour by implementing
309+
* override this behavior by implementing
310310
* NetworkInterface::get_target_default_instance() themselves, either
311311
* unconditionally, or for a specific network-default-interface-type setting
312312
*

features/netsocket/Socket.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class Socket {
5050
* Also connectionless protocols use the connected address to filter
5151
* incoming packets for recv() and recvfrom() calls.
5252
*
53-
* To reset the peer address, zero initialised(default constructor) SocketAddress
53+
* To reset the peer address, zero initialized(default constructor) SocketAddress
5454
* object have to be in the address parameter.
5555
*
5656
* @param address The SocketAddress of the remote peer
@@ -234,9 +234,9 @@ class Socket {
234234
* The server socket must be bound and set to listen for connections.
235235
* On a new connection, returns connected network socket which user is expected to call close()
236236
* and that deallocates the resources. Referencing a returned pointer after a close()
237-
* call is not allowed and leads to undefined behaviour.
237+
* call is not allowed and leads to undefined behavior.
238238
*
239-
* By default, accept blocks until incomming connection occurs. If socket is set to
239+
* By default, accept blocks until incoming connection occurs. If socket is set to
240240
* non-blocking or times out, error is set to NSAPI_ERROR_WOULD_BLOCK.
241241
*
242242
* @param error pointer to storage of the error value or NULL

features/netsocket/TCPSocket.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ class TCPSocket : public InternetSocket {
158158
* The server socket must be bound and set to listen for connections.
159159
* On a new connection, returns connected network socket which user is expected to call close()
160160
* and that deallocates the resources. Referencing a returned pointer after a close()
161-
* call is not allowed and leads to undefined behaviour.
161+
* call is not allowed and leads to undefined behavior.
162162
*
163-
* By default, accept blocks until incomming connection occurs. If socket is set to
163+
* By default, accept blocks until incoming connection occurs. If socket is set to
164164
* non-blocking or times out, error is set to NSAPI_ERROR_WOULD_BLOCK.
165165
*
166166
* @param error pointer to storage of the error value or NULL

features/netsocket/TLSSocketWrapper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class TLSSocketWrapper : public Socket {
174174

175175
/** Initiates TLS Handshake
176176
*
177-
* Initiates a TLS hanshake to a remote speer
177+
* Initiates a TLS handshake to a remote peer
178178
* Underlying transport socket should already be connected
179179
*
180180
* Root CA certification must be set by set_ssl_ca_pem() before

features/netsocket/WiFiInterface.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class WiFiInterface: public virtual NetworkInterface {
3131
/** Get the default Wi-Fi interface.
3232
*
3333
* This is provided as a weak method so applications can override.
34-
* Default behaviour is to get the target's default interface, if
34+
* Default behavior is to get the target's default interface, if
3535
* any.
3636
*
3737
* @return pointer to interface, if any.

features/netsocket/cellular/generic_modem_driver/PPPCellularInterface.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ class PPPCellularInterface : public CellularBase {
127127
*
128128
* @deprecated This API will be deprecated in mbed-os-5.9. Use mbed-os/features/cellular/easy_cellular/EasyCellularConnection.h instead.
129129
*
130-
* Please check documentation of connect() for default behaviour of APN settings.
130+
* Please check documentation of connect() for default behavior of APN settings.
131131
*
132132
* @param apn Access point name
133133
* @param uname optionally, Username
@@ -176,7 +176,7 @@ class PPPCellularInterface : public CellularBase {
176176
* by the cellular modem over PPP interface.
177177
*
178178
* If the SIM requires a PIN, and it is not set/invalid, NSAPI_ERROR_AUTH_ERROR is returned.
179-
* For APN setup, default behaviour is to use 'internet' as APN string and assuming no authentication
179+
* For APN setup, default behavior is to use 'internet' as APN string and assuming no authentication
180180
* is required, i.e., username and password are not set. Optionally, a database lookup can be requested
181181
* by turning on the APN database lookup feature. In order to do so, add 'MBED_CONF_PPP_CELL_IFACE_APN_LOOKUP'
182182
* in your mbed_app.json. APN database is by no means exhaustive. It contains a short list of some public

features/netsocket/cellular/onboard_modem_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#ifndef ONBOARD_MODEM_API_H_
1818
#define ONBOARD_MODEM_API_H_
1919

20-
/** onboard_modem_api is a standardizing API for Modem type devices under mbed-os.
20+
/** onboard_modem_api is a standardizing API for Modem type devices under Mbed OS.
2121
* It provides a simple hardware abstraction layer on top of the modem drivers
22-
* written for mbed-os.
22+
* written for Mbed OS.
2323
*
2424
* It is required from the engineers porting any modem type device (e.g., Cellular)
2525
* to provide an implementation of this API in their respective target folder as well as

features/netsocket/nsapi_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ typedef signed int nsapi_error_t;
9797
*/
9898
typedef unsigned int nsapi_size_t;
9999

100-
/** Type used to represent either a size or error pased through sockets
100+
/** Type used to represent either a size or error passed through sockets
101101
*
102102
* A valid nsapi_size_or_error_t is either a non-negative size or a
103103
* negative error code from the nsapi_error_t

platform/FileHandle.h

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace mbed {
3636
/** Class FileHandle
3737
*
3838
* An abstract interface that represents operations on a file-like
39-
* object. The core functions are read, write, and seek, but only
39+
* object. The core functions are read, write and seek, but only
4040
* a subset of these operations can be provided.
4141
*
4242
* @note to create a file, @see File
@@ -50,7 +50,7 @@ class FileHandle : private NonCopyable<FileHandle> {
5050
*
5151
* Devices acting as FileHandles should follow POSIX semantics:
5252
*
53-
* * if no data is available, and non-blocking set return -EAGAIN
53+
* * if no data is available, and nonblocking set, return -EAGAIN
5454
* * if no data is available, and blocking set, wait until some data is available
5555
* * If any data is available, call returns immediately
5656
*
@@ -65,8 +65,8 @@ class FileHandle : private NonCopyable<FileHandle> {
6565
* Devices acting as FileHandles should follow POSIX semantics:
6666
*
6767
* * if blocking, block until all data is written
68-
* * if no data can be written, and non-blocking set, return -EAGAIN
69-
* * if some data can be written, and non-blocking set, write partial
68+
* * if no data can be written, and nonblocking set, return -EAGAIN
69+
* * if some data can be written, and nonblocking set, write partial
7070
*
7171
* @param buffer The buffer to write from
7272
* @param size The number of bytes to write
@@ -181,11 +181,11 @@ class FileHandle : private NonCopyable<FileHandle> {
181181
return size();
182182
}
183183

184-
/** Set blocking or non-blocking mode of the file operation like read/write.
185-
* Definition depends upon the subclass implementing FileHandle.
184+
/** Set blocking or nonblocking mode of the file operation like read/write.
185+
* Definition depends on the subclass implementing FileHandle.
186186
* The default is blocking.
187187
*
188-
* @param blocking true for blocking mode, false for non-blocking mode.
188+
* @param blocking true for blocking mode, false for nonblocking mode.
189189
*
190190
* @return 0 on success
191191
* @return Negative error code on failure
@@ -195,19 +195,19 @@ class FileHandle : private NonCopyable<FileHandle> {
195195
return blocking ? 0 : -ENOTTY;
196196
}
197197

198-
/** Check current blocking or non-blocking mode for file operations.
198+
/** Check current blocking or nonblocking mode for file operations.
199199
*
200-
* @return true for blocking mode, false for non-blocking mode.
200+
* @return true for blocking mode, false for nonblocking mode.
201201
*/
202202
virtual bool is_blocking() const
203203
{
204204
return true;
205205
}
206206

207207
/** Check for poll event flags
208-
* The input parameter can be used or ignored - the could always return all events,
209-
* or could check just the events listed in events.
210-
* Call is non-blocking - returns instantaneous state of events.
208+
* You can use or ignore the input parameter. You can return all events
209+
* or check just the events listed in events.
210+
* Call is nonblocking - returns instantaneous state of events.
211211
* Whenever an event occurs, the derived class should call the sigio() callback).
212212
*
213213
* @param events bitmask of poll events we're interested in - POLLIN/POLLOUT etc.
@@ -220,7 +220,7 @@ class FileHandle : private NonCopyable<FileHandle> {
220220
return POLLIN | POLLOUT;
221221
}
222222

223-
/** Definition depends upon the subclass implementing FileHandle.
223+
/** Definition depends on the subclass implementing FileHandle.
224224
* For example, if the FileHandle is of type Stream, writable() could return
225225
* true when there is ample buffer space available for write() calls.
226226
*
@@ -231,7 +231,7 @@ class FileHandle : private NonCopyable<FileHandle> {
231231
return poll(POLLOUT) & POLLOUT;
232232
}
233233

234-
/** Definition depends upon the subclass implementing FileHandle.
234+
/** Definition depends on the subclass implementing FileHandle.
235235
* For example, if the FileHandle is of type Stream, readable() could return
236236
* true when there is something available to read.
237237
*
@@ -250,11 +250,11 @@ class FileHandle : private NonCopyable<FileHandle> {
250250
* The callback may be called in an interrupt context and should not
251251
* perform expensive operations.
252252
*
253-
* Note! This is not intended as an attach-like asynchronous api, but rather
254-
* as a building block for constructing such functionality.
253+
* Note! This is not intended as an attach-like asynchronous API, but rather
254+
* as a building block for constructing such functionality.
255255
*
256256
* The exact timing of when the registered function
257-
* is called is not guaranteed and susceptible to change. It should be used
257+
* is called is not guaranteed and is susceptible to change. It should be used
258258
* as a cue to make read/write/poll calls to find the current state.
259259
*
260260
* @param func Function to call on state change

0 commit comments

Comments
 (0)