From 26bc1f3cfdf1aa44d08d12f0985bd214c396d315 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Wed, 23 Dec 2009 14:52:52 +0000 Subject: Correct include paths and makefile for the AVRISP project now that the protocol handlers are in seperate directories. --- Projects/AVRISP/Lib/ISP/ISPProtocol.h | 4 +++- Projects/AVRISP/Lib/ISP/ISPTarget.h | 4 +--- Projects/AVRISP/Lib/PDI/PDIProtocol.h | 4 +++- Projects/AVRISP/Lib/TPI/TPIProtocol.h | 5 +++-- Projects/AVRISP/Lib/V2Protocol.h | 6 +++--- Projects/AVRISP/Lib/V2ProtocolParams.h | 2 +- Projects/AVRISP/makefile | 16 ++++++++-------- 7 files changed, 22 insertions(+), 19 deletions(-) (limited to 'Projects/AVRISP') diff --git a/Projects/AVRISP/Lib/ISP/ISPProtocol.h b/Projects/AVRISP/Lib/ISP/ISPProtocol.h index 85a669a4e..caadf412a 100644 --- a/Projects/AVRISP/Lib/ISP/ISPProtocol.h +++ b/Projects/AVRISP/Lib/ISP/ISPProtocol.h @@ -39,7 +39,9 @@ /* Includes: */ #include - #include "V2Protocol.h" + #include + + #include "../V2Protocol.h" /* Preprocessor Checks: */ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) diff --git a/Projects/AVRISP/Lib/ISP/ISPTarget.h b/Projects/AVRISP/Lib/ISP/ISPTarget.h index 62d8bbb4b..a2641c089 100644 --- a/Projects/AVRISP/Lib/ISP/ISPTarget.h +++ b/Projects/AVRISP/Lib/ISP/ISPTarget.h @@ -43,9 +43,7 @@ #include #include - #include "../Descriptors.h" - #include "V2ProtocolConstants.h" - #include "V2ProtocolParams.h" + #include "../V2ProtocolParams.h" /* Preprocessor Checks: */ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) diff --git a/Projects/AVRISP/Lib/PDI/PDIProtocol.h b/Projects/AVRISP/Lib/PDI/PDIProtocol.h index c1fbef466..c3cafb4ec 100644 --- a/Projects/AVRISP/Lib/PDI/PDIProtocol.h +++ b/Projects/AVRISP/Lib/PDI/PDIProtocol.h @@ -40,8 +40,10 @@ #include #include #include + + #include - #include "V2Protocol.h" + #include "../V2Protocol.h" #include "PDITarget.h" #include "XMEGANVM.h" diff --git a/Projects/AVRISP/Lib/TPI/TPIProtocol.h b/Projects/AVRISP/Lib/TPI/TPIProtocol.h index 2b6849c1e..11894a333 100644 --- a/Projects/AVRISP/Lib/TPI/TPIProtocol.h +++ b/Projects/AVRISP/Lib/TPI/TPIProtocol.h @@ -40,8 +40,9 @@ #include #include #include - - #include "V2Protocol.h" + + #include + #include "TPITarget.h" #include "TINYNVM.h" diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h index ef4d2eb63..c7c1a7350 100644 --- a/Projects/AVRISP/Lib/V2Protocol.h +++ b/Projects/AVRISP/Lib/V2Protocol.h @@ -43,9 +43,9 @@ #include "../Descriptors.h" #include "V2ProtocolConstants.h" #include "V2ProtocolParams.h" - #include "ISPProtocol.h" - #include "PDIProtocol.h" - #include "TPIProtocol.h" + #include "ISP/ISPProtocol.h" + #include "PDI/PDIProtocol.h" + #include "TPI/TPIProtocol.h" /* Preprocessor Checks: */ #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1)) diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.h b/Projects/AVRISP/Lib/V2ProtocolParams.h index 428c1d467..14ff56c71 100644 --- a/Projects/AVRISP/Lib/V2ProtocolParams.h +++ b/Projects/AVRISP/Lib/V2ProtocolParams.h @@ -48,7 +48,7 @@ #include "V2Protocol.h" #include "V2ProtocolConstants.h" - #include "ISPTarget.h" + #include "ISP/ISPTarget.h" /* Macros: */ /** Parameter privilege mask to allow the host PC to read the parameter's value */ diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile index d0bce5b64..6f8ee4031 100644 --- a/Projects/AVRISP/makefile +++ b/Projects/AVRISP/makefile @@ -129,14 +129,14 @@ SRC = $(TARGET).c \ Descriptors.c \ Lib/V2Protocol.c \ Lib/V2ProtocolParams.c \ - Lib/ISPProtocol.c \ - Lib/ISPTarget.c \ - Lib/PDIProtocol.c \ - Lib/PDITarget.c \ - Lib/XMEGANVM.c \ - Lib/TPIProtocol.c \ - Lib/TPITarget.c \ - Lib/TINYNVM.c \ + Lib/ISP/ISPProtocol.c \ + Lib/ISP/ISPTarget.c \ + Lib/PDI/PDIProtocol.c \ + Lib/PDI/PDITarget.c \ + Lib/PDI/XMEGANVM.c \ + Lib/TPI/TPIProtocol.c \ + Lib/TPI/TPITarget.c \ + Lib/TPI/TINYNVM.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \ $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \ -- cgit v1.2.3