Add missing include to the USB driver core mode header file.

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

diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
index f4ab2bd..135521a 100644 (file)
--- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
+++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c
@@ -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


@@ -37,10 +37,10 @@
 #include "V2ProtocolParams.h"
 
 /* Non-Volatile Parameter Values for EEPROM storage */
 #include "V2ProtocolParams.h"
 
 /* Non-Volatile Parameter Values for EEPROM storage */

-uint8_t EEMEM EEPROM_Rest_Polarity = 0x00;
+static uint8_t EEMEM EEPROM_Reset_Polarity = 0x01;

 
 /* Volatile Parameter Values for RAM storage */
 
 /* Volatile Parameter Values for RAM storage */

-static ParameterItem_t ParameterTable[] = 
+static ParameterItem_t ParameterTable[] =

        {
                { .ParamID          = PARAM_BUILD_NUMBER_LOW,
                  .ParamPrivileges  = PARAM_PRIV_READ,
        {
                { .ParamID          = PARAM_BUILD_NUMBER_LOW,
                  .ParamPrivileges  = PARAM_PRIV_READ,


@@ -60,26 +60,26 @@ static ParameterItem_t ParameterTable[] =
 
                { .ParamID          = PARAM_SW_MINOR,
                  .ParamPrivileges  = PARAM_PRIV_READ,
 
                { .ParamID          = PARAM_SW_MINOR,
                  .ParamPrivileges  = PARAM_PRIV_READ,

-                 .ParamValue       = 0x0D                               },
+                 .ParamValue       = FIRMWARE_VERSION_MINOR             },

 
                { .ParamID          = PARAM_VTARGET,
                  .ParamPrivileges  = PARAM_PRIV_READ,
 
                { .ParamID          = PARAM_VTARGET,
                  .ParamPrivileges  = PARAM_PRIV_READ,

-                 .ParamValue       = 0x32                               },
+                 .ParamValue       = (uint8_t)(3.3 * 10)                },

 
                { .ParamID          = PARAM_SCK_DURATION,
                  .ParamPrivileges  = PARAM_PRIV_READ | PARAM_PRIV_WRITE,
                  .ParamValue       = 6                                  },
 
                { .ParamID          = PARAM_RESET_POLARITY,
 
                { .ParamID          = PARAM_SCK_DURATION,
                  .ParamPrivileges  = PARAM_PRIV_READ | PARAM_PRIV_WRITE,
                  .ParamValue       = 6                                  },
 
                { .ParamID          = PARAM_RESET_POLARITY,

-                 .ParamPrivileges  = PARAM_PRIV_WRITE,
-                 .ParamValue       = 0x00                               },
+                 .ParamPrivileges  = PARAM_PRIV_READ | PARAM_PRIV_WRITE,
+                 .ParamValue       = 0x01                               },

 
                { .ParamID          = PARAM_STATUS_TGT_CONN,
                  .ParamPrivileges  = PARAM_PRIV_READ,
                  .ParamValue       = STATUS_ISP_READY                   },
 
                { .ParamID          = PARAM_DISCHARGEDELAY,
 
                { .ParamID          = PARAM_STATUS_TGT_CONN,
                  .ParamPrivileges  = PARAM_PRIV_READ,
                  .ParamValue       = STATUS_ISP_READY                   },
 
                { .ParamID          = PARAM_DISCHARGEDELAY,

-                 .ParamPrivileges  = PARAM_PRIV_WRITE,
+                 .ParamPrivileges  = PARAM_PRIV_READ | PARAM_PRIV_WRITE,

                  .ParamValue       = 0x00                               },
        };
 
                  .ParamValue       = 0x00                               },
        };
 


@@ -88,7 +88,7 @@ static ParameterItem_t ParameterTable[] =
 void V2Params_LoadNonVolatileParamValues(void)
 {
        /* Target RESET line polarity is a non-volatile value, retrieve current parameter value from EEPROM */
 void V2Params_LoadNonVolatileParamValues(void)
 {
        /* Target RESET line polarity is a non-volatile value, retrieve current parameter value from EEPROM */

-       V2Params_GetParamFromTable(PARAM_RESET_POLARITY)->ParamValue = eeprom_read_byte(&EEPROM_Rest_Polarity);
+       V2Params_GetParamFromTable(PARAM_RESET_POLARITY)->ParamValue = eeprom_read_byte(&EEPROM_Reset_Polarity);

 }
 
 /** Updates any parameter values that are sourced from hardware rather than explicitly set by the host, such as
 }
 
 /** Updates any parameter values that are sourced from hardware rather than explicitly set by the host, such as


@@ -108,12 +108,12 @@ void V2Params_UpdateParamValues(void)
  *
  *  \param[in] ParamID  Parameter ID whose privileges are to be retrieved from the table
  *
  *
  *  \param[in] ParamID  Parameter ID whose privileges are to be retrieved from the table
  *

- *  \return Privileges for the requested parameter, as a mask of PARAM_PRIV_* masks
- */ 
+ *  \return Privileges for the requested parameter, as a mask of \c PARAM_PRIV_* masks
+ */

 uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID)
 {
        ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
 uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID)
 {
        ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);

-       
+

        if (ParamInfo == NULL)
          return 0;
 
        if (ParamInfo == NULL)
          return 0;
 


@@ -129,14 +129,14 @@ uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID)
  *  \param[in] ParamID  Parameter ID whose value is to be retrieved from the table
  *
  *  \return Current value of the parameter in the table, or 0 if not found
  *  \param[in] ParamID  Parameter ID whose value is to be retrieved from the table
  *
  *  \return Current value of the parameter in the table, or 0 if not found

- */ 
+ */

 uint8_t V2Params_GetParameterValue(const uint8_t ParamID)
 {
        ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
 uint8_t V2Params_GetParameterValue(const uint8_t ParamID)
 {
        ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);

-       
+

        if (ParamInfo == NULL)
          return 0;
        if (ParamInfo == NULL)
          return 0;

-       
+

        return ParamInfo->ParamValue;
 }
 
        return ParamInfo->ParamValue;
 }
 


@@ -163,7 +163,7 @@ void V2Params_SetParameterValue(const uint8_t ParamID,
 
        /* The target RESET line polarity is a non-volatile parameter, save to EEPROM when changed */
        if (ParamID == PARAM_RESET_POLARITY)
 
        /* The target RESET line polarity is a non-volatile parameter, save to EEPROM when changed */
        if (ParamID == PARAM_RESET_POLARITY)

-         eeprom_update_byte(&EEPROM_Rest_Polarity, Value);  
+         eeprom_update_byte(&EEPROM_Reset_Polarity, Value);

 }
 
 /** Retrieves a parameter entry (including ID, value and privileges) from the parameter table that matches the given
 }
 
 /** Retrieves a parameter entry (including ID, value and privileges) from the parameter table that matches the given


@@ -182,9 +182,10 @@ static ParameterItem_t* V2Params_GetParamFromTable(const uint8_t ParamID)
        {
                if (ParamID == CurrTableItem->ParamID)
                  return CurrTableItem;
        {
                if (ParamID == CurrTableItem->ParamID)
                  return CurrTableItem;

-               
+

                CurrTableItem++;
        }
 
        return NULL;
 }
                CurrTableItem++;
        }
 
        return NULL;
 }

+