diff options
Diffstat (limited to 'Projects/AVRISP/Lib')
-rw-r--r-- | Projects/AVRISP/Lib/V2Protocol.c | 16 | ||||
-rw-r--r-- | Projects/AVRISP/Lib/V2ProtocolParams.c | 36 | ||||
-rw-r--r-- | Projects/AVRISP/Lib/V2ProtocolParams.h | 32 | ||||
-rw-r--r-- | Projects/AVRISP/Lib/V2ProtocolTarget.c | 4 |
4 files changed, 44 insertions, 44 deletions
diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c index d7343aad6..d03bd8924 100644 --- a/Projects/AVRISP/Lib/V2Protocol.c +++ b/Projects/AVRISP/Lib/V2Protocol.c @@ -36,12 +36,12 @@ #define INCLUDE_FROM_V2PROTOCOL_C
#include "V2Protocol.h"
-/** Master V2 Protocol packet handler, for receieved V2 Protocol packets from a connected host.
+/** Master V2 Protocol packet handler, for received V2 Protocol packets from a connected host.
* This routine decodes the issued command and passes off the handling of the command to the
* appropriate function.
*/
-void V2Protocol_ProcessCommand(void) -{ +void V2Protocol_ProcessCommand(void)
+{
uint8_t V2Command = Endpoint_Read_Byte();
switch (V2Command)
@@ -95,8 +95,8 @@ void V2Protocol_ProcessCommand(void) }
Endpoint_WaitUntilReady();
- Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT); -} + Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);
+}
/** Handler for unknown V2 protocol commands. This discards all sent data and returns a
* STATUS_CMD_UNKNOWN status back to the host.
@@ -105,7 +105,7 @@ void V2Protocol_ProcessCommand(void) */
static void V2Protocol_Command_Unknown(uint8_t V2Command)
{
- /* Discard all incomming data */
+ /* Discard all incoming data */
while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)
{
Endpoint_ClearOUT();
@@ -120,7 +120,7 @@ static void V2Protocol_Command_Unknown(uint8_t V2Command) Endpoint_ClearIN();
}
-/** Handler for the CMD_SIGN_ON command, returning the programmer ID string to the host. */ +/** Handler for the CMD_SIGN_ON command, returning the programmer ID string to the host. */
static void V2Protocol_Command_SignOn(void)
{
Endpoint_ClearOUT();
@@ -151,7 +151,7 @@ static void V2Protocol_Command_GetSetParam(uint8_t V2Command) Endpoint_Write_Byte(V2Command);
- uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);
+ uint8_t ParamPrivs = V2Params_GetParameterPrivileges(ParamID);
if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))
{
diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.c b/Projects/AVRISP/Lib/V2ProtocolParams.c index 6b4568a94..62149b4c3 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 },
+ .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 },
+ .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 },
};
@@ -104,22 +104,22 @@ 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[in] 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(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.
@@ -132,7 +132,7 @@ uint8_t V2Params_GetParameterValue(uint8_t ParamID) {
ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
- if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivellages & PARAM_PRIV_READ))
+ if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivileges & PARAM_PRIV_READ))
return 0;
return ParamInfo->ParamValue;
@@ -149,7 +149,7 @@ void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value) {
ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
- if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivellages & PARAM_PRIV_WRITE))
+ if ((ParamInfo == NULL) || !(ParamInfo->ParamPrivileges & PARAM_PRIV_WRITE))
return;
ParamInfo->ParamValue = Value;
@@ -159,7 +159,7 @@ 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[in] ParamID Parameter ID to find in the table
diff --git a/Projects/AVRISP/Lib/V2ProtocolParams.h b/Projects/AVRISP/Lib/V2ProtocolParams.h index 9ad84e7a3..b27a4ea94 100644 --- a/Projects/AVRISP/Lib/V2ProtocolParams.h +++ b/Projects/AVRISP/Lib/V2ProtocolParams.h @@ -33,14 +33,14 @@ * Header file for V2ProtocolParams.c.
*/
-#ifndef _V2_PROTOCOL_PARAMS_ -#define _V2_PROTOCOL_PARAMS_ - - /* Includes: */ +#ifndef _V2_PROTOCOL_PARAMS_
+#define _V2_PROTOCOL_PARAMS_
+
+ /* Includes: */
#include <avr/io.h>
- #include <avr/eeprom.h> + #include <avr/eeprom.h>
- #include <LUFA/Version.h> + #include <LUFA/Version.h>
#if defined(ADC)
#include <LUFA/Drivers/Peripheral/ADC.h>
@@ -50,32 +50,32 @@ #include "V2ProtocolConstants.h"
/* Macros: */
- /** Parameter privellage mask to allow the host PC to read the parameter's value */
+ /** Parameter privilege mask to allow the host PC to read the parameter's value */
#define PARAM_PRIV_READ (1 << 0)
- /** Parameter privellage mask to allow the host PC to change the parameter's value */
+ /** Parameter privilege mask to allow the host PC to change the parameter's value */
#define PARAM_PRIV_WRITE (1 << 1)
- +
/* Type Defines: */
/** Type define for a parameter table entry indicating a PC readable or writable device parameter. */
typedef struct
{
const uint8_t ParamID; /**< Parameter ID number to uniquely identify the parameter within the device */
uint8_t ParamValue; /**< Current parameter's value within the device */
- uint8_t ParamPrivellages; /**< Parameter privellages to allow the host to read or write the parameter's value */
- } ParameterItem_t; - + uint8_t ParamPrivileges; /**< Parameter privileges to allow the host to read or write the parameter's value */
+ } ParameterItem_t;
+
/* Function Prototypes: */
void V2Params_LoadNonVolatileParamValues(void);
void V2Params_UpdateParamValues(void);
- uint8_t V2Params_GetParameterPrivellages(uint8_t ParamID);
+ uint8_t V2Params_GetParameterPrivileges(uint8_t ParamID);
uint8_t V2Params_GetParameterValue(uint8_t ParamID);
void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value);
#if defined(INCLUDE_FROM_V2PROTOCOL_PARAMS_C)
static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID);
#endif
- -#endif - +
+#endif
+
diff --git a/Projects/AVRISP/Lib/V2ProtocolTarget.c b/Projects/AVRISP/Lib/V2ProtocolTarget.c index 169e49ac7..80e8be1e8 100644 --- a/Projects/AVRISP/Lib/V2ProtocolTarget.c +++ b/Projects/AVRISP/Lib/V2ProtocolTarget.c @@ -45,7 +45,7 @@ uint32_t CurrentAddress; */
uint8_t V2Protocol_GetSPIPrescalerMask(void)
{
- static const uint8_t SPIMaskFromSCKDuration[TOTAL_PROGRAMMING_SPEEDS] =
+ static const uint8_t SPIMaskFromSCKDuration[] =
{
#if (F_CPU == 8000000)
SPI_SPEED_FCPU_DIV_2, // AVRStudio = 8MHz SPI, Actual = 4MHz SPI
@@ -77,7 +77,7 @@ uint8_t V2Protocol_GetSPIPrescalerMask(void) }
/** Asserts or deasserts the target's reset line, using the correct polarity as set by the host using a SET PARAM command.
- * When not asserted, the line is tristated so as not to intefere with normal device operation.
+ * When not asserted, the line is tristated so as not to interfere with normal device operation.
*
* \param[in] ResetTarget Boolean true when the target should be held in reset, false otherwise
*/
|