X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/ea922c98d187eb74c31535afa3334ead5bd50526..77a9df36a77d2523dd2bc24fa17f9f04c6c175c5:/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 e183dee0f..3bfa07171 100644
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
@@ -37,19 +37,12 @@
 #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>
-		
-		#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"
 
@@ -79,7 +72,7 @@
 		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);
@@ -91,7 +84,6 @@
 		                                      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.
 		 *
@@ -132,7 +124,6 @@
 			else
 			  return ISPTarget_TransferSoftSPIByte(Byte);
 		}
-		#endif
 
 #endif