From cd0093a14bd12d61ceab6860341c1a1fcd0ebb04 Mon Sep 17 00:00:00 2001 From: Dean Camera Date: Thu, 13 May 2010 09:25:17 +0000 Subject: Fixed AVRISP-MKII clone project not correctly issuing SET EXTENDED ADDRESS commands when the extended address boundary is crossed during programming or readback (thanks to Gerard Sexton). Fixed warnings when building the AVRISP-MKII clone project with the ENABLE_XPROG_PROTOCOL compile time option disabled. --- Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h | 2 +- Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h | 2 +- Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Projects/AVRISP-MKII/Lib/XPROG') diff --git a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h index 73bf1f953..2daca16fc 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/TINYNVM.h @@ -68,7 +68,7 @@ bool TINYNVM_WriteMemory(const uint16_t WriteAddress, uint8_t* WriteBuffer, uint16_t WriteLength); bool TINYNVM_EraseMemory(const uint8_t EraseCommand, const uint16_t Address); - #if defined(INCLUDE_FROM_TINYNVM_C) + #if (defined(INCLUDE_FROM_TINYNVM_C) && defined(ENABLE_XPROG_PROTOCOL)) static void TINYNVM_SendReadNVMRegister(const uint8_t Address); static void TINYNVM_SendWriteNVMRegister(const uint8_t Address); static void TINYNVM_SendPointerAddress(const uint16_t AbsoluteAddress); diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h index 1fdb5a1b8..c812578e5 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h @@ -119,7 +119,7 @@ void XPROGProtocol_SetMode(void); void XPROGProtocol_Command(void); - #if defined(INCLUDE_FROM_XPROGPROTOCOL_C) + #if (defined(INCLUDE_FROM_XPROGPROTOCOL_C) && defined(ENABLE_XPROG_PROTOCOL)) static void XPROGProtocol_EnterXPROGMode(void); static void XPROGProtocol_LeaveXPROGMode(void); static void XPROGProtocol_SetParam(void); diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h index 436f0f30d..db233a1a4 100644 --- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h +++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h @@ -118,7 +118,7 @@ void XPROGTarget_SendBreak(void); bool XPROGTarget_WaitWhileNVMBusBusy(void); - #if defined(INCLUDE_FROM_XPROGTARGET_C) + #if (defined(INCLUDE_FROM_XPROGTARGET_C) && defined(ENABLE_XPROG_PROTOCOL)) static void XPROGTarget_SetTxMode(void); static void XPROGTarget_SetRxMode(void); #endif -- cgit v1.2.3