diff options
| author | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-23 14:52:52 +0000 |
|---|---|---|
| committer | Dean Camera <dean@fourwalledcubicle.com> | 2009-12-23 14:52:52 +0000 |
| commit | 26bc1f3cfdf1aa44d08d12f0985bd214c396d315 (patch) | |
| tree | bcd99455c89565f8c6bb60ebbcf0cab4fc894b1a /Projects | |
| parent | 31d7194252cdde340fa874c258e257312cb3ba8f (diff) | |
| download | lufa-26bc1f3cfdf1aa44d08d12f0985bd214c396d315.tar.gz lufa-26bc1f3cfdf1aa44d08d12f0985bd214c396d315.tar.bz2 lufa-26bc1f3cfdf1aa44d08d12f0985bd214c396d315.zip | |
Correct include paths and makefile for the AVRISP project now that the protocol handlers are in seperate directories.
Diffstat (limited to 'Projects')
| -rw-r--r-- | Projects/AVRISP/Lib/ISP/ISPProtocol.h | 4 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/ISP/ISPTarget.h | 4 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/PDI/PDIProtocol.h | 4 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/TPI/TPIProtocol.h | 5 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/V2Protocol.h | 6 | ||||
| -rw-r--r-- | Projects/AVRISP/Lib/V2ProtocolParams.h | 2 | ||||
| -rw-r--r-- | Projects/AVRISP/makefile | 16 |
7 files changed, 22 insertions, 19 deletions
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 <avr/io.h>
- #include "V2Protocol.h"
+ #include <LUFA/Drivers/USB/USB.h>
+
+ #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 <LUFA/Drivers/USB/USB.h>
#include <LUFA/Drivers/Peripheral/SPI.h>
- #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 <avr/io.h>
#include <util/delay.h>
#include <stdio.h>
+
+ #include <LUFA/Drivers/USB/USB.h>
- #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 <avr/io.h>
#include <util/delay.h>
#include <stdio.h>
-
- #include "V2Protocol.h"
+ + #include <LUFA/Drivers/USB/USB.h>
+
#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 \
|