Fixing SPI double-speed bug.

damellis · damellis · commit 96dbe10c3a49 · 2010-10-04T21:19:03.000-04:00
Bad bit manipulation was causing the double-speed flag to be set incorrectly. http://code.google.com/p/arduino/issues/detail?id=365 (Filtered from arduino/Arduino@b248953)
diff --git a/SPI.cpp b/SPI.cpp
@@ -56,6 +56,6 @@ void SPIClass::setDataMode(uint8_t mode)
 void SPIClass::setClockDivider(uint8_t rate)
 {
   SPCR = (SPCR & ~SPI_CLOCK_MASK) | (rate & SPI_CLOCK_MASK);
-  SPSR = (SPSR & ~SPI_2XCLOCK_MASK) | (rate & SPI_2XCLOCK_MASK);
+  SPSR = (SPSR & ~SPI_2XCLOCK_MASK) | ((rate >> 2) & SPI_2XCLOCK_MASK);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,6 @@ void SPIClass::setDataMode(uint8_t mode)`
`56`	`56`	`void SPIClass::setClockDivider(uint8_t rate)`
`57`	`57`	`{`
`58`	`58`	`SPCR = (SPCR & ~SPI_CLOCK_MASK) \| (rate & SPI_CLOCK_MASK);`
`59`		`- SPSR = (SPSR & ~SPI_2XCLOCK_MASK) \| (rate & SPI_2XCLOCK_MASK);`
	`59`	`+ SPSR = (SPSR & ~SPI_2XCLOCK_MASK) \| ((rate >> 2) & SPI_2XCLOCK_MASK);`
`60`	`60`	`}`
`61`	`61`