Get rid of the redundant ATTR_NEVER_INLINE macro which translated to the same as...

[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 4b7e189..568163f 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.h
@@ -1,24 +1,24 @@
 /*
              LUFA Library
 /*
              LUFA Library

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

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

 
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   all copies and that both that the copyright notice and this

-  permission notice and warranty disclaimer appear in supporting 
-  documentation, and that the name of the author not be used in 
-  advertising or publicity pertaining to distribution of the 
+  permission notice and warranty disclaimer appear in supporting
+  documentation, and that the name of the author not be used in
+  advertising or publicity pertaining to distribution of the

   software without specific, written prior permission.
 
   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


@@ -40,15 +40,14 @@
                #include <avr/io.h>
                #include <avr/eeprom.h>
 
                #include <avr/io.h>
                #include <avr/eeprom.h>
 

-               #include <LUFA/Version.h>
-

                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.h>
                #endif
                #if defined(ADC)
                        #include <LUFA/Drivers/Peripheral/ADC.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. */


@@ -56,10 +55,16 @@
 
                /** Parameter privilege mask to allow the host PC to change the parameter's value. */
                #define PARAM_PRIV_WRITE    (1 << 1)
 
                /** Parameter privilege mask to allow the host PC to change the parameter's value. */
                #define PARAM_PRIV_WRITE    (1 << 1)

-               
+

                /** 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 (!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   0x17
+               #endif
+

        /* Type Defines: */
                /** Type define for a parameter table entry indicating a PC readable or writable device parameter. */
                typedef struct
        /* Type Defines: */
                /** Type define for a parameter table entry indicating a PC readable or writable device parameter. */
                typedef struct


@@ -72,14 +77,14 @@
        /* Function Prototypes: */
                void    V2Params_LoadNonVolatileParamValues(void);
                void    V2Params_UpdateParamValues(void);
        /* Function Prototypes: */
                void    V2Params_LoadNonVolatileParamValues(void);
                void    V2Params_UpdateParamValues(void);

-       
+

                uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID);
                uint8_t V2Params_GetParameterValue(const uint8_t ParamID);
                void    V2Params_SetParameterValue(const uint8_t ParamID,
                                                   const uint8_t Value);
                uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID);
                uint8_t V2Params_GetParameterValue(const uint8_t ParamID);
                void    V2Params_SetParameterValue(const uint8_t ParamID,
                                                   const uint8_t Value);

-               
+

                #if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)
                #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