Moved out the handling of V2 Protocol parameters to a seperate set of files. Added...

[pub/lufa.git] / Projects / Unfinished / AVRISP / Lib / V2Protocol.c

diff --git a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
index 905214c..4038892 100644 (file)
--- a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
@@ -37,7 +37,7 @@
 #include "V2Protocol.h"\r
 \r
 /* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
 #include "V2Protocol.h"\r
 \r
 /* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r

-static const uint8_t SPIMaskFromSCKDuration[] =\r
+static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =\r

        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r
        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r


@@ -48,42 +48,13 @@ static const uint8_t SPIMaskFromSCKDuration[] =
                , SPI_SPEED_FCPU_DIV_128\r
                #endif\r
        };\r
                , SPI_SPEED_FCPU_DIV_128\r
                #endif\r
        };\r

-       \r
-/* Non-Volatile Parameter Values for EEPROM storage */\r
-uint8_t EEMEM EEPROM_Rest_Polarity;\r
-\r
-/* Volatile Parameter Values for RAM storage */\r
-static ParameterItem_t ParameterTable[] = \r
-       {\r
-               { .ParameterID    = PARAM_BUILD_NUMBER_LOW,\r
-                 .ParameterValue = (LUFA_VERSION_INTEGER >> 8)    },\r
-               { .ParameterID    = PARAM_BUILD_NUMBER_HIGH,\r
-                 .ParameterValue = (LUFA_VERSION_INTEGER & 0xFF)  },\r
-               { .ParameterID    = PARAM_HW_VER,\r
-                 .ParameterValue = 0x01                           },\r
-               { .ParameterID    = PARAM_SW_MAJOR,\r
-                 .ParameterValue = 0x01                           },\r
-               { .ParameterID    = PARAM_SW_MINOR,\r
-                 .ParameterValue = 0x00                           },\r
-               { .ParameterID    = PARAM_VTARGET,\r
-                 .ParameterValue = 0x00                           },\r
-               { .ParameterID    = PARAM_SCK_DURATION,\r
-                 .ParameterValue = sizeof(SPIMaskFromSCKDuration) },\r
-               { .ParameterID    = PARAM_RESET_POLARITY,\r
-                 .ParameterValue = 0x01                           },\r
-               { .ParameterID    = PARAM_STATUS_TGT_CONN,\r
-                 .ParameterValue = 0x00                           },\r
-               { .ParameterID    = PARAM_DISCHARGEDELAY,\r
-                 .ParameterValue = 0x00                           },\r
-       };\r
-\r

 \r
 static void V2Protocol_ReconfigureSPI(void)\r
 {\r
 \r
 static void V2Protocol_ReconfigureSPI(void)\r
 {\r

-       uint8_t SCKDuration = V2Protocol_GetParameter(PARAM_SCK_DURATION);\r
+       uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r

 \r
 \r

-       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
-         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
+       if (SCKDuration >= MAX_SPI_SETTINGS)\r
+         SCKDuration = (MAX_SPI_SETTINGS - 1);\r

          \r
        SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);    \r
 }\r
          \r
        SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);    \r
 }\r


@@ -94,7 +65,7 @@ static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
        {\r
                RESET_LINE_DDR  |= RESET_LINE_MASK;\r
                \r
        {\r
                RESET_LINE_DDR  |= RESET_LINE_MASK;\r
                \r

-               if (!(V2Protocol_GetParameter(PARAM_RESET_POLARITY)))\r
+               if (!(V2Params_GetParameterValue(PARAM_RESET_POLARITY)))\r

                  RESET_LINE_PORT |= RESET_LINE_MASK;\r
        }\r
        else\r
                  RESET_LINE_PORT |= RESET_LINE_MASK;\r
        }\r
        else\r


@@ -103,41 +74,6 @@ static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
                RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
        }\r
 }\r
                RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
        }\r
 }\r

-\r
-static uint8_t V2Protocol_GetParameter(uint8_t ParamID)\r
-{\r
-       /* Find the parameter in the parameter table and retrieve the value */\r
-       for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)\r
-       {\r
-               if (ParamID == ParameterTable[TableIndex].ParameterID)\r
-                 return ParameterTable[TableIndex].ParameterValue;\r
-       }\r
-       \r
-       return 0;\r
-}\r
-\r
-static void V2Protocol_SetParameter(uint8_t ParamID, uint8_t Value)\r
-{\r
-       /* The target RESET line polarity is a non-volatile parameter, save to EEPROM when changed */\r
-       if (ParamID == PARAM_RESET_POLARITY)\r
-         eeprom_write_byte(&EEPROM_Rest_Polarity, Value);\r
-\r
-       /* Find the parameter in the parameter table and store the new value */\r
-       for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)\r
-       {\r
-               if (ParamID == ParameterTable[TableIndex].ParameterID)\r
-               {\r
-                       ParameterTable[TableIndex].ParameterValue = Value;\r
-                       return;\r
-               }\r
-       }\r
-}\r
-\r
-void V2Protocol_Init(void)\r
-{\r
-       /* Target RESET line polarity is a non-volatile value, retrieve current parameter value from EEPROM */\r
-       V2Protocol_SetParameter(PARAM_RESET_POLARITY, eeprom_read_byte(&EEPROM_Rest_Polarity));\r
-}\r

 
 void V2Protocol_ProcessCommand(void)
 {
 
 void V2Protocol_ProcessCommand(void)
 {


@@ -206,13 +142,24 @@ static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r

+       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);\r
+       \r

        Endpoint_Write_Byte(V2Command);\r
        Endpoint_Write_Byte(V2Command);\r

-       Endpoint_Write_Byte(STATUS_CMD_OK);\r
-\r
-       if (V2Command == CMD_SET_PARAMETER)\r
-         V2Protocol_SetParameter(ParamID, ParamValue);\r
+       \r
+       if ((V2Command == CMD_SET_PARAMETER) && (ParamPrivs & PARAM_PRIV_WRITE))\r
+       {\r
+               Endpoint_Write_Byte(STATUS_CMD_OK);\r
+               V2Params_SetParameterValue(ParamID, ParamValue);\r
+       }\r
+       else if ((V2Command == CMD_GET_PARAMETER) && (ParamPrivs & PARAM_PRIV_READ))\r
+       {\r
+               Endpoint_Write_Byte(STATUS_CMD_OK);\r
+               Endpoint_Write_Byte(V2Params_GetParameterValue(ParamID));\r
+       }\r

        else\r
        else\r

-         Endpoint_Write_Byte(V2Protocol_GetParameter(ParamID));\r
+       {       \r
+               Endpoint_Write_Byte(STATUS_CMD_FAILED);\r
+       }\r

 \r
        Endpoint_ClearIN();\r
 }\r
 \r
        Endpoint_ClearIN();\r
 }\r