Fixed broken USE_RAM_DESCRIPTORS compile time option when the FIXED_NUM_CONFIGURATION...

[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 9ad1f05..a1a8ed4 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, 2012.
+     Copyright (C) Dean Camera, 2015.

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

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


@@ -48,7 +48,7 @@
                #include "V2ProtocolConstants.h"
                #include "ISP/ISPTarget.h"
                #include "Config/AppConfig.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. */
                #define PARAM_PRIV_READ     (1 << 0)
        /* Macros: */
                /** Parameter privilege mask to allow the host PC to read the parameter's value. */
                #define PARAM_PRIV_READ     (1 << 0)


@@ -58,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 (!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. */
                #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   0x11
+                       #define FIRMWARE_VERSION_MINOR   0x18

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


@@ -84,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