X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/f10126a95e528a04b4ec6be1d0fc30be4fbb7e98..154d28e39f114c1e1af223ae6c37e34323e6be9d:/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h diff --git a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h index 2caacaa00..d6dc248f7 100644 --- a/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h +++ b/LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h @@ -70,7 +70,7 @@ * // Send a byte, and store the received byte from the same transaction * uint8_t ResponseByte = SPI_TransferByte(0xDC); * \endcode - * + * * @{ */ @@ -139,7 +139,7 @@ /** SPI data sample mode mask for \c SPI_Init(). Indicates that the data should be sampled on the trailing edge. */ #define SPI_SAMPLE_TRAILING (1 << CPHA) //@} - + /** \name SPI Data Ordering Configuration Masks */ //@{ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out MSB first. */ @@ -148,7 +148,7 @@ /** SPI data order mask for \c SPI_Init(). Indicates that data should be shifted out LSB first. */ #define SPI_ORDER_LSB_FIRST (1 << DORD) //@} - + /** \name SPI Mode Configuration Masks */ //@{ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */ @@ -157,7 +157,7 @@ /** SPI mode mask for \c SPI_Init(). Indicates that the SPI interface should be initialized into master mode. */ #define SPI_MODE_MASTER (1 << MSTR) //@} - + /* Inline Functions: */ /** Initializes the SPI subsystem, ready for transfers. Must be called before calling any other * SPI routines. @@ -183,7 +183,7 @@ /* Switch /SS to input mode after configuration to allow for forced mode changes */ DDRB &= ~(1 << 0); - SPCR = ((1 << SPE) | SPIOptions); + SPCR = ((1 << SPE) | SPIOptions); } /** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */ @@ -195,11 +195,12 @@ SPCR = 0; SPSR = 0; } - + /** Retrieves the currently selected SPI mode, once the SPI interface has been configured. * * \return \ref SPI_MODE_MASTER if the interface is currently in SPI Master mode, \ref SPI_MODE_SLAVE otherwise */ + static inline uint8_t SPI_GetCurrentMode(void) ATTR_ALWAYS_INLINE; static inline uint8_t SPI_GetCurrentMode(void) { return (SPCR & SPI_MODE_MASTER);