diff options
author | Dean Camera <dean@fourwalledcubicle.com> | 2010-06-17 08:15:58 +0000 |
---|---|---|
committer | Dean Camera <dean@fourwalledcubicle.com> | 2010-06-17 08:15:58 +0000 |
commit | deed746d3716d59153e04860c646bfb7b82ca820 (patch) | |
tree | 3d427b7168cdc7312d0f29a75ca7b2b8d604eaea /LUFA/Drivers/Peripheral | |
parent | 69dc32c5f01e8640c1bdf83df3a2a7699ea54560 (diff) | |
download | lufa-deed746d3716d59153e04860c646bfb7b82ca820.tar.gz lufa-deed746d3716d59153e04860c646bfb7b82ca820.tar.bz2 lufa-deed746d3716d59153e04860c646bfb7b82ca820.zip |
Renamed SERIAL_STREAM_ASSERT() macro to STDOUT_ASSERT().
Minor tweaks to the library documentation.
Diffstat (limited to 'LUFA/Drivers/Peripheral')
-rw-r--r-- | LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h | 14 | ||||
-rw-r--r-- | LUFA/Drivers/Peripheral/SPI.h | 10 | ||||
-rw-r--r-- | LUFA/Drivers/Peripheral/Serial.h | 14 | ||||
-rw-r--r-- | LUFA/Drivers/Peripheral/SerialStream.h | 4 |
4 files changed, 21 insertions, 21 deletions
diff --git a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h index c4e7c1285..756ec649d 100644 --- a/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h +++ b/LUFA/Drivers/Peripheral/AVRU4U6U7/ADC.h @@ -203,7 +203,7 @@ * The "mode" parameter should be a mask comprised of a conversion mode (free running or single) and * prescaler masks. * - * \param[in] Mode Mask of ADC settings, including adjustment, prescale, mode and reference + * \param[in] Mode Mask of ADC settings, including adjustment, prescale, mode and reference. */ static inline void ADC_Init(uint8_t Mode); @@ -221,14 +221,14 @@ /** Indicates if the current ADC conversion is completed, or still in progress. * * \return Boolean false if the reading is still taking place, or true if the conversion is - * complete and ready to be read out with \ref ADC_GetResult() + * complete and ready to be read out with \ref ADC_GetResult(). */ static inline bool ADC_IsReadingComplete(void); /** Retrieves the conversion value of the last completed ADC conversion and clears the reading * completion flag. * - * \return The result of the last ADC conversion + * \return The result of the last ADC conversion as an unsigned value. */ static inline uint16_t ADC_GetResult(void); #else @@ -254,7 +254,7 @@ * * \note The channel number must be specified as an integer, and NOT a ADC_CHANNELx mask. * - * \param[in] Channel ADC channel number to set up for conversions + * \param[in] Channel ADC channel number to set up for conversions. */ static inline void ADC_SetupChannel(const uint8_t Channel) { @@ -297,7 +297,7 @@ * * \note The channel number must be specified as an integer, and NOT a ADC_CHANNELx mask. * - * \param[in] Channel ADC channel number to set up for conversions + * \param[in] Channel ADC channel number to set up for conversions. */ static inline void ADC_DisableChannel(const uint8_t Channel) { @@ -338,7 +338,7 @@ * conversions. If the ADC is in single conversion mode (or the channel to convert from is to be changed), * this function must be called each time a conversion is to take place. * - * \param[in] MUXMask Mask comprising of an ADC channel mask, reference mask and adjustment mask + * \param[in] MUXMask Mask comprising of an ADC channel mask, reference mask and adjustment mask. */ static inline void ADC_StartReading(const uint16_t MUXMask) { @@ -361,7 +361,7 @@ * to \ref ADC_StartReading() to select the channel and begin the automated conversions, and * the results read directly from the \ref ADC_GetResult() instead to reduce overhead. * - * \param[in] MUXMask Mask comprising of an ADC channel mask, reference mask and adjustment mask + * \param[in] MUXMask Mask comprising of an ADC channel mask, reference mask and adjustment mask. */ static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask) ATTR_WARN_UNUSED_RESULT; static inline uint16_t ADC_GetChannelReading(const uint16_t MUXMask) diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h index 195818a24..d66e9fe24 100644 --- a/LUFA/Drivers/Peripheral/SPI.h +++ b/LUFA/Drivers/Peripheral/SPI.h @@ -111,7 +111,7 @@ * SPI routines. * * \param[in] SPIOptions SPI Options, a mask consisting of one of each of the SPI_SPEED_*, - * SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks + * SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks. */ static inline void SPI_Init(const uint8_t SPIOptions) { @@ -138,9 +138,9 @@ /** Sends and receives a byte through the SPI interface, blocking until the transfer is complete. * - * \param[in] Byte Byte to send through the SPI interface + * \param[in] Byte Byte to send through the SPI interface. * - * \return Response byte from the attached SPI device + * \return Response byte from the attached SPI device. */ static inline uint8_t SPI_TransferByte(const uint8_t Byte) ATTR_ALWAYS_INLINE; static inline uint8_t SPI_TransferByte(const uint8_t Byte) @@ -153,7 +153,7 @@ /** Sends a byte through the SPI interface, blocking until the transfer is complete. The response * byte sent to from the attached SPI device is ignored. * - * \param[in] Byte Byte to send through the SPI interface + * \param[in] Byte Byte to send through the SPI interface. */ static inline void SPI_SendByte(const uint8_t Byte) ATTR_ALWAYS_INLINE; static inline void SPI_SendByte(const uint8_t Byte) @@ -165,7 +165,7 @@ /** Sends a dummy byte through the SPI interface, blocking until the transfer is complete. The response * byte from the attached SPI device is returned. * - * \return The response byte from the attached SPI device + * \return The response byte from the attached SPI device. */ static inline uint8_t SPI_ReceiveByte(void) ATTR_ALWAYS_INLINE ATTR_WARN_UNUSED_RESULT; static inline uint8_t SPI_ReceiveByte(void) diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h index 5abc6e00f..7501c61b9 100644 --- a/LUFA/Drivers/Peripheral/Serial.h +++ b/LUFA/Drivers/Peripheral/Serial.h @@ -80,7 +80,7 @@ #if defined(__DOXYGEN__) /** Indicates whether a character has been received through the USART. * - * \return Boolean true if a character has been received, false otherwise + * \return Boolean true if a character has been received, false otherwise. */ static inline bool Serial_IsCharReceived(void); #else @@ -90,13 +90,13 @@ /* Function Prototypes: */ /** Transmits a given string located in program space (FLASH) through the USART. * - * \param[in] FlashStringPtr Pointer to a string located in program space + * \param[in] FlashStringPtr Pointer to a string located in program space. */ void Serial_TxString_P(const char *FlashStringPtr) ATTR_NON_NULL_PTR_ARG(1); /** Transmits a given string located in SRAM memory through the USART. * - * \param[in] StringPtr Pointer to a string located in SRAM space + * \param[in] StringPtr Pointer to a string located in SRAM space. */ void Serial_TxString(const char *StringPtr) ATTR_NON_NULL_PTR_ARG(1); @@ -104,8 +104,8 @@ /** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to * standard 8-bit, no parity, 1 stop bit settings suitable for most applications. * - * \param[in] BaudRate Serial baud rate, in bits per second - * \param[in] DoubleSpeed Enables double speed mode when set, halving the sample time to double the baud rate + * \param[in] BaudRate Serial baud rate, in bits per second. + * \param[in] DoubleSpeed Enables double speed mode when set, halving the sample time to double the baud rate. */ static inline void Serial_Init(const uint32_t BaudRate, const bool DoubleSpeed) { @@ -134,7 +134,7 @@ /** Transmits a given byte through the USART. * - * \param[in] DataByte Byte to transmit through the USART + * \param[in] DataByte Byte to transmit through the USART. */ static inline void Serial_TxByte(const char DataByte) { @@ -144,7 +144,7 @@ /** Receives a byte from the USART. * - * \return Byte received from the USART + * \return Byte received from the USART. */ static inline char Serial_RxByte(void) { diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h index 83c3036d3..e5d4796be 100644 --- a/LUFA/Drivers/Peripheral/SerialStream.h +++ b/LUFA/Drivers/Peripheral/SerialStream.h @@ -84,8 +84,8 @@ /** Initializes the serial stream (and regular USART driver) so that both the stream and regular * USART driver functions can be used. Must be called before any stream or regular USART functions. * - * \param[in] BaudRate Baud rate to configure the USART to - * \param[in] DoubleSpeed Enables double speed mode when set, halving the sample time to double the baud rate + * \param[in] BaudRate Baud rate to configure the USART to. + * \param[in] DoubleSpeed Enables double speed mode when set, halving the sample time to double the baud rate. */ static inline void SerialStream_Init(const uint32_t BaudRate, const bool DoubleSpeed) { |