diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-23 08:37:11 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-08-23 08:37:11 +0000 |
| commit | f229502d9addacfbefe955a47931b980bfbb1a10 (patch) | |
| tree | 17311a066348fa23088257d51a95354bdb152885 /LUFA/Drivers/Peripheral | |
| parent | 1e8df8951a3335e4b45ad0c25a82df3d90d785f3 (diff) | |
| download | lufa-f229502d9addacfbefe955a47931b980bfbb1a10.tar.gz lufa-f229502d9addacfbefe955a47931b980bfbb1a10.tar.bz2 lufa-f229502d9addacfbefe955a47931b980bfbb1a10.zip | |
Fixed AVRISP programmer demo -- can now connect to a target and read/write Sig/Lock/Fuse/OSCCAL bytes successfully.
Changed SPI_Init() to allow for the clock polarity and data sample modes to be set.
Changed Dataflash_Init() to no longer call SPI_Init() automatically.
Diffstat (limited to 'LUFA/Drivers/Peripheral')
| -rw-r--r-- | LUFA/Drivers/Peripheral/SPI.h | 31 |
1 files changed, 24 insertions, 7 deletions
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h index df741d7b8..dcc58ce49 100644 --- a/LUFA/Drivers/Peripheral/SPI.h +++ b/LUFA/Drivers/Peripheral/SPI.h @@ -61,7 +61,7 @@ /* Private Interface - For use in library only: */
#if !defined(__DOXYGEN__)
/* Macros: */
- #define SPI_USE_DOUBLESPEED (1 << 7)
+ #define SPI_USE_DOUBLESPEED (1 << SPE)
#endif
/* Public Interface - May be used in end-application: */
@@ -86,23 +86,40 @@ /** SPI prescaler mask for SPI_Init(). Divides the system clock by a factor of 128. */
#define SPI_SPEED_FCPU_DIV_128 ((1 << SPR1) | (1 << SPR0))
+
+ /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the rising edge. */
+ #define SPI_SCK_LEAD_RISING (0 << CPOL)
+
+ /** SPI clock polarity mask for SPI_Init(). Indicates that the SCK should lead on the falling edge. */
+ #define SPI_SCK_LEAD_FALLING (1 << CPOL)
+
+ /** SPI data sample mode mask for SPI_Init(). Indicates that the data should sampled on the leading edge. */
+ #define SPI_SAMPLE_LEADING (0 << CPHA)
+
+ /** SPI data sample mode mask for SPI_Init(). Indicates that the data should be sampled on the trailing edge. */
+ #define SPI_SAMPLE_TRAILING (1 << CPHA)
+
+ /** SPI mode mask for SPI_Init(). Indicates that the SPI interface should be initialized into slave mode. */
+ #define SPI_MODE_SLAVE (0 << MSTR)
+
+ /** SPI mode mask for 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.
*
- * \param[in] PrescalerMask Prescaler mask to set the SPI clock speed
- * \param[in] Master If true, sets the SPI system to use master mode, slave if false
+ * \param[in] SPIOptions SPI Options, a mask consisting of one of each of the SPI_SPEED_*,
+ * SPI_SCK_*, SPI_SAMPLE_* and SPI_MODE_* masks
*/
- static inline void SPI_Init(const uint8_t PrescalerMask, const bool Master)
+ static inline void SPI_Init(const uint8_t SPIOptions)
{
DDRB |= ((1 << 1) | (1 << 2));
PORTB |= ((1 << 0) | (1 << 3));
- SPCR = ((1 << SPE) | (Master << MSTR) | (1 << CPOL) | (1 << CPHA) |
- (PrescalerMask & ~SPI_USE_DOUBLESPEED));
+ SPCR = ((1 << SPE) | SPIOptions);
- if (PrescalerMask & SPI_USE_DOUBLESPEED)
+ if (SPIOptions & SPI_USE_DOUBLESPEED)
SPSR |= (1 << SPI2X);
else
SPSR &= ~(1 << SPI2X);
|