ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'writeathon' of ssh://github.com/yennster/mbed-os into rollup

pull/8475/head
Cruz Monrreal II 2018-10-18 20:01:37 -05:00
parent 1c1432e8e7 383798b525
commit 9cd5cbdb15
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/RawSerial.h
View File

@ -88,6 +88,7 @@ public:
int printf(const char *format, ...);
#if !(DOXYGEN_ONLY)
protected:
/* Acquire exclusive access to this serial port
@ -97,6 +98,7 @@ protected:
/* Release exclusive access to this serial port
*/
virtual void unlock(void);
#endif
};
} // namespace mbed

8
drivers/Serial.h
View File

@ -63,10 +63,10 @@ public:
* @param tx Transmit pin
* @param rx Receive pin
* @param name The name of the stream associated with this serial port (optional)
* @param baud The baud rate of the serial port (optional, defaults to MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE)
* @param baud The baud rate of the serial port (optional, defaults to MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE or 9600)
*
* @note
* Either tx or rx may be specified as NC if unused
* Either tx or rx may be specified as NC (Not Connected) if unused
*/
Serial(PinName tx, PinName rx, const char *name = NULL, int baud = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
@ -78,7 +78,7 @@ public:
* @param baud The baud rate of the serial port
*
* @note
* Either tx or rx may be specified as NC if unused
* Either tx or rx may be specified as NC (Not Connected) if unused
*/
Serial(PinName tx, PinName rx, int baud);
@ -99,6 +99,7 @@ public:
return SerialBase::writeable();
}
#if !(DOXYGEN_ONLY)
protected:
virtual int _getc();
virtual int _putc(int c);
@ -106,6 +107,7 @@ protected:
virtual void unlock();
PlatformMutex _mutex;
#endif
};
} // namespace mbed