Rename incorrectly named XPROGTarget_SendBreak() function to XPROGTarget_SendIdle...

diff --git a/LUFA/ManPages/FutureChanges.txt b/LUFA/ManPages/FutureChanges.txt
index 66ff8af..aee1f17 100644 (file)
--- a/LUFA/ManPages/FutureChanges.txt
+++ b/LUFA/ManPages/FutureChanges.txt
@@ -20,7 +20,6 @@
   *      -# Re-add interrupt Pipe/Endpoint support
   *      -# Add HID report macros to make HID report editing easier
   *      -# Investigate dynamically created device descriptors
   *      -# Re-add interrupt Pipe/Endpoint support
   *      -# Add HID report macros to make HID report editing easier
   *      -# Investigate dynamically created device descriptors

-  *      -# Add new event for EVENT_USB_Device_ControlRequest() fired before the internal library request handlers

   *  - Documentation/Support
   *      -# Add detailed overviews of how each demo works
   *      -# Add board overviews
   *  - Documentation/Support
   *      -# Add detailed overviews of how each demo works
   *      -# Add board overviews

diff --git a/Projects/AVRISP-MKII/Lib/V2Protocol.h b/Projects/AVRISP-MKII/Lib/V2Protocol.h
index 10b9d14..9af7103 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2Protocol.h
+++ b/Projects/AVRISP-MKII/Lib/V2Protocol.h
@@ -37,6 +37,9 @@
 #define _V2_PROTOCOL_
 
        /* Includes: */
 #define _V2_PROTOCOL_
 
        /* Includes: */

+               #include <avr/io.h>
+               #include <avr/interrupt.h>
+       

                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../Descriptors.h"
                #include <LUFA/Drivers/USB/USB.h>
 
                #include "../Descriptors.h"

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 9be78d0..ae292a0 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -59,9 +59,9 @@ void XPROGTarget_EnableTargetPDI(void)
        UCSR1B = (1 << TXEN1);
        UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 
        UCSR1B = (1 << TXEN1);
        UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 

-       /* Send two BREAKs of 12 bits each to enable PDI interface (need at least 16 idle bits) */
-       XPROGTarget_SendBreak();
-       XPROGTarget_SendBreak();
+       /* Send two IDLEs of 12 bits each to enable PDI interface (need at least 16 idle bits) */
+       XPROGTarget_SendIdle();
+       XPROGTarget_SendIdle();

 }
 
 /** Enables the target's TPI interface, holding the target in reset until TPI mode is exited. */
 }
 
 /** Enables the target's TPI interface, holding the target in reset until TPI mode is exited. */


@@ -83,9 +83,9 @@ void XPROGTarget_EnableTargetTPI(void)
        UCSR1B = (1 << TXEN1);
        UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 
        UCSR1B = (1 << TXEN1);
        UCSR1C = (1 << UMSEL10) | (1 << UPM11) | (1 << USBS1) | (1 << UCSZ11) | (1 << UCSZ10) | (1 << UCPOL1);
 

-       /* Send two BREAKs of 12 bits each to enable TPI interface (need at least 16 idle bits) */
-       XPROGTarget_SendBreak();
-       XPROGTarget_SendBreak();
+       /* Send two IDLEs of 12 bits each to enable TPI interface (need at least 16 idle bits) */
+       XPROGTarget_SendIdle();
+       XPROGTarget_SendIdle();

 }
 
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */
 }
 
 /** Disables the target's PDI interface, exits programming mode and starts the target's application. */


@@ -156,14 +156,14 @@ uint8_t XPROGTarget_ReceiveByte(void)
        return UDR1;
 }
 
        return UDR1;
 }
 

-/** Sends a BREAK via the USART to the attached target, consisting of a full frame of idle bits. */
-void XPROGTarget_SendBreak(void)
+/** Sends an IDLE via the USART to the attached target, consisting of a full frame of idle bits. */
+void XPROGTarget_SendIdle(void)

 {
        /* Switch to Tx mode if currently in Rx mode */
        if (!(IsSending))
          XPROGTarget_SetTxMode();
 {
        /* Switch to Tx mode if currently in Rx mode */
        if (!(IsSending))
          XPROGTarget_SetTxMode();

-
-       /* Need to do nothing for a full frame to send a BREAK */
+       
+       /* Need to do nothing for a full frame to send an IDLE */

        for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++)
        {
                /* Wait for a full cycle of the clock */
        for (uint8_t i = 0; i < BITS_IN_USART_FRAME; i++)
        {
                /* Wait for a full cycle of the clock */

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
index 9f51b27..8a8f397 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.h
@@ -115,7 +115,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))