Update UC3 platform driver support to use the bitmasks defined in the header files...

[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 e183dee..3bfa071 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
@@ -37,19 +37,12 @@
 #define _ISP_TARGET_
 
        /* Includes: */
 #define _ISP_TARGET_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
+               #include <avr/io.h>
+               #include <avr/pgmspace.h>
+               #include <util/delay.h>
+

                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/USB/USB.h>

-               
-               #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)
-                       #include <LUFA/Drivers/Peripheral/SPI.h> // TODO: FIXME
-               #endif
-               
-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/io.h>
-                       #include <avr/pgmspace.h>
-               #elif (ARCH == ARCH_UC3)
-                       #include <avr32/io.h>                   
-               #endif
+               #include <LUFA/Drivers/Peripheral/SPI.h>

 
                #include "../V2ProtocolParams.h"
 
 
                #include "../V2ProtocolParams.h"
 


@@ -79,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);


@@ -91,7 +84,6 @@
                                                      const uint8_t ReadMemCommand);
 
        /* Inline Functions: */
                                                      const uint8_t ReadMemCommand);
 
        /* Inline Functions: */

-               #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)

                /** Sends a byte of ISP data to the attached target, using the appropriate SPI hardware or
                 *  software routines depending on the selected ISP speed.
                 *
                /** Sends a byte of ISP data to the attached target, using the appropriate SPI hardware or
                 *  software routines depending on the selected ISP speed.
                 *


@@ -132,7 +124,6 @@
                        else
                          return ISPTarget_TransferSoftSPIByte(Byte);
                }
                        else
                          return ISPTarget_TransferSoftSPIByte(Byte);
                }

-               #endif

 
 #endif
 
 
 #endif