Fixed incorrect USB device state set when a suspended LUFA device is woken while...

[pub/USBasp.git] / Projects / AVRISP-MKII / Lib / ISP / ISPTarget.h

diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
index e183dee..72ec0b1 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
+++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

-     Copyright (C) Dean Camera, 2011.
+     Copyright (C) Dean Camera, 2013.

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

-  Copyright 2011  Dean Camera (dean [at] fourwalledcubicle [dot] com)
+  Copyright 2013  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


@@ -18,7 +18,7 @@
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 
   advertising or publicity pertaining to distribution of the
   software without specific, written prior permission.
 

-  The author disclaim all warranties with regard to this
+  The author disclaims all warranties with regard to this

   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages
   software, including all implied warranties of merchantability
   and fitness.  In no event shall the author be liable for any
   special, indirect or consequential damages or any damages


@@ -37,21 +37,16 @@
 #define _ISP_TARGET_
 
        /* Includes: */
 #define _ISP_TARGET_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
+               #include <avr/io.h>
+               #include <avr/pgmspace.h>
+               #include <util/delay.h>
+

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

-               
-               #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)
-                       #include <LUFA/Drivers/Peripheral/SPI.h> // TODO: FIXME
-               #endif
-               
-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/io.h>
-                       #include <avr/pgmspace.h>
-               #elif (ARCH == ARCH_UC3)
-                       #include <avr32/io.h>                   
-               #endif
+               #include <LUFA/Drivers/Peripheral/SPI.h>

 
 

-               #include "../V2ProtocolParams.h"
+               #include "../V2Protocol.h"
+               #include "ISPProtocol.h"
+               #include "Config/AppConfig.h"

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


@@ -63,7 +58,7 @@
                #endif
 
        /* Macros: */
                #endif
 
        /* Macros: */

-               /** Low level device command to issue an extended FLASH address, for devices with other 128KB of FLASH. */
+               /** Low level device command to issue an extended FLASH address, for devices with over 128KB of FLASH. */

                #define LOAD_EXTENDED_ADDRESS_CMD     0x4D
 
                /** Macro to convert an ISP frequency to a number of timer clock cycles for the software SPI driver. */
                #define LOAD_EXTENDED_ADDRESS_CMD     0x4D
 
                /** Macro to convert an ISP frequency to a number of timer clock cycles for the software SPI driver. */


@@ -79,7 +74,7 @@
                void    ISPTarget_EnableTargetISP(void);
                void    ISPTarget_DisableTargetISP(void);
                void    ISPTarget_ConfigureRescueClock(void);
                void    ISPTarget_EnableTargetISP(void);
                void    ISPTarget_DisableTargetISP(void);
                void    ISPTarget_ConfigureRescueClock(void);

-               void    ISPTarget_ConfigureSoftwareISP(const uint8_t SCKDuration);
+               void    ISPTarget_ConfigureSoftwareSPI(const uint8_t SCKDuration);

                uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte);
                void    ISPTarget_ChangeTargetResetLine(const bool ResetTarget);
                uint8_t ISPTarget_WaitWhileTargetBusy(void);
                uint8_t ISPTarget_TransferSoftSPIByte(const uint8_t Byte);
                void    ISPTarget_ChangeTargetResetLine(const bool ResetTarget);
                uint8_t ISPTarget_WaitWhileTargetBusy(void);


@@ -91,7 +86,6 @@
                                                      const uint8_t ReadMemCommand);
 
        /* Inline Functions: */
                                                      const uint8_t ReadMemCommand);
 
        /* Inline Functions: */

-               #if defined(ENABLE_ISP_PROTOCOL) || defined(__DOXYGEN__)

                /** Sends a byte of ISP data to the attached target, using the appropriate SPI hardware or
                 *  software routines depending on the selected ISP speed.
                 *
                /** Sends a byte of ISP data to the attached target, using the appropriate SPI hardware or
                 *  software routines depending on the selected ISP speed.
                 *


@@ -112,10 +106,18 @@
                 */
                static inline uint8_t ISPTarget_ReceiveByte(void)
                {
                 */
                static inline uint8_t ISPTarget_ReceiveByte(void)
                {

+                       uint8_t ReceivedByte;
+

                        if (HardwareSPIMode)
                        if (HardwareSPIMode)

-                         return SPI_ReceiveByte();
+                         ReceivedByte = SPI_ReceiveByte();

                        else
                        else

-                         return ISPTarget_TransferSoftSPIByte(0x00);
+                         ReceivedByte = ISPTarget_TransferSoftSPIByte(0x00);
+
+                       #if defined(INVERTED_ISP_MISO)
+                       return ~ReceivedByte;
+                       #else
+                       return  ReceivedByte;
+                       #endif

                }
 
                /** Sends and receives a byte of ISP data to and from the attached target, using the
                }
 
                /** Sends and receives a byte of ISP data to and from the attached target, using the


@@ -127,12 +129,19 @@
                 */
                static inline uint8_t ISPTarget_TransferByte(const uint8_t Byte)
                {
                 */
                static inline uint8_t ISPTarget_TransferByte(const uint8_t Byte)
                {

+                       uint8_t ReceivedByte;
+

                        if (HardwareSPIMode)
                        if (HardwareSPIMode)

-                         return SPI_TransferByte(Byte);
+                         ReceivedByte = SPI_TransferByte(Byte);

                        else
                        else

-                         return ISPTarget_TransferSoftSPIByte(Byte);
+                         ReceivedByte = ISPTarget_TransferSoftSPIByte(Byte);
+
+                       #if defined(INVERTED_ISP_MISO)
+                       return ~ReceivedByte;
+                       #else
+                       return  ReceivedByte;
+                       #endif

                }
                }

-               #endif

 
 #endif
 
 
 #endif