Update ModuleTest build test to enable new warnings supported in the latest Atmel...

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

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
index a4a7a84..2d99d56 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGProtocol.h
@@ -1,13 +1,13 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

 
   dean [at] fourwalledcubicle [dot] com
 
   dean [at] fourwalledcubicle [dot] com

-      www.fourwalledcubicle.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


@@ -42,15 +42,18 @@
                #include <stdio.h>
 
                #include <LUFA/Drivers/USB/USB.h>
                #include <stdio.h>
 
                #include <LUFA/Drivers/USB/USB.h>

-               #include <LUFA/Drivers/Peripheral/SerialStream.h>

 
                #include "../V2Protocol.h"
 
                #include "../V2Protocol.h"

-               #include "XPROGTarget.h"

                #include "XMEGANVM.h"
                #include "TINYNVM.h"
                #include "XMEGANVM.h"
                #include "TINYNVM.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))

+                       /* On the XPLAIN board, we only need PDI programming
+                          for the ATXMEGA128A1 - disable ISP to prevent hardware
+                          damage and force-enable XPROG.
+                        */

                        #undef ENABLE_ISP_PROTOCOL
 
                        #if !defined(ENABLE_XPROG_PROTOCOL)
                        #undef ENABLE_ISP_PROTOCOL
 
                        #if !defined(ENABLE_XPROG_PROTOCOL)


@@ -100,6 +103,7 @@
                #define XPRG_PARAM_EEPPAGESIZE              0x02
                #define XPRG_PARAM_NVMCMD_REG               0x03
                #define XPRG_PARAM_NVMCSR_REG               0x04
                #define XPRG_PARAM_EEPPAGESIZE              0x02
                #define XPRG_PARAM_NVMCMD_REG               0x03
                #define XPRG_PARAM_NVMCSR_REG               0x04

+               #define XPRG_PARAM_UNKNOWN_1                0x05

 
                #define XPRG_PROTOCOL_PDI                   0x00
                #define XPRG_PROTOCOL_JTAG                  0x01
 
                #define XPRG_PROTOCOL_PDI                   0x00
                #define XPRG_PROTOCOL_JTAG                  0x01


@@ -113,7 +117,6 @@
                extern uint16_t XPROG_Param_EEPageSize;
                extern uint8_t  XPROG_Param_NVMCSRRegAddr;
                extern uint8_t  XPROG_Param_NVMCMDRegAddr;
                extern uint16_t XPROG_Param_EEPageSize;
                extern uint8_t  XPROG_Param_NVMCSRRegAddr;
                extern uint8_t  XPROG_Param_NVMCMDRegAddr;

-               extern uint8_t  XPROG_SelectedProtocol;

 
        /* Function Prototypes: */
                void XPROGProtocol_SetMode(void);
 
        /* Function Prototypes: */
                void XPROGProtocol_SetMode(void);