Moved out the handling of V2 Protocol parameters to a seperate set of files. Added parameter privellages, so that an error can be returned to the host when trying to perform a get/set value action on a parameter without the correct privellages.
parent
32cc2b8d4d
commit
fa8beef82d
File diff suppressed because one or more lines are too long
@ -0,0 +1,137 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in 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
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* V2Protocol parameter handler, to process V2 Protocol device parameters.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define INCLUDE_FROM_V2PROTOCOL_PARAMS_C
|
||||||
|
#include "V2ProtocolParams.h"
|
||||||
|
|
||||||
|
/* Non-Volatile Parameter Values for EEPROM storage */
|
||||||
|
uint8_t EEMEM EEPROM_Rest_Polarity;
|
||||||
|
|
||||||
|
/* Volatile Parameter Values for RAM storage */
|
||||||
|
static ParameterItem_t ParameterTable[] =
|
||||||
|
{
|
||||||
|
{ .ParamID = PARAM_BUILD_NUMBER_LOW,
|
||||||
|
.ParamValue = (LUFA_VERSION_INTEGER >> 8),
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_BUILD_NUMBER_HIGH,
|
||||||
|
.ParamValue = (LUFA_VERSION_INTEGER & 0xFF),
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_HW_VER,
|
||||||
|
.ParamValue = 0x01,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_SW_MAJOR,
|
||||||
|
.ParamValue = 0x01,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_SW_MINOR,
|
||||||
|
.ParamValue = 0x00,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_VTARGET,
|
||||||
|
.ParamValue = 0x00,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_SCK_DURATION,
|
||||||
|
.ParamValue = MAX_SPI_SETTINGS,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ | PARAM_PRIV_WRITE },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_RESET_POLARITY,
|
||||||
|
.ParamValue = 0x01,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_WRITE },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_STATUS_TGT_CONN,
|
||||||
|
.ParamValue = 0x00,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_READ },
|
||||||
|
|
||||||
|
{ .ParamID = PARAM_DISCHARGEDELAY,
|
||||||
|
.ParamValue = 0x00,
|
||||||
|
.ParamPrivellages = PARAM_PRIV_WRITE },
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
void V2Params_LoadEEPROMParamValues(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);
|
||||||
|
}
|
||||||
|
|
||||||
|
static ParameterItem_t* V2Params_GetParamFromTable(uint8_t ParamID)
|
||||||
|
{
|
||||||
|
/* Find the parameter in the parameter table if present */
|
||||||
|
for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)
|
||||||
|
{
|
||||||
|
if (ParamID == ParameterTable[TableIndex].ParamID)
|
||||||
|
return &ParameterTable[TableIndex];
|
||||||
|
}
|
||||||
|
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t V2Params_GetParameterPrivellages(uint8_t ParamID)
|
||||||
|
{
|
||||||
|
ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
|
||||||
|
|
||||||
|
if (ParamInfo == NULL)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return ParamInfo->ParamPrivellages;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t V2Params_GetParameterValue(uint8_t ParamID)
|
||||||
|
{
|
||||||
|
ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
|
||||||
|
|
||||||
|
if (ParamInfo == NULL)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
return ParamInfo->ParamValue;
|
||||||
|
}
|
||||||
|
|
||||||
|
void V2Params_SetParameterValue(uint8_t ParamID, uint8_t Value)
|
||||||
|
{
|
||||||
|
ParameterItem_t* ParamInfo = V2Params_GetParamFromTable(ParamID);
|
||||||
|
|
||||||
|
if (ParamInfo == NULL)
|
||||||
|
return;
|
||||||
|
|
||||||
|
ParamInfo->ParamValue = Value;
|
||||||
|
|
||||||
|
/* The target RESET line polarity is a non-volatile parameter, save to EEPROM when changed */
|
||||||
|
if (ParamID == PARAM_RESET_POLARITY)
|
||||||
|
eeprom_write_byte(&EEPROM_Rest_Polarity, Value);
|
||||||
|
}
|
@ -0,0 +1,72 @@
|
|||||||
|
/*
|
||||||
|
LUFA Library
|
||||||
|
Copyright (C) Dean Camera, 2009.
|
||||||
|
|
||||||
|
dean [at] fourwalledcubicle [dot] com
|
||||||
|
www.fourwalledcubicle.com
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com)
|
||||||
|
|
||||||
|
Permission to use, copy, modify, and distribute this software
|
||||||
|
and its documentation for any purpose and without fee is hereby
|
||||||
|
granted, provided that the above copyright notice appear in 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
|
||||||
|
software without specific, written prior permission.
|
||||||
|
|
||||||
|
The author disclaim 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
|
||||||
|
whatsoever resulting from loss of use, data or profits, whether
|
||||||
|
in an action of contract, negligence or other tortious action,
|
||||||
|
arising out of or in connection with the use or performance of
|
||||||
|
this software.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** \file
|
||||||
|
*
|
||||||
|
* Header file for V2ProtocolParams.c.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _V2_PROTOCOL_PARAMS_
|
||||||
|
#define _V2_PROTOCOL_PARAMS_
|
||||||
|
|
||||||
|
/* Includes: */
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/eeprom.h>
|
||||||
|
|
||||||
|
#include <LUFA/Version.h>
|
||||||
|
|
||||||
|
#include "V2Protocol.h"
|
||||||
|
#include "V2ProtocolConstants.h"
|
||||||
|
|
||||||
|
/* Macros: */
|
||||||
|
#define PARAM_PRIV_READ (1 << 0)
|
||||||
|
#define PARAM_PRIV_WRITE (1 << 1)
|
||||||
|
|
||||||
|
/* Type Defines: */
|
||||||
|
typedef struct
|
||||||
|
{
|
||||||
|
const uint8_t ParamID;
|
||||||
|
uint8_t ParamValue;
|
||||||
|
uint8_t ParamPrivellages;
|
||||||
|
} ParameterItem_t;
|
||||||
|
|
||||||
|
/* Function Prototypes: */
|
||||||
|
void V2Params_LoadEEPROMParamValues(void);
|
||||||
|
|
||||||
|
uint8_t V2Params_GetParameterPrivellages(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
|
||||||
|
|
Loading…
Reference in new issue