Added V2Protocol handlers to the AVRISP project to enter/exit programming mode, and...

Added ShutDown functions for all hardware peripheral drivers, so that peripherals can be turned off after use.

diff --git a/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h b/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h
index 4110a50..edcbc57 100644 (file)
--- a/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h
+++ b/LUFA/Drivers/Peripheral/AT90USBXXX67/ADC.h
@@ -118,11 +118,11 @@
                                 *  \param[in] Mode  Mask of ADC settings, including adjustment, prescale, mode and reference\r
                                 */\r
                                static inline void ADC_Init(uint8_t Mode);\r
-                               \r
+\r
                                /** Turns off the ADC. If this is called, any further ADC operations will require a call to\r
                                 *  \ref ADC_Init() before the ADC can be used again.\r
                                 */\r
-                               static inline void ADC_Off(void);\r
+                               static inline void ADC_ShutDown(void);\r
                                \r
                                /** Indicates if the ADC is currently enabled.\r
                                 *\r
@@ -145,7 +145,7 @@
                        #else\r
                                #define  ADC_Init(mode)          MACROS{ ADCSRA = ((1 << ADEN) | mode);         }MACROE\r
 \r
-                               #define  ADC_Off()               MACROS{ ADCSRA = 0;                            }MACROE\r
+                               #define  ADC_ShutDown()          MACROS{ ADCSRA = 0;                            }MACROE\r
                                \r
                                #define  ADC_GetStatus()               ((ADCSRA & (1 << ADEN)) ? true : false)\r
 \r

diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index 6048d86..df741d7 100644 (file)
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -108,6 +108,16 @@
                                  SPSR &= ~(1 << SPI2X);\r
                        }\r
                        \r
+                       /** Turns off the SPI driver, disabling and returning used hardware to their default configuration. */\r
+                       static inline void SPI_ShutDown(void)\r
+                       {\r
+                               DDRB  &= ~((1 << 1) | (1 << 2));\r
+                               PORTB &= ~((1 << 0) | (1 << 3));\r
+                               \r
+                               SPCR   = 0;\r
+                               SPSR   = 0;\r
+                       }\r
+                       \r
                        /** Sends and receives a byte through the SPI interface, blocking until the transfer is complete.\r
                         *\r
                         *  \param[in] Byte  Byte to send through the SPI interface\r

diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index e688cfc..bde1449 100644 (file)
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -118,6 +118,19 @@
                                UBRR1  = (DoubleSpeed ? SERIAL_2X_UBBRVAL(BaudRate) : SERIAL_UBBRVAL(BaudRate));\r
                        }\r
 \r
+                       /** Turns off the USART driver, disabling and returning used hardware to their default configuration. */\r
+                       static inline void Serial_ShutDown(void)\r
+                       {\r
+                               UCSR1A = 0;\r
+                               UCSR1B = 0;\r
+                               UCSR1C = 0;\r
+                               \r
+                               DDRD  &= ~(1 << 3);     \r
+                               PORTD &= ~(1 << 2);\r
+                               \r
+                               UBRR1  = 0;\r
+                       }\r
+                       \r
                        /** Transmits a given byte through the USART.\r
                         *\r
                         *  \param[in] DataByte  Byte to transmit through the USART\r

diff --git a/LUFA/Drivers/Peripheral/SerialStream.h b/LUFA/Drivers/Peripheral/SerialStream.h
index d3f0014..293fda0 100644 (file)
--- a/LUFA/Drivers/Peripheral/SerialStream.h
+++ b/LUFA/Drivers/Peripheral/SerialStream.h
@@ -88,6 +88,14 @@
                                \r
                                stdout = &USARTStream;\r
                        }\r
+                       \r
+                       /** Turns off the serial stream (and regular USART driver), disabling and returning used hardware to\r
+                        *  their default configuration.\r
+                        */\r
+                       static inline void SerialStream_ShutDown(void)\r
+                       {\r
+                               Serial_ShutDown();\r
+                       }                       \r
 \r
        /* Disable C linkage for C++ Compilers: */\r
                #if defined(__cplusplus)\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index bd2c7d0..058d55c 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -15,6 +15,7 @@
   *    USB_Device_DisableSOFEvents() macros to give bus-synchronised millisecond interrupts when in USB device mode\r
   *  - Added new Endpoint_SetEndpointDirection() macro for bi-directional endpoints\r
   *  - Added new AVRISP project, a LUFA clone of the Atmel AVRISP-MKII programmer\r
+  *  - Added ShutDown functions for all hardware peripheral drivers, so that peripherals can be turned off after use\r
   *  \r
   *  <b>Changed:</b>\r
   *  - SetIdle requests to the HID device driver with a 0 idle period (send changes only) now only affect the requested\r

diff --git a/LUFA/ManPages/MigrationInformation.txt b/LUFA/ManPages/MigrationInformation.txt
index 36c7d35..f65539d 100644 (file)
--- a/LUFA/ManPages/MigrationInformation.txt
+++ b/LUFA/ManPages/MigrationInformation.txt
@@ -11,7 +11,9 @@
  *  areas relevant to making older projects compatible with the API changes of each new release.\r
  *\r
  * \section Sec_MigrationXXXXXX Migrating from 090810 to XXXXXX\r
- * No migration information for this version yet.\r
+ *\r
+ *  <b>Non-USB Library Components</b>\r
+ *    - The ADC_Off() function has been renamed to \ref ADC_ShutDown() to be consistent with the rest of the library.\r
  *\r
  * \section Sec_Migration090810 Migrating from 090605 to 090810\r
  *\r

diff --git a/Projects/Incomplete/AVRISP/AVRISP.c b/Projects/Incomplete/AVRISP/AVRISP.c
index 0b10124..7564f7c 100644 (file)
--- a/Projects/Incomplete/AVRISP/AVRISP.c
+++ b/Projects/Incomplete/AVRISP/AVRISP.c
@@ -69,7 +69,6 @@ void SetupHardware(void)
 \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r
-       SPI_Init(0, true);\r
        LEDs_Init();\r
        USB_Init();\r
 }\r

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
index e55a700..c31fd0e 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.c
@@ -40,7 +40,7 @@ uint32_t CurrentAddress;
 \r
 \r
 /* Table of masks for SPI_Init() from a given PARAM_SCK_DURATION value */\r
-static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =\r
+static const uint8_t SPIMaskFromSCKDuration[] =\r
        {\r
                #if (F_CPU == 8000000)\r
                SPI_SPEED_FCPU_DIV_2,\r
@@ -52,14 +52,14 @@ static const uint8_t SPIMaskFromSCKDuration[MAX_SPI_SETTINGS] =
                #endif\r
        };\r
 \r
-static void V2Protocol_ReconfigureSPI(void)\r
+static uint8_t V2Protocol_GetSPIPrescalerMask(void)\r
 {\r
        uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
 \r
-       if (SCKDuration >= MAX_SPI_SETTINGS)\r
-         SCKDuration = (MAX_SPI_SETTINGS - 1);\r
+       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
+         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
          \r
-       SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);    \r
+       return SPIMaskFromSCKDuration[SCKDuration];\r
 }\r
 \r
 static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)\r
@@ -77,6 +77,35 @@ static void V2Protocol_ChangeTargetResetLine(bool ResetTarget)
                RESET_LINE_DDR  &= ~RESET_LINE_MASK;\r
        }\r
 }\r
+\r
+static void V2Protocol_DelayMS(uint8_t MS)\r
+{\r
+       while (MS--)\r
+         _delay_ms(1);\r
+}\r
+\r
+static uint8_t V2Protocol_WaitWhileTargetBusy(void)\r
+{\r
+       uint8_t TimeoutMS = TARGET_BUST_TIMEOUT_MS;\r
+       uint8_t ResponseByte;\r
+       \r
+       do\r
+       {\r
+               V2Protocol_DelayMS(1);\r
+       \r
+               SPI_SendByte(0xF0);\r
+               SPI_SendByte(0x00);\r
+\r
+               SPI_SendByte(0x00);\r
+               ResponseByte = SPI_ReceiveByte();\r
+       }\r
+       while ((ResponseByte & 0x01) && (TimeoutMS--));\r
+\r
+       if (!(TimeoutMS))\r
+         return STATUS_CMD_TOUT;\r
+       else\r
+         return STATUS_CMD_OK;\r
+}\r
 
 void V2Protocol_ProcessCommand(void)
 {
@@ -94,9 +123,28 @@ void V2Protocol_ProcessCommand(void)
                case CMD_LOAD_ADDRESS:\r
                        V2Protocol_Command_LoadAddress();\r
                        break;\r
+               case CMD_ENTER_PROGMODE_ISP:\r
+                       V2Protocol_Command_EnterISPMode();\r
+                       break;\r
+               case CMD_LEAVE_PROGMODE_ISP:\r
+                       V2Protocol_Command_LeaveISPMode();\r
+                       break;\r
+               case CMD_CHIP_ERASE_ISP:\r
+                       V2Protocol_Command_ChipErase();\r
+                       break;\r
+               case CMD_READ_FUSE_ISP:\r
+               case CMD_READ_LOCK_ISP:\r
+               case CMD_READ_SIGNATURE_ISP:\r
+               case CMD_READ_OSCCAL_ISP:\r
+                       V2Protocol_Command_ReadFuseLockSigOSCCAL(V2Command);\r
+                       break;\r
+               case CMD_PROGRAM_FUSE_ISP:\r
+               case CMD_PROGRAM_LOCK_ISP:\r
+                       V2Protocol_Command_WriteFuseLock(V2Command);\r
+                       break;\r
                case CMD_SPI_MULTI:\r
                        V2Protocol_Command_SPIMulti();\r
-                       break;          \r
+                       break;\r
                default:\r
                        V2Protocol_Command_Unknown(V2Command);\r
                        break;\r
@@ -132,38 +180,40 @@ static void V2Protocol_Command_SignOn(void)
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
 \r
-       V2Protocol_ReconfigureSPI();\r
-       CurrentAddress = 0;\r
-\r
        Endpoint_Write_Byte(CMD_SIGN_ON);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
-       Endpoint_Write_Byte(PROGRAMMER_ID_LEN);\r
-       Endpoint_Write_Stream_LE(PROGRAMMER_ID, PROGRAMMER_ID_LEN);\r
+       Endpoint_Write_Byte(sizeof(PROGRAMMER_ID) - 1);\r
+       Endpoint_Write_Stream_LE(PROGRAMMER_ID, (sizeof(PROGRAMMER_ID) - 1));\r
        Endpoint_ClearIN();\r
 }\r
 \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
+       struct\r
+       {\r
+               uint8_t ParamID;\r
+               uint8_t ParamValue;\r
+       } Get_Set_Param_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Get_Set_Param_Params, sizeof(Get_Set_Param_Params));\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
        \r
-       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(ParamID);\r
+       uint8_t ParamPrivs = V2Params_GetParameterPrivellages(Get_Set_Param_Params.ParamID);\r
        \r
        Endpoint_Write_Byte(V2Command);\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
+               V2Params_SetParameterValue(Get_Set_Param_Params.ParamID, Get_Set_Param_Params.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
+               Endpoint_Write_Byte(V2Params_GetParameterValue(Get_Set_Param_Params.ParamID));\r
        }\r
        else\r
        {       \r
@@ -175,25 +225,194 @@ static void V2Protocol_Command_GetSetParam(uint8_t V2Command)
 \r
 static void V2Protocol_Command_LoadAddress(void)\r
 {\r
-       CurrentAddress = Endpoint_Read_DWord_LE();\r
+       Endpoint_Read_Stream_LE(&CurrentAddress, sizeof(CurrentAddress));\r
 \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
        Endpoint_WaitUntilReady();\r
+       \r
+       // TODO: Check for extended address\r
 \r
        Endpoint_Write_Byte(CMD_LOAD_ADDRESS);\r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
        Endpoint_ClearIN();\r
 }\r
 \r
+static void V2Protocol_Command_EnterISPMode(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t TimeoutMS;\r
+               uint8_t PinStabDelayMS;\r
+               uint8_t ExecutionDelayMS;\r
+               uint8_t SynchLoops;\r
+               uint8_t ByteDelay;\r
+               uint8_t PollValue;\r
+               uint8_t PollIndex;\r
+               uint8_t EnterProgBytes[4];\r
+       } Enter_ISP_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Enter_ISP_Params, sizeof(Enter_ISP_Params));\r
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       uint8_t SCKDuration = V2Params_GetParameterValue(PARAM_SCK_DURATION);\r
+       uint8_t ResponseStatus = STATUS_CMD_FAILED;\r
+\r
+       Enter_ISP_Params.TimeoutMS -= Enter_ISP_Params.ExecutionDelayMS +\r
+                                     Enter_ISP_Params.PinStabDelayMS;\r
+       \r
+       CurrentAddress = 0;\r
+\r
+       if (SCKDuration >= sizeof(SPIMaskFromSCKDuration))\r
+         SCKDuration = (sizeof(SPIMaskFromSCKDuration) - 1);\r
+\r
+       V2Protocol_DelayMS(Enter_ISP_Params.ExecutionDelayMS);    \r
+       SPI_Init(SPIMaskFromSCKDuration[SCKDuration], true);\r
+       V2Protocol_ChangeTargetResetLine(true);\r
+       V2Protocol_DelayMS(Enter_ISP_Params.PinStabDelayMS);\r
+               \r
+       while (Enter_ISP_Params.SynchLoops-- && (ResponseStatus == STATUS_CMD_FAILED))\r
+       {\r
+               uint8_t ResponseBytes[4];\r
+               \r
+               for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
+               {\r
+                       ResponseBytes[RByte] = SPI_TransferByte(Enter_ISP_Params.EnterProgBytes[RByte]);\r
+                       V2Protocol_DelayMS(Enter_ISP_Params.ByteDelay);\r
+                       \r
+                       if (Enter_ISP_Params.TimeoutMS >= Enter_ISP_Params.ByteDelay)\r
+                         Enter_ISP_Params.TimeoutMS -= Enter_ISP_Params.ByteDelay;\r
+                       else\r
+                         ResponseStatus = STATUS_CMD_TOUT;\r
+               }\r
+               \r
+               if (ResponseBytes[Enter_ISP_Params.PollIndex] == Enter_ISP_Params.PollValue)\r
+                 ResponseStatus = STATUS_CMD_OK;\r
+       }\r
+\r
+       Endpoint_Write_Byte(CMD_ENTER_PROGMODE_ISP);\r
+       Endpoint_Write_Byte(ResponseStatus);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_LeaveISPMode(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t PreDelayMS;\r
+               uint8_t PostDelayMS;\r
+       } Leave_ISP_Params;\r
+\r
+       Endpoint_Read_Stream_LE(&Leave_ISP_Params, sizeof(Leave_ISP_Params));\r
+       \r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       V2Protocol_DelayMS(Leave_ISP_Params.PreDelayMS);\r
+       V2Protocol_ChangeTargetResetLine(false);\r
+       SPI_ShutDown();\r
+       V2Protocol_DelayMS(Leave_ISP_Params.PostDelayMS);\r
+\r
+       Endpoint_Write_Byte(CMD_LEAVE_PROGMODE_ISP);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_ChipErase(void)\r
+{\r
+       struct\r
+       {\r
+               uint8_t EraseDelayMS;\r
+               uint8_t PollMethod;\r
+               uint8_t EraseCommandBytes[4];\r
+       } Erase_Chip_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Erase_Chip_Params, sizeof(Erase_Chip_Params));\r
+       \r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+       \r
+       uint8_t ResponseStatus = STATUS_CMD_OK;\r
+       \r
+       for (uint8_t SByte = 0; SByte < sizeof(Erase_Chip_Params.EraseCommandBytes); SByte++)\r
+         SPI_SendByte(Erase_Chip_Params.EraseCommandBytes[SByte]);\r
+\r
+       if (Erase_Chip_Params.PollMethod == 0)\r
+         V2Protocol_DelayMS(Erase_Chip_Params.EraseDelayMS);\r
+       else\r
+         ResponseStatus = V2Protocol_WaitWhileTargetBusy();\r
+         \r
+       Endpoint_Write_Byte(CMD_CHIP_ERASE_ISP);\r
+       Endpoint_Write_Byte(ResponseStatus);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint8_t RetByte;\r
+               uint8_t ReadCommandBytes[4];\r
+       } Read_FuseLockSigOSCCAL_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Read_FuseLockSigOSCCAL_Params, sizeof(Read_FuseLockSigOSCCAL_Params));\r
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       uint8_t ResponseBytes[4];\r
+               \r
+       for (uint8_t RByte = 0; RByte < sizeof(ResponseBytes); RByte++)\r
+         ResponseBytes[RByte] = SPI_TransferByte(Read_FuseLockSigOSCCAL_Params.ReadCommandBytes[RByte]);\r
+               \r
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_Write_Byte(ResponseBytes[Read_FuseLockSigOSCCAL_Params.RetByte]);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
+static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command)\r
+{\r
+       struct\r
+       {\r
+               uint8_t WriteCommandBytes[4];\r
+       } Write_FuseLockSig_Params;\r
+       \r
+       Endpoint_Read_Stream_LE(&Write_FuseLockSig_Params, sizeof(Write_FuseLockSig_Params));\r
+\r
+       Endpoint_ClearOUT();\r
+       Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
+       Endpoint_WaitUntilReady();\r
+\r
+       for (uint8_t SByte = 0; SByte < sizeof(Write_FuseLockSig_Params.WriteCommandBytes); SByte++)\r
+         SPI_SendByte(Write_FuseLockSig_Params.WriteCommandBytes[SByte]);\r
+               \r
+       Endpoint_Write_Byte(V2Command);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_Write_Byte(STATUS_CMD_OK);\r
+       Endpoint_ClearIN();\r
+}\r
+\r
 static void V2Protocol_Command_SPIMulti(void)\r
 {\r
-       uint8_t TxBytes     = Endpoint_Read_Byte();\r
-       uint8_t RxBytes     = Endpoint_Read_Byte();\r
-       uint8_t RxStartAddr = Endpoint_Read_Byte();\r
-       uint8_t TxData[255];\r
+       struct\r
+       {\r
+               uint8_t TxBytes;\r
+               uint8_t RxBytes;\r
+               uint8_t RxStartAddr;\r
+               uint8_t TxData[255];\r
+       } SPI_Multi_Params;\r
        \r
-       Endpoint_Read_Stream_LE(TxData, TxBytes);\r
+       Endpoint_Read_Stream_LE(&SPI_Multi_Params, sizeof(SPI_Multi_Params) -\r
+                                                  sizeof(SPI_Multi_Params.TxData));\r
+       Endpoint_Read_Stream_LE(&SPI_Multi_Params.TxData, SPI_Multi_Params.TxBytes);\r
        \r
        Endpoint_ClearOUT();\r
        Endpoint_SetEndpointDirection(ENDPOINT_DIR_IN);\r
@@ -206,10 +425,10 @@ static void V2Protocol_Command_SPIMulti(void)
        uint8_t CurrRxPos = 0;\r
 \r
        /* Write out bytes to transmit until the start of the bytes to receive is met */\r
-       while (CurrTxPos < RxStartAddr)\r
+       while (CurrTxPos < SPI_Multi_Params.RxStartAddr)\r
        {\r
-               if (CurrTxPos < TxBytes)\r
-                 SPI_SendByte(TxData[CurrTxPos]);\r
+               if (CurrTxPos < SPI_Multi_Params.TxBytes)\r
+                 SPI_SendByte(SPI_Multi_Params.TxData[CurrTxPos]);\r
                else\r
                  SPI_SendByte(0);\r
                \r
@@ -217,10 +436,10 @@ static void V2Protocol_Command_SPIMulti(void)
        }\r
 \r
        /* Transmit remaining bytes with padding as needed, read in response bytes */\r
-       while (CurrRxPos < RxBytes)\r
+       while (CurrRxPos < SPI_Multi_Params.RxBytes)\r
        {\r
-               if (CurrTxPos < TxBytes)\r
-                 Endpoint_Write_Byte(SPI_TransferByte(TxData[CurrTxPos++]));\r
+               if (CurrTxPos < SPI_Multi_Params.TxBytes)\r
+                 Endpoint_Write_Byte(SPI_TransferByte(SPI_Multi_Params.TxData[CurrTxPos++]));\r
                else\r
                  Endpoint_Write_Byte(SPI_ReceiveByte());\r
                \r
@@ -228,5 +447,5 @@ static void V2Protocol_Command_SPIMulti(void)
        }       \r
        \r
        Endpoint_Write_Byte(STATUS_CMD_OK);\r
-       Endpoint_ClearIN();     \r
+       Endpoint_ClearIN();\r
 }\r

diff --git a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
index 5283f19..116df8d 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
+++ b/Projects/Incomplete/AVRISP/Lib/V2Protocol.h
@@ -38,6 +38,7 @@
 
        /* Includes: */
                #include <avr/io.h>\r
+               #include <util/delay.h>\r
 \r
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r
@@ -47,23 +48,28 @@
                #include "V2ProtocolParams.h"
 
        /* Macros: */
-               #define PROGRAMMER_ID       "AVRISP_MK2"
-               #define PROGRAMMER_ID_LEN   (sizeof(PROGRAMMER_ID) - 1)
-\r
-               #define MAX_SPI_SETTINGS    7\r
+               #define PROGRAMMER_ID             "AVRISP_MK2"\r
+               #define TARGET_BUST_TIMEOUT_MS    100\r
 
        /* Function Prototypes: */\r
                void V2Protocol_ProcessCommand(void);\r
                \r
                #if defined(INCLUDE_FROM_V2PROTOCOL_C)\r
-                       static void    V2Protocol_ReconfigureSPI(void);\r
+                       static uint8_t V2Protocol_GetSPIPrescalerMask(void);\r
                        static void    V2Protocol_ChangeTargetResetLine(bool ResetTarget);\r
+                       static void    V2Protocol_DelayMS(uint8_t MS);\r
+                       static uint8_t V2Protocol_WaitWhileTargetBusy(void);\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_LoadAddress(void);\r
-                       static void    V2Protocol_Command_SPIMulti(void);\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_LoadAddress(void);\r
+                       static void V2Protocol_Command_EnterISPMode(void);\r
+                       static void V2Protocol_Command_LeaveISPMode(void);\r
+                       static void V2Protocol_Command_ChipErase(void);\r
+                       static void V2Protocol_Command_ReadFuseLockSigOSCCAL(uint8_t V2Command);\r
+                       static void V2Protocol_Command_WriteFuseLock(uint8_t V2Command);\r
+                       static void V2Protocol_Command_SPIMulti(void);\r
                #endif
 
 #endif

diff --git a/Projects/Incomplete/AVRISP/Lib/V2ProtocolParams.c b/Projects/Incomplete/AVRISP/Lib/V2ProtocolParams.c
index 7777701..3a42ba3 100644 (file)
--- a/Projects/Incomplete/AVRISP/Lib/V2ProtocolParams.c
+++ b/Projects/Incomplete/AVRISP/Lib/V2ProtocolParams.c
@@ -67,7 +67,7 @@ static ParameterItem_t ParameterTable[] =
                  .ParamPrivellages = PARAM_PRIV_READ                    },\r
 \r
                { .ParamID          = PARAM_SCK_DURATION,\r
-                 .ParamValue       = MAX_SPI_SETTINGS,\r
+                 .ParamValue       = 0,\r
                  .ParamPrivellages = PARAM_PRIV_READ | PARAM_PRIV_WRITE },\r
 \r
                { .ParamID          = PARAM_RESET_POLARITY,\r