Allow the title of top level pages to be overridden in the Atmel Studio help.

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

diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
index 4ef091c..09c092d 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.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,23 +37,17 @@
 #define _V2_PROTOCOL_PARAMS_
 
        /* Includes: */
 #define _V2_PROTOCOL_PARAMS_
 
        /* Includes: */

-               #include <LUFA/Common/Common.h>
-               #include <LUFA/Version.h>
+               #include <avr/io.h>
+               #include <avr/eeprom.h>

 
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 
 
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
 

-               #if (ARCH == ARCH_AVR8)
-                       #include <avr/io.h>
-                       #include <avr/eeprom.h>
-               #elif (ARCH == ARCH_UC3)
-                       #include <avr32/io.h>           
-               #endif
-

                #include "V2Protocol.h"
                #include "V2ProtocolConstants.h"
                #include "ISP/ISPTarget.h"
                #include "V2Protocol.h"
                #include "V2ProtocolConstants.h"
                #include "ISP/ISPTarget.h"

+               #include "Config/AppConfig.h"

 
        /* Macros: */
                /** Parameter privilege mask to allow the host PC to read the parameter's value. */
 
        /* Macros: */
                /** Parameter privilege mask to allow the host PC to read the parameter's value. */


@@ -64,11 +58,11 @@
 
                /** Total number of parameters in the parameter table */
                #define TABLE_PARAM_COUNT   (sizeof(ParameterTable) / sizeof(ParameterTable[0]))
 
                /** Total number of parameters in the parameter table */
                #define TABLE_PARAM_COUNT   (sizeof(ParameterTable) / sizeof(ParameterTable[0]))

-               
-               #if (ARCH == ARCH_UC3) // TODO: FIXME
-                       #define EEMEM
-                       #define eeprom_read_byte(x) *x
-                       #define eeprom_update_byte(x,y) *x=y
+
+               #if (!defined(FIRMWARE_VERSION_MINOR) || defined(__DOXYGEN__))
+                       /** Minor firmware version, reported to the host on request; must match the version
+                        *  the host is expecting, or it (may) reject further communications with the programmer. */
+                       #define FIRMWARE_VERSION_MINOR   0x16

                #endif
 
        /* Type Defines: */
                #endif
 
        /* Type Defines: */


@@ -90,7 +84,7 @@
                                                   const uint8_t Value);
 
                #if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)
                                                   const uint8_t Value);
 
                #if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)

-                       static ParameterItem_t* V2Params_GetParamFromTable(const uint8_t ParamID);
+                       static ParameterItem_t* const V2Params_GetParamFromTable(const uint8_t ParamID);

                #endif
 
 #endif
                #endif
 
 #endif