Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and PDI programming.

8 files changed, 4 insertions, 109 deletions

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index 02579a341..8cc4c3c68 100644
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -45,8 +45,7 @@
 		#include "V2ProtocolConstants.h"

 		#include "V2ProtocolParams.h"
 		#include "ISP/ISPProtocol.h"

-		#include "PDI/PDIProtocol.h"

-		#include "TPI/TPIProtocol.h"

+		#include "XPROG/XPROGProtocol.h"

 

 	/* Preprocessor Checks: */

 		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))

diff --git a/Projects/AVRISP/Lib/XPROG/TINYNVM.h b/Projects/AVRISP/Lib/XPROG/TINYNVM.h
index eca3c98b8..1cff03d92 100644
--- a/Projects/AVRISP/Lib/XPROG/TINYNVM.h
+++ b/Projects/AVRISP/Lib/XPROG/TINYNVM.h
@@ -43,7 +43,7 @@
 		

 		#include <LUFA/Common/Common.h>

 		

-		#include "TPIProtocol.h"

+		#include "XPROGProtocol.h"

 		#include "TPITarget.h"

 	

 	/* Preprocessor Checks: */

diff --git a/Projects/AVRISP/Lib/XPROG/TPIProtocol.c b/Projects/AVRISP/Lib/XPROG/TPIProtocol.c
deleted file mode 100644
index a95e94b60..000000000
--- a/Projects/AVRISP/Lib/XPROG/TPIProtocol.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2009.

-              

-  dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com

-*/

-

-/*

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, and distribute this software

-  and its documentation for any purpose and without fee is hereby

-  granted, provided that the above copyright notice appear in all

-  copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  TPI Protocol handler, to process V2 Protocol wrapped TPI commands used in Atmel programmer devices.

- */

-

-#define  INCLUDE_FROM_TPIPROTOCOL_C

-#include "TPIProtocol.h"

-

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

-#warning TPI Programming Protocol is currently incomplete and is not suitable for general use.

-

-// TODO

-

-#endif

diff --git a/Projects/AVRISP/Lib/XPROG/TPIProtocol.h b/Projects/AVRISP/Lib/XPROG/TPIProtocol.h
deleted file mode 100644
index 11894a333..000000000
--- a/Projects/AVRISP/Lib/XPROG/TPIProtocol.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*

-             LUFA Library

-     Copyright (C) Dean Camera, 2009.

-              

-  dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.com

-*/

-

-/*

-  Copyright 2009  Dean Camera (dean [at] fourwalledcubicle [dot] com)

-

-  Permission to use, copy, modify, and distribute this software

-  and its documentation for any purpose and without fee is hereby

-  granted, provided that the above copyright notice appear in all

-  copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting

-  documentation, and that the name of the author not be used in

-  advertising or publicity pertaining to distribution of the

-  software without specific, written prior permission.

-

-  The author disclaim all warranties with regard to this

-  software, including all implied warranties of merchantability

-  and fitness.  In no event shall the author be liable for any

-  special, indirect or consequential damages or any damages

-  whatsoever resulting from loss of use, data or profits, whether

-  in an action of contract, negligence or other tortious action,

-  arising out of or in connection with the use or performance of

-  this software.

-*/

-

-/** \file

- *

- *  Header file for TPIProtocol.c.

- */

-

-#ifndef _TPI_PROTOCOL_

-#define _TPI_PROTOCOL_

-

-	/* Includes: */

-		#include <avr/io.h>

-		#include <util/delay.h>

-		#include <stdio.h>

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

-

-		#include "TPITarget.h"

-		#include "TINYNVM.h"

-

-	/* Preprocessor Checks: */

-		#if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))

-			#undef ENABLE_ISP_PROTOCOL

-			#undef ENABLE_TPI_PROTOCOL

-			

-			#if !defined(ENABLE_PDI_PROTOCOL)

-				#define ENABLE_PDI_PROTOCOL

-			#endif

-		#endif

-		

-#endif

diff --git a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
index c31c7e8f1..c91522db1 100644
--- a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
+++ b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h
@@ -43,7 +43,7 @@
 		

 		#include <LUFA/Common/Common.h>

 		

-		#include "PDIProtocol.h"

+		#include "XPROGProtocol.h"

 		#include "PDITarget.h"

 	

 	/* Preprocessor Checks: */

diff --git a/Projects/AVRISP/Lib/XPROG/PDIProtocol.c b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
index ed5146063..ed5146063 100644
--- a/Projects/AVRISP/Lib/XPROG/PDIProtocol.c
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
diff --git a/Projects/AVRISP/Lib/XPROG/PDIProtocol.h b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
index 9a10abbce..9a10abbce 100644
--- a/Projects/AVRISP/Lib/XPROG/PDIProtocol.h
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h
diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 12f31546e..196eb7951 100644
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -131,10 +131,9 @@ SRC = $(TARGET).c                                                 \
       Lib/V2ProtocolParams.c                                      \

       Lib/ISP/ISPProtocol.c                                       \

       Lib/ISP/ISPTarget.c                                         \

-	  Lib/XPROG/PDIProtocol.c                                     \

+	  Lib/XPROG/XPROGProtocol.c                                   \

 	  Lib/XPROG/PDITarget.c                                       \

 	  Lib/XPROG/XMEGANVM.c                                        \

-	  Lib/XPROG/TPIProtocol.c                                     \

 	  Lib/XPROG/TPITarget.c                                       \

 	  Lib/XPROG/TINYNVM.c                                         \

 	  $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \