diff options
author | Dean Camera <[email protected]> | 2009-04-26 10:29:59 +0000 |
---|---|---|
committer | Dean Camera <[email protected]> | 2009-04-26 10:29:59 +0000 |
commit | 58e42c6ca92c4e6181967f83e40d9dea1ea48259 (patch) | |
tree | 39e9480b161df1d10878df0b21a336813cec3347 /LUFA/Drivers/Peripheral | |
parent | e21b620bf6cc9fb1bb9e516efb57b1cb12c00085 (diff) | |
download | qmk_firmware-58e42c6ca92c4e6181967f83e40d9dea1ea48259.tar.gz qmk_firmware-58e42c6ca92c4e6181967f83e40d9dea1ea48259.zip |
Fixed SPI driver init function not clearing SPI2X bit when not needed.
Fixed PREVENT ALLOW MEDIUM REMOVAL command issuing in the MassStorageHost demo using incorrect parameters (thanks to Mike Alex).
Fixed MassStorageHost demo broken due to an incorrect if statement test in MassStore_GetReturnedStatus().
Diffstat (limited to 'LUFA/Drivers/Peripheral')
-rw-r--r-- | LUFA/Drivers/Peripheral/SPI.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h index d8d60ede58..66cdaf513e 100644 --- a/LUFA/Drivers/Peripheral/SPI.h +++ b/LUFA/Drivers/Peripheral/SPI.h @@ -102,7 +102,9 @@ (PrescalerMask & ~SPI_USE_DOUBLESPEED));
if (PrescalerMask & SPI_USE_DOUBLESPEED)
- SPSR = (1 << SPI2X);
+ SPSR |= (1 << SPI2X);
+ else
+ SPSR &= ~(1 << SPI2X);
}
/** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.
|