Added new CALLBACK_Audio_Device_GetSetInterfaceProperty() callback to the Audio Devic...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / ISP / ISPTarget.h

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
index 057aa7a..d8ace7a 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
@@ -56,7 +56,7 @@
                #endif
 
        /* Macros: */
                #endif
 
        /* Macros: */

-               /** Low level device command to issue an extended FLASH address, for devices with other 128KB of FLASH. */
+               /** Low level device command to issue an extended FLASH address, for devices with over 128KB of FLASH. */

                #define LOAD_EXTENDED_ADDRESS_CMD     0x4D
 
                /** Macro to convert an ISP frequency to a number of timer clock cycles for the software SPI driver. */
                #define LOAD_EXTENDED_ADDRESS_CMD     0x4D
 
                /** Macro to convert an ISP frequency to a number of timer clock cycles for the software SPI driver. */


@@ -72,7 +72,7 @@
                void    ISPTarget_EnableTargetISP(void);
                void    ISPTarget_DisableTargetISP(void);
                void    ISPTarget_ConfigureRescueClock(void);
                void    ISPTarget_EnableTargetISP(void);
                void    ISPTarget_DisableTargetISP(void);
                void    ISPTarget_ConfigureRescueClock(void);

-               void    ISPTarget_ConfigureSoftwareISP(const uint8_t SCKDuration);
+               void    ISPTarget_ConfigureSoftwareSPI(const uint8_t SCKDuration);

                uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte);
                void    ISPTarget_ChangeTargetResetLine(const bool ResetTarget);
                uint8_t ISPTarget_WaitWhileTargetBusy(void);
                uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte);
                void    ISPTarget_ChangeTargetResetLine(const bool ResetTarget);
                uint8_t ISPTarget_WaitWhileTargetBusy(void);


@@ -104,10 +104,17 @@
                 */
                static inline uint8_t ISPTarget_ReceiveByte(void)
                {
                 */
                static inline uint8_t ISPTarget_ReceiveByte(void)
                {

+                       #if !defined(INVERTED_ISP_MISO)

                        if (HardwareSPIMode)
                          return SPI_ReceiveByte();
                        else
                          return ISPTarget_TransferSoftSPIByte(0x00);
                        if (HardwareSPIMode)
                          return SPI_ReceiveByte();
                        else
                          return ISPTarget_TransferSoftSPIByte(0x00);

+                       #else
+                       if (HardwareSPIMode)
+                         return ~SPI_ReceiveByte();
+                       else
+                         return ~ISPTarget_TransferSoftSPIByte(0x00);
+                       #endif

                }
 
                /** Sends and receives a byte of ISP data to and from the attached target, using the
                }
 
                /** Sends and receives a byte of ISP data to and from the attached target, using the


@@ -119,10 +126,17 @@
                 */
                static inline uint8_t ISPTarget_TransferByte(const uint8_t Byte)
                {
                 */
                static inline uint8_t ISPTarget_TransferByte(const uint8_t Byte)
                {

+                       #if !defined(INVERTED_ISP_MISO)

                        if (HardwareSPIMode)
                          return SPI_TransferByte(Byte);
                        else
                          return ISPTarget_TransferSoftSPIByte(Byte);
                        if (HardwareSPIMode)
                          return SPI_TransferByte(Byte);
                        else
                          return ISPTarget_TransferSoftSPIByte(Byte);

+                       #else
+                       if (HardwareSPIMode)
+                         return ~SPI_TransferByte(Byte);
+                       else
+                         return ~ISPTarget_TransferSoftSPIByte(Byte);
+                       #endif

                }
 
 #endif
                }
 
 #endif