Use immediate variable expansion in the second-deepest level makefile scripts to...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / XPROG / XPROGTarget.h

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 8d7181a..2df1e38 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2010.
+     Copyright (C) Dean Camera, 2012.

 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*
 
   dean [at] fourwalledcubicle [dot] com
            www.lufa-lib.org
 */
 
 /*

-  Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2012  Dean Camera (dean [at] fourwalledcubicle [dot] com)

 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted
 
   Permission to use, copy, modify, distribute, and sell this
   software and its documentation for any purpose is hereby granted


@@ -45,7 +45,8 @@
 
                #include "../V2Protocol.h"
                #include "XPROGProtocol.h"
 
                #include "../V2Protocol.h"
                #include "XPROGProtocol.h"

-
+               #include "Config/AppConfig.h"
+               

        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
                        #undef ENABLE_ISP_PROTOCOL
        /* Preprocessor Checks: */
                #if ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
                        #undef ENABLE_ISP_PROTOCOL


@@ -55,8 +56,8 @@
                        #endif
                #endif
 
                        #endif
                #endif
 

-               /** Serial carrier TPI/PDI speed when hardware TPI/PDI mode is used. */
-               #define XPROG_HARDWARE_SPEED       500000
+               /** Serial carrier TPI/PDI speed in Hz, when hardware TPI/PDI mode is used. */
+               #define XPROG_HARDWARE_SPEED       250000

 
                /** Total number of bits in a single USART frame. */
                #define BITS_IN_USART_FRAME        12
 
                /** Total number of bits in a single USART frame. */
                #define BITS_IN_USART_FRAME        12


@@ -115,7 +116,7 @@
                void    XPROGTarget_DisableTargetTPI(void);
                void    XPROGTarget_SendByte(const uint8_t Byte);
                uint8_t XPROGTarget_ReceiveByte(void);
                void    XPROGTarget_DisableTargetTPI(void);
                void    XPROGTarget_SendByte(const uint8_t Byte);
                uint8_t XPROGTarget_ReceiveByte(void);

-               void    XPROGTarget_SendBreak(void);
+               void    XPROGTarget_SendIdle(void);

                bool    XPROGTarget_WaitWhileNVMBusBusy(void);
 
                #if (defined(INCLUDE_FROM_XPROGTARGET_C) && defined(ENABLE_XPROG_PROTOCOL))
                bool    XPROGTarget_WaitWhileNVMBusBusy(void);
 
                #if (defined(INCLUDE_FROM_XPROGTARGET_C) && defined(ENABLE_XPROG_PROTOCOL))