Remove serial driver use from the AVRISP project now that it is no longer needed.

diff --git a/Projects/AVRISP/AVRISP.c b/Projects/AVRISP/AVRISP.c
index 48a90e3..c0572fc 100644 (file)
--- a/Projects/AVRISP/AVRISP.c
+++ b/Projects/AVRISP/AVRISP.c
@@ -70,7 +70,6 @@ void SetupHardware(void)
        /* Hardware Initialization */\r
        LEDs_Init();\r
        USB_Init();\r
        /* Hardware Initialization */\r
        LEDs_Init();\r
        USB_Init();\r

-       Serial_Init(9600, true);\r

 \r
        #if defined(ADC)\r
        /* Initialize the ADC converter for VTARGET level detection on supported AVR models */\r
 \r
        #if defined(ADC)\r
        /* Initialize the ADC converter for VTARGET level detection on supported AVR models */\r

diff --git a/Projects/AVRISP/AVRISP.h b/Projects/AVRISP/AVRISP.h
index cdd5516..a0f4d5e 100644 (file)
--- a/Projects/AVRISP/AVRISP.h
+++ b/Projects/AVRISP/AVRISP.h
@@ -45,7 +45,6 @@
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>\r
                #include "Descriptors.h"\r
 \r
                #include <LUFA/Version.h>\r

-               #include <LUFA/Drivers/Peripheral/Serial.h>\r

                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                \r
                #include <LUFA/Drivers/Board/LEDs.h>\r
                #include <LUFA/Drivers/USB/USB.h>\r
                \r

diff --git a/Projects/AVRISP/AVRISP.txt b/Projects/AVRISP/AVRISP.txt
index 8649464..f39e68f 100644 (file)
--- a/Projects/AVRISP/AVRISP.txt
+++ b/Projects/AVRISP/AVRISP.txt
@@ -152,7 +152,7 @@
  *   </tr>\r
  *  </table>\r
  *\r
  *   </tr>\r
  *  </table>\r
  *\r

- *  <b><sup>1</sup></b> <i>When PDI_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together\r
+ *  <b><sup>1</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together\r

  *                         via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>\r
  *\r
  *  \section Sec_TPI TPI Connections\r
  *                         via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>\r
  *\r
  *  \section Sec_TPI TPI Connections\r


@@ -196,7 +196,7 @@
  *   </tr>\r
  *  </table>\r
  *\r
  *   </tr>\r
  *  </table>\r
  *\r

- *  <b><sup>1</sup></b> <i>When TPI_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together\r
+ *  <b><sup>1</sup></b> <i>When XPROG_VIA_HARDWARE_USART is set, the AVR's Tx and Rx become the DATA line when connected together\r

  *                         via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>\r
  *\r
  *  \section SSec_Options Project Options\r
  *                         via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>\r
  *\r
  *  \section SSec_Options Project Options\r

diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 0c4664e..4f7904a 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -51,8 +51,6 @@ void V2Protocol_ProcessCommand(void)
 {\r
        uint8_t V2Command = Endpoint_Read_Byte();\r
        \r
 {\r
        uint8_t V2Command = Endpoint_Read_Byte();\r
        \r

-       Serial_TxByte(V2Command);\r
-       \r

        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r
        switch (V2Command)\r
        {\r
                case CMD_SIGN_ON:\r

diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index 8cc4c3c..db4d09f 100644 (file)
--- a/Projects/AVRISP/Lib/V2Protocol.h
+++ b/Projects/AVRISP/Lib/V2Protocol.h
@@ -39,7 +39,6 @@
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r
        /* Includes: */
                #include <LUFA/Drivers/USB/USB.h>
                #include <LUFA/Drivers/Peripheral/SPI.h>\r

-               #include <LUFA/Drivers/Peripheral/Serial.h>\r

                \r
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r
                \r
                #include "../Descriptors.h"
                #include "V2ProtocolConstants.h"\r

diff --git a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
index d919413..98530e9 100644 (file)
--- a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
+++ b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
@@ -44,7 +44,7 @@ uint32_t XPROG_Param_NVMBase = 0x010001C0;
 uint32_t XPROG_Param_EEPageSize;\r
 \r
 /** Currently selected XPROG programming protocol */\r
 uint32_t XPROG_Param_EEPageSize;\r
 \r
 /** Currently selected XPROG programming protocol */\r

-uint8_t  XPROG_SelectedProtocol;\r
+uint8_t  XPROG_SelectedProtocol = XPRG_PROTOCOL_PDI;\r

 \r
 \r
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI\r
 \r
 \r
 /** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI\r

diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 8db6ac9..261d127 100644 (file)
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -136,7 +136,6 @@ SRC = $(TARGET).c                                                 \
          Lib/XPROG/XMEGANVM.c                                        \\r
          Lib/XPROG/TPITarget.c                                       \\r
          Lib/XPROG/TINYNVM.c                                         \\r
          Lib/XPROG/XMEGANVM.c                                        \\r
          Lib/XPROG/TPITarget.c                                       \\r
          Lib/XPROG/TINYNVM.c                                         \\r

-         $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c               \\r

          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c        \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c           \\r
          $(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c               \\r