diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-14 20:57:04 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2013-01-14 20:57:04 +0000 |
| commit | f51c87b9160dd89810bac7579246ae14f61e0a8b (patch) | |
| tree | 085e40c1b32fd356d9688c5bf1b25b505f5d37d6 /Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | |
| parent | 7eaf3d18d268574a5805c362cf853f0fb1f1df23 (diff) | |
| download | lufa-f51c87b9160dd89810bac7579246ae14f61e0a8b.tar.gz lufa-f51c87b9160dd89810bac7579246ae14f61e0a8b.tar.bz2 lufa-f51c87b9160dd89810bac7579246ae14f61e0a8b.zip | |
Code style fixes to the AVRISP-MKII Clone programmer project.
Diffstat (limited to 'Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h')
| -rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h index 34c40d677..72ec0b1ec 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h @@ -47,7 +47,7 @@ #include "../V2Protocol.h" #include "ISPProtocol.h" #include "Config/AppConfig.h" - + /* Preprocessor Checks: */ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) #undef ENABLE_ISP_PROTOCOL @@ -106,16 +106,17 @@ */ static inline uint8_t ISPTarget_ReceiveByte(void) { - #if !defined(INVERTED_ISP_MISO) + uint8_t ReceivedByte; + if (HardwareSPIMode) - return SPI_ReceiveByte(); + ReceivedByte = SPI_ReceiveByte(); else - return ISPTarget_TransferSoftSPIByte(0x00); + ReceivedByte = ISPTarget_TransferSoftSPIByte(0x00); + + #if defined(INVERTED_ISP_MISO) + return ~ReceivedByte; #else - if (HardwareSPIMode) - return ~SPI_ReceiveByte(); - else - return ~ISPTarget_TransferSoftSPIByte(0x00); + return ReceivedByte; #endif } @@ -128,16 +129,17 @@ */ static inline uint8_t ISPTarget_TransferByte(const uint8_t Byte) { - #if !defined(INVERTED_ISP_MISO) + uint8_t ReceivedByte; + if (HardwareSPIMode) - return SPI_TransferByte(Byte); + ReceivedByte = SPI_TransferByte(Byte); else - return ISPTarget_TransferSoftSPIByte(Byte); + ReceivedByte = ISPTarget_TransferSoftSPIByte(Byte); + + #if defined(INVERTED_ISP_MISO) + return ~ReceivedByte; #else - if (HardwareSPIMode) - return ~SPI_TransferByte(Byte); - else - return ~ISPTarget_TransferSoftSPIByte(Byte); + return ReceivedByte; #endif } |