X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/244c86429b6eea1f86c5bcca070889d6adbc15b0..05fcf7e2a79bebb978d4aeaef26b12f70c6826f8:/Projects/AVRISP/Lib/V2ProtocolParams.c?ds=sidebyside

diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.c b/Projects/AVRISP/Lib/V2ProtocolParams.c
index 2d646a93c..6b7f84aa3 100644
--- a/Projects/AVRISP/Lib/V2ProtocolParams.c
+++ b/Projects/AVRISP/Lib/V2ProtocolParams.c
@@ -44,43 +44,43 @@ static ParameterItem_t ParameterTable[] =
 	{
 		{ .ParamID          = PARAM_BUILD_NUMBER_LOW,
 		  .ParamValue       = (LUFA_VERSION_INTEGER >> 8),
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_BUILD_NUMBER_HIGH,
 		  .ParamValue       = (LUFA_VERSION_INTEGER & 0xFF),
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_HW_VER,
 		  .ParamValue       = 0x00,
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_SW_MAJOR,
 		  .ParamValue       = 0x01,
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_SW_MINOR,
-		  .ParamValue       = 0x0C,
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamValue       = 0x0D,
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_VTARGET,
 		  .ParamValue       = 0x32,
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_SCK_DURATION,
-		  .ParamValue       = (TOTAL_PROGRAMMING_SPEEDS - 1),
-		  .ParamPrivellages = PARAM_PRIV_READ | PARAM_PRIV_WRITE },
+		  .ParamValue       = (TOTAL_ISP_PROGRAMMING_SPEEDS - 1),
+		  .ParamPrivileges  = PARAM_PRIV_READ | PARAM_PRIV_WRITE },
 
 		{ .ParamID          = PARAM_RESET_POLARITY,
 		  .ParamValue       = 0x00,
-		  .ParamPrivellages = PARAM_PRIV_WRITE                   },
+		  .ParamPrivileges  = PARAM_PRIV_WRITE                   },
 
 		{ .ParamID          = PARAM_STATUS_TGT_CONN,
 		  .ParamValue       = 0x00,
-		  .ParamPrivellages = PARAM_PRIV_READ                    },
+		  .ParamPrivileges  = PARAM_PRIV_READ                    },
 
 		{ .ParamID          = PARAM_DISCHARGEDELAY,
 		  .ParamValue       = 0x00,
-		  .ParamPrivellages = PARAM_PRIV_WRITE                   },
+		  .ParamPrivileges  = PARAM_PRIV_WRITE                   },
 	};
 
 
@@ -88,8 +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 -
-	 *   NB: Cannot call V2Protocol_SetParameterValue() here, as that will cause another EEPROM write!
-	 */
+	 *   NB: Cannot call V2Protocol_SetParameterValue() here, as that will cause another EEPROM write! */
 	V2Params_GetParamFromTable(PARAM_RESET_POLARITY)->ParamValue = eeprom_read_byte(&EEPROM_Rest_Polarity);
 }
 
@@ -104,35 +103,35 @@ void V2Params_UpdateParamValues(void)
 	#endif
 }
 
-/** Retrieves the host PC read/write privellages for a given parameter in the parameter table. This should
+/** Retrieves the host PC read/write privileges for a given parameter in the parameter table. This should
  *  be called before calls to \ref V2Params_GetParameterValue() or \ref V2Params_SetParameterValue() when
  *  getting or setting parameter values in response to requests from the host.
  *
- *  \param ParamID  Parameter ID whose privellages are to be retrieved from the table
+ *  \param[in] ParamID  Parameter ID whose privileges are to be retrieved from the table
  *
- *  \return Privellages for the requested parameter, as a mask of PARAM_PRIV_* masks
+ *  \return Privileges for the requested parameter, as a mask of PARAM_PRIV_* masks
  */ 
-uint8_t V2Params_GetParameterPrivellages(uint8_t ParamID)
+uint8_t V2Params_GetParameterPrivileges(const uint8_t ParamID)
 {
 	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
 	
 	if (ParamInfo == NULL)
 	  return 0;
 
-	return ParamInfo->ParamPrivellages;
+	return ParamInfo->ParamPrivileges;
 }
 
 /** Retrieves the current value for a given parameter in the parameter table.
  *
- *  \param ParamID  Parameter ID whose value is to be retrieved from the table
+ *  \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(uint8_t ParamID)
+uint8_t V2Params_GetParameterValue(const uint8_t ParamID)
 {
 	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
 	
-	if (ParamInfo == NULL)
+	if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivileges & PARAM_PRIV_READ))
 	  return 0;
 	
 	return ParamInfo->ParamValue;
@@ -140,16 +139,16 @@ uint8_t V2Params_GetParameterValue(uint8_t ParamID)
 
 /** Sets the value for a given parameter in the parameter table.
  *
- *  \param ParamID  Parameter ID whose value is to be set in the table
- *  \param Value  New value to set the parameter to
+ *  \param[in] ParamID  Parameter ID whose value is to be set in the table
+ *  \param[in] Value    New value to set the parameter to
  *
  *  \return Pointer to the associated parameter information from the parameter table if found, NULL otherwise
  */
-void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value)
+void V2Params_SetParameterValue(const uint8_t ParamID, const uint8_t Value)
 {
 	ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
 
-	if (ParamInfo == NULL)
+	if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivileges & PARAM_PRIV_WRITE))
 	  return;
 
 	ParamInfo->ParamValue = Value;
@@ -159,14 +158,14 @@ void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value)
 	  eeprom_write_byte(&EEPROM_Rest_Polarity, Value);  
 }
 
-/** Retrieves a parameter entry (including ID, value and privellages) 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
  *  parameter ID.
  *
- *  \param ParamID  Parameter ID to find in the table
+ *  \param[in] ParamID  Parameter ID to find in the table
  *
  *  \return Pointer to the associated parameter information from the parameter table if found, NULL otherwise
  */
-static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID)
+static ParameterItem_t* V2Params_GetParamFromTable(const uint8_t ParamID)
 {
 	/* Find the parameter in the parameter table if present */
 	for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)
@@ -174,6 +173,6 @@ static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID)
 		if (ParamID == ParameterTable[TableIndex].ParamID)
 		  return &ParameterTable[TableIndex];
 	}
-	
+
 	return NULL;
 }