eqmk
/
qmk_firmware
forked from mfulz_github/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver.

This commit is contained in:
Dean Camera 2011-06-16 07:23:37 +00:00
parent d8fe01f19a
commit f10126a95e
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
LUFA/Drivers/Peripheral/AVR8/SPI_AVR8.h
View File

@ -167,16 +167,23 @@
*/ */
static inline void SPI_Init(const uint8_t SPIOptions) static inline void SPI_Init(const uint8_t SPIOptions)
{ {
DDRB |= ((1 << 1) | (1 << 2)); /* Prevent high rise times on PB.0 (/SS) from forcing a change to SPI slave mode */
DDRB &= ~((1 << 0) | (1 << 3)); DDRB |= (1 << 0);
PORTB |= ((1 << 0) | (1 << 3)); PORTB |= (1 << 0);
SPCR = ((1 << SPE) | SPIOptions); DDRB |= ((1 << 1) | (1 << 2));
DDRB &= ~(1 << 3);
PORTB |= (1 << 3);
if (SPIOptions & SPI_USE_DOUBLESPEED) if (SPIOptions & SPI_USE_DOUBLESPEED)
SPSR |= (1 << SPI2X); SPSR |= (1 << SPI2X);
else else
SPSR &= ~(1 << SPI2X); SPSR &= ~(1 << SPI2X);
/* Switch /SS to input mode after configuration to allow for forced mode changes */
DDRB &= ~(1 << 0);
SPCR = ((1 << SPE) | SPIOptions);
} }
/** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */ /** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */
@ -188,6 +195,15 @@
SPCR = 0; SPCR = 0;
SPSR = 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)
{
return (SPCR & SPI_MODE_MASTER);
}
/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete. /** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
* *

5
LUFA/ManPages/ChangeLog.txt
View File

@ -18,6 +18,7 @@
* - Added new EVENT_Audio_Device_StreamStartStop() event to the Audio Device Class driver to detect stream start/stop events * - Added new EVENT_Audio_Device_StreamStartStop() event to the Audio Device Class driver to detect stream start/stop events
* - Added board driver support for the Busware TUL board * - Added board driver support for the Busware TUL board
* - Added new Host mode Audio Class driver * - Added new Host mode Audio Class driver
* - Added new \ref SPI_GetCurrentMode() function to the SPI peripheral driver
* - Library Applications: * - Library Applications:
* - Added RNDIS device mode to the Webserver project * - Added RNDIS device mode to the Webserver project
* - Added new incomplete AndroidAccessoryHost Host LowLevel demo * - Added new incomplete AndroidAccessoryHost Host LowLevel demo
@ -40,7 +41,9 @@
* *
* <b>Fixed:</b> * <b>Fixed:</b>
* - Core: * - Core:
* - Large number of documentation and code comment corrections (thanks to Andrewy from Microsin.ru) * - Large number of documentation and code comment corrections (thanks to Andrey from Microsin.ru)
* - Fixed possibility of the AVR's SPI interface being pulled out of master mode if the /SS pin is a input and pulled low (thanks
* to Andrey from Microsin.ru)
* - Library Applications: * - Library Applications:
* - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2 * - Fixed incorrect signature in the CDC and DFU class bootloaders for the ATMEGA8U2
* - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed * - Fixed KeyboardHost and KeyboardHostWithParser demos displaying incorrect values when numerical keys were pressed