Reorganise V2Protocol.c, add in function to assert or de-assert target RESET pin.

diff --git a/Projects/Unfinished/AVRISP/AVRISP.c b/Projects/Unfinished/AVRISP/AVRISP.c
index 9826dbb..e937253 100644 (file)
--- a/Projects/Unfinished/AVRISP/AVRISP.c
+++ b/Projects/Unfinished/AVRISP/AVRISP.c
@@ -42,8 +42,8 @@
 int main(void)\r
 {\r
        SetupHardware();\r
-       \r
-       V2Protocol_ConfigureHardware();\r
+\r
+       V2Protocol_Init();\r
 \r
        printf("AVRISP-MKII Clone\r\n");\r
        \r

diff --git a/Projects/Unfinished/AVRISP/AVRISP.txt b/Projects/Unfinished/AVRISP/AVRISP.txt
index 0eb26f4..6ab346c 100644 (file)
--- a/Projects/Unfinished/AVRISP/AVRISP.txt
+++ b/Projects/Unfinished/AVRISP/AVRISP.txt
@@ -55,9 +55,6 @@
  *  This device spoofs Atmel's official AVRISP-MKII device PID so that it remains compatible with Atmel's AVRISP-MKII\r
  *  drivers. When promted, direct your OS to install Atmel's AVRISP-MKII drivers provided with AVRStudio.\r
  *\r
- *  This demo contains both FLASH and EEPROM data, as compiled .HEX and .EEP files respectively. <b>Both</b> files must\r
- *  be loaded into the device for it to perform correctly.\r
- *\r
  *  \section SSec_Options Project Options\r
  *\r
  *  The following defines can be found in this demo, which can control the demo behaviour when defined, or changed in value.\r
@@ -74,11 +71,6 @@
  *    <td>PORT register for the programmer's target RESET line.</td>\r
  *   </tr>\r
  *   <tr>\r
- *    <td>RESET_LINE_PIN</td>\r
- *    <td>Makefile CDEFS</td>\r
- *    <td>PIN register for the programmer's target RESET line.</td>\r
- *   </tr>\r
- *   <tr>\r
  *    <td>RESET_LINE_DDR</td>\r
  *    <td>Makefile CDEFS</td>\r
  *    <td>DDR register for the programmer's target RESET line.</td>\r

diff --git a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
index 27f6fa7..905214c 100644 (file)
--- a/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Unfinished/AVRISP/Lib/V2Protocol.c
@@ -36,47 +36,108 @@
 #define  INCLUDE_FROM_V2PROTOCOL_C\r
 #include "V2Protocol.h"\r
 \r
-ParameterItem_t ParameterTable[] EEMEM = \r
+/* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
+static const uint8_t SPIMaskFromSCKDuration[] =\r
+       {\r
+               #if (F_CPU == 8000000)\r
+               SPI_SPEED_FCPU_DIV_2,\r
+               #endif\r
+               SPI_SPEED_FCPU_DIV_2, SPI_SPEED_FCPU_DIV_4, SPI_SPEED_FCPU_DIV_8,\r
+               SPI_SPEED_FCPU_DIV_16, SPI_SPEED_FCPU_DIV_32, SPI_SPEED_FCPU_DIV_64\r
+               #if (F_CPU == 16000000)                                                                         \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 = 0x00                    },\r
+                 .ParameterValue = (LUFA_VERSION_INTEGER >> 8)    },\r
                { .ParameterID    = PARAM_BUILD_NUMBER_HIGH,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = (LUFA_VERSION_INTEGER & 0xFF)  },\r
                { .ParameterID    = PARAM_HW_VER,\r
-                 .ParameterValue = 0x01                    },\r
+                 .ParameterValue = 0x01                           },\r
                { .ParameterID    = PARAM_SW_MAJOR,\r
-                 .ParameterValue = 0x01                    },\r
+                 .ParameterValue = 0x01                           },\r
                { .ParameterID    = PARAM_SW_MINOR,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = 0x00                           },\r
                { .ParameterID    = PARAM_VTARGET,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = 0x00                           },\r
                { .ParameterID    = PARAM_SCK_DURATION,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = sizeof(SPIMaskFromSCKDuration) },\r
                { .ParameterID    = PARAM_RESET_POLARITY,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = 0x01                           },\r
                { .ParameterID    = PARAM_STATUS_TGT_CONN,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = 0x00                           },\r
                { .ParameterID    = PARAM_DISCHARGEDELAY,\r
-                 .ParameterValue = 0x00                    },\r
+                 .ParameterValue = 0x00                           },\r
        };\r
-       \r
-void V2Protocol_ConfigureHardware(void)\r
+\r
+\r
+static void V2Protocol_ReconfigureSPI(void)\r
 {\r
-#if F_CPU == 8000000\r
-       uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,\r
-                                           SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};\r
-#else\r
-       uint8_t SPIMaskFromSCKDuration[] = {SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128,\r
-                                           SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128, SPI_SPEED_FCPU_DIV_128};\r
-#endif\r
-\r
-       uint8_t SCKDuration = eeprom_read_byte(&V2Protocol_GetParameterItem(PARAM_SCK_DURATION)->ParameterValue);\r
-\r
-       if (SCKDuration > sizeof(SPIMaskFromSCKDuration))\r
-         SCKDuration = SPIMaskFromSCKDuration;\r
+       uint8_t SCKDuration = V2Protocol_GetParameter(PARAM_SCK_DURATION);\r
+\r
+       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
+         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
          \r
        SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);    \r
 }\r
+\r
+static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
+{\r
+       if (ResetTarget)\r
+       {\r
+               RESET_LINE_DDR  |= RESET_LINE_MASK;\r
+               \r
+               if (!(V2Protocol_GetParameter(PARAM_RESET_POLARITY)))\r
+                 RESET_LINE_PORT |= RESET_LINE_MASK;\r
+       }\r
+       else\r
+       {\r
+               RESET_LINE_PORT &= ~RESET_LINE_MASK;    \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)
 {
@@ -85,28 +146,17 @@ void V2Protocol_ProcessCommand(void)
        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r
-                       V2Protocol_ProcessCmdSignOn();\r
+                       V2Protocol_Command_SignOn();\r
                        break;\r
                case CMD_SET_PARAMETER:\r
                case CMD_GET_PARAMETER:\r
-                       V2Protocol_ProcessCmdGetSetParam(V2Command);\r
+                       V2Protocol_Command_GetSetParam(V2Command);\r
                        break;\r
                case CMD_SPI_MULTI:\r
-                       V2Protocol_ProcessCmdSPIMulti();\r
+                       V2Protocol_Command_SPIMulti();\r
                        break;          \r
                default:\r
-                       while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)\r
-                       {\r
-                               Endpoint_ClearOUT();\r
-                               while (!(Endpoint_IsOUTReceived()));\r
-                       }\r
-               \r
-                       Endpoint_ClearOUT();\r
-                       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
-\r
-                       Endpoint_Write_Byte(V2Command);\r
-                       Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
-                       Endpoint_ClearIN();\r
+                       V2Protocol_Command_Unknown(V2Command);\r
                        break;\r
        }\r
        \r
@@ -114,26 +164,31 @@ void V2Protocol_ProcessCommand(void)
 \r
        Endpoint_WaitUntilReady();      \r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_OUT);        
-}\r
+}
 \r
-static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID)\r
-{\r
-       for (uint8_t TableIndex = 0; TableIndex < (sizeof(ParameterTable) / sizeof(ParameterTable[0])); TableIndex++)\r
+static void V2Protocol_Command_Unknown(uint8_t V2Command)\r
+{      \r
+       while (Endpoint_BytesInEndpoint() == AVRISP_DATA_EPSIZE)\r
        {\r
-               if (ParamID == eeprom_read_byte(&ParameterTable[TableIndex].ParameterID))\r
-                 return &ParameterTable[TableIndex];\r
+               Endpoint_ClearOUT();\r
+               while (!(Endpoint_IsOUTReceived()));\r
        }\r
-       \r
-       return NULL;\r
-}
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+\r
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_UNKNOWN);\r
+       Endpoint_ClearIN();\r
+}\r
 
-static void V2Protocol_ProcessCmdSignOn(void)\r
+static void V2Protocol_Command_SignOn(void)\r
 {\r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
 \r
-       V2Protocol_ConfigureHardware();\r
+       V2Protocol_ReconfigureSPI();\r
 \r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
@@ -142,7 +197,7 @@ static void V2Protocol_ProcessCmdSignOn(void)
        Endpoint_ClearIN();\r
 }\r
 \r
-static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)\r
+static void V2Protocol_Command_GetSetParam(uint8_t V2Command)\r
 {\r
        uint8_t ParamID    = Endpoint_Read_Byte();\r
        uint8_t ParamValue = Endpoint_Read_Byte();\r
@@ -151,28 +206,18 @@ static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r
-       ParameterItem_t* ParameterItem = V2Protocol_GetParameterItem(ParamID);\r
-       \r
        Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
 \r
-       if (ParameterItem != NULL)\r
-       {\r
-               Endpoint_Write_Byte(STATUS_CMD_OK);\r
-\r
-               if (V2Command == CMD_SET_PARAMETER)\r
-                 eeprom_write_byte(&ParameterItem->ParameterValue, ParamValue);\r
-               else\r
-                 Endpoint_Write_Byte(eeprom_read_byte(&ParameterItem->ParameterValue));                        \r
-       }\r
+       if (V2Command == CMD_SET_PARAMETER)\r
+         V2Protocol_SetParameter(ParamID, ParamValue);\r
        else\r
-       {\r
-               Endpoint_Write_Byte(STATUS_CMD_FAILED);\r
-       }\r
+         Endpoint_Write_Byte(V2Protocol_GetParameter(ParamID));\r
 \r
        Endpoint_ClearIN();\r
 }\r
 \r
-static void V2Protocol_ProcessCmdSPIMulti(void)\r
+static void V2Protocol_Command_SPIMulti(void)\r
 {\r
        uint8_t TxBytes = Endpoint_Read_Byte();\r
        uint8_t RxBytes = Endpoint_Read_Byte();\r
@@ -204,14 +249,9 @@ static void V2Protocol_ProcessCmdSPIMulti(void)
        while (CurrRxPos < RxBytes)\r
        {\r
                if (CurrTxPos < TxBytes)\r
-               {\r
-                       Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos]));\r
-                       CurrTxPos++;\r
-               }\r
+                 Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos++]));\r
                else\r
-               {\r
-                       Endpoint_Write_Byte(SPI_ReceiveByte());\r
-               }\r
+                 Endpoint_Write_Byte(SPI_ReceiveByte());\r
                \r
                CurrRxPos++;\r
        }       \r

diff --git a/Projects/Unfinished/AVRISP/Lib/V2Protocol.h b/Projects/Unfinished/AVRISP/Lib/V2Protocol.h
index 6c2ff60..7b9f1b1 100644 (file)
--- a/Projects/Unfinished/AVRISP/Lib/V2Protocol.h
+++ b/Projects/Unfinished/AVRISP/Lib/V2Protocol.h
@@ -37,8 +37,10 @@
 #define _V2_PROTOCOL_
 
        /* Includes: */
-               #include <avr/io.h>
-
+               #include <avr/io.h>\r
+               #include <avr/eeprom.h>
+\r
+               #include <LUFA/Version.h>
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r
                \r
@@ -56,15 +58,21 @@
                        uint8_t ParameterValue;\r
                } ParameterItem_t;
 
-       /* Function Prototypes: */      \r
-               void V2Protocol_ConfigureHardware(void);
+       /* Function Prototypes: */\r
+               void V2Protocol_Init(void);\r
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r
-                       static ParameterItem_t* V2Protocol_GetParameterItem(uint8_t ParamID);\r
-                       static void V2Protocol_ProcessCmdSignOn(void);\r
-                       static void V2Protocol_ProcessCmdGetSetParam(uint8_t V2Command);\r
-                       static void V2Protocol_ProcessCmdSPIMulti(void);\r
+                       static void    V2Protocol_ReconfigureSPI(void);\r
+                       static void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);\r
+\r
+                       static uint8_t V2Protocol_GetParameter(uint8_t ParamID);\r
+                       static void    V2Protocol_SetParameter(uint8_t ParamID, uint8_t Value);\r
+\r
+                       static void    V2Protocol_Command_Unknown(uint8_t V2Command);\r
+                       static void    V2Protocol_Command_SignOn(void);\r
+                       static void    V2Protocol_Command_GetSetParam(uint8_t V2Command);\r
+                       static void    V2Protocol_Command_SPIMulti(void);\r
                #endif
 
 #endif

diff --git a/Projects/Unfinished/AVRISP/makefile b/Projects/Unfinished/AVRISP/makefile
index 0877c5d..d2128dc 100644 (file)
--- a/Projects/Unfinished/AVRISP/makefile
+++ b/Projects/Unfinished/AVRISP/makefile
@@ -194,7 +194,6 @@ CSTANDARD = -std=gnu99
 # Place -D or -U options here for C sources\r
 CDEFS  = -DF_CPU=$(F_CPU)UL -DF_CLOCK=$(F_CLOCK)UL -DBOARD=BOARD_$(BOARD) $(LUFA_OPTS)\r
 CDEFS += -DRESET_LINE_PORT=PORTA\r
-CDEFS += -DRESET_LINE_PIN=PINA\r
 CDEFS += -DRESET_LINE_DDR=DDRA\r
 CDEFS += -DRESET_LINE_MASK="(1 << 0)"\r
 \r