From 05fcf7e2a79bebb978d4aeaef26b12f70c6826f8 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 24 Dec 2009 01:59:36 +0000 Subject: [PATCH] Rename PDIProtocol.c/.h to XPROGProtocol.c/.h as it will now handle both TPI and PDI programming. --- LUFA.pnproj | 2 +- Projects/AVRISP/Lib/V2Protocol.h | 3 +- Projects/AVRISP/Lib/XPROG/TINYNVM.h | 2 +- Projects/AVRISP/Lib/XPROG/TPIProtocol.c | 44 -------------- Projects/AVRISP/Lib/XPROG/TPIProtocol.h | 59 ------------------- Projects/AVRISP/Lib/XPROG/XMEGANVM.h | 2 +- .../XPROG/{PDIProtocol.c => XPROGProtocol.c} | 0 .../XPROG/{PDIProtocol.h => XPROGProtocol.h} | 0 Projects/AVRISP/makefile | 3 +- 9 files changed, 5 insertions(+), 110 deletions(-) delete mode 100644 Projects/AVRISP/Lib/XPROG/TPIProtocol.c delete mode 100644 Projects/AVRISP/Lib/XPROG/TPIProtocol.h rename Projects/AVRISP/Lib/XPROG/{PDIProtocol.c => XPROGProtocol.c} (100%) rename Projects/AVRISP/Lib/XPROG/{PDIProtocol.h => XPROGProtocol.h} (100%) diff --git a/LUFA.pnproj b/LUFA.pnproj index 126fba08f6..5699dae70b 100644 --- a/LUFA.pnproj +++ b/LUFA.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h index 02579a341a..8cc4c3c688 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 eca3c98b88..1cff03d920 100644 --- a/Projects/AVRISP/Lib/XPROG/TINYNVM.h +++ b/Projects/AVRISP/Lib/XPROG/TINYNVM.h @@ -43,7 +43,7 @@ #include - #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 a95e94b604..0000000000 --- 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 11894a3333..0000000000 --- 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 - #include - #include - - #include - - #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 c31c7e8f10..c91522db18 100644 --- a/Projects/AVRISP/Lib/XPROG/XMEGANVM.h +++ b/Projects/AVRISP/Lib/XPROG/XMEGANVM.h @@ -43,7 +43,7 @@ #include - #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 similarity index 100% rename from Projects/AVRISP/Lib/XPROG/PDIProtocol.c rename to Projects/AVRISP/Lib/XPROG/XPROGProtocol.c diff --git a/Projects/AVRISP/Lib/XPROG/PDIProtocol.h b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.h similarity index 100% rename from Projects/AVRISP/Lib/XPROG/PDIProtocol.h rename to Projects/AVRISP/Lib/XPROG/XPROGProtocol.h diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile index 12f31546e2..196eb7951a 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 \