X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/5a4def747897c1c6ffbe465506d846c7c686d3e9..ea922c98d187eb74c31535afa3334ead5bd50526:/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
index a4a7a8413..9c7986e55 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2011.
 
   dean [at] fourwalledcubicle [dot] com
-      www.fourwalledcubicle.com
+           www.lufa-lib.org
 */
 
 /*
-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
@@ -37,15 +37,19 @@
 #define _XPROG_PROTOCOL_
 
 	/* Includes: */
-		#include <avr/io.h>
-		#include <util/delay.h>
-		#include <stdio.h>
-
+		#include <LUFA/Common/Common.h>
 		#include <LUFA/Drivers/USB/USB.h>
-		#include <LUFA/Drivers/Peripheral/SerialStream.h>
+
+		#if (ARCH == ARCH_AVR8)
+			#include <avr/io.h>
+		#elif (ARCH == ARCH_UC3)
+			#include <avr32/io.h>			
+		#endif
+		
+		#include <stdbool.h>
+		#include <stdio.h>
 
 		#include "../V2Protocol.h"
-		#include "XPROGTarget.h"
 		#include "XMEGANVM.h"
 		#include "TINYNVM.h"
 
@@ -113,7 +117,6 @@
 		extern uint16_t XPROG_Param_EEPageSize;
 		extern uint8_t  XPROG_Param_NVMCSRRegAddr;
 		extern uint8_t  XPROG_Param_NVMCMDRegAddr;
-		extern uint8_t  XPROG_SelectedProtocol;
 
 	/* Function Prototypes: */
 		void XPROGProtocol_SetMode(void);