Skip to content

Commit 9cd5cbd

Browse files
Cruz Monrreal IICruz Monrreal II
authored andcommitted
Merge branch 'writeathon' of ssh://github.com/yennster/mbed-os into rollup
2 parents 1c1432e + 383798b commit 9cd5cbd

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

drivers/RawSerial.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ class RawSerial: public SerialBase, private NonCopyable<RawSerial> {
8888

8989
int printf(const char *format, ...);
9090

91+
#if !(DOXYGEN_ONLY)
9192
protected:
9293

9394
/* Acquire exclusive access to this serial port
@@ -97,6 +98,7 @@ class RawSerial: public SerialBase, private NonCopyable<RawSerial> {
9798
/* Release exclusive access to this serial port
9899
*/
99100
virtual void unlock(void);
101+
#endif
100102
};
101103

102104
} // namespace mbed

drivers/Serial.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,10 @@ class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
6363
* @param tx Transmit pin
6464
* @param rx Receive pin
6565
* @param name The name of the stream associated with this serial port (optional)
66-
* @param baud The baud rate of the serial port (optional, defaults to MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE)
66+
* @param baud The baud rate of the serial port (optional, defaults to MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE or 9600)
6767
*
6868
* @note
69-
* Either tx or rx may be specified as NC if unused
69+
* Either tx or rx may be specified as NC (Not Connected) if unused
7070
*/
7171
Serial(PinName tx, PinName rx, const char *name = NULL, int baud = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
7272

@@ -78,7 +78,7 @@ class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
7878
* @param baud The baud rate of the serial port
7979
*
8080
* @note
81-
* Either tx or rx may be specified as NC if unused
81+
* Either tx or rx may be specified as NC (Not Connected) if unused
8282
*/
8383
Serial(PinName tx, PinName rx, int baud);
8484

@@ -99,13 +99,15 @@ class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
9999
return SerialBase::writeable();
100100
}
101101

102+
#if !(DOXYGEN_ONLY)
102103
protected:
103104
virtual int _getc();
104105
virtual int _putc(int c);
105106
virtual void lock();
106107
virtual void unlock();
107108

108109
PlatformMutex _mutex;
110+
#endif
109111
};
110112

111113
} // namespace mbed

0 commit comments

Comments
 (0)