aboutsummaryrefslogtreecommitdiffstats
path: root/Projects/AVRISP
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2009-12-24 02:27:21 +0000
committerDean Camera <dean@fourwalledcubicle.com>2009-12-24 02:27:21 +0000
commit18b0d408a9e68cbc1ce36da89d74a799d7fc31de (patch)
tree4de802eb7e9a4dd0c7235f6e97b83d8ddbca24a8 /Projects/AVRISP
parent9decc2bc595bb15ccf275ae2d3854bb862c92881 (diff)
downloadlufa-18b0d408a9e68cbc1ce36da89d74a799d7fc31de.tar.gz
lufa-18b0d408a9e68cbc1ce36da89d74a799d7fc31de.tar.bz2
lufa-18b0d408a9e68cbc1ce36da89d74a799d7fc31de.zip
Remove serial driver use from the AVRISP project now that it is no longer needed.
Diffstat (limited to 'Projects/AVRISP')
-rw-r--r--Projects/AVRISP/AVRISP.c1
-rw-r--r--Projects/AVRISP/AVRISP.h1
-rw-r--r--Projects/AVRISP/AVRISP.txt4
-rw-r--r--Projects/AVRISP/Lib/V2Protocol.c2
-rw-r--r--Projects/AVRISP/Lib/V2Protocol.h1
-rw-r--r--Projects/AVRISP/Lib/XPROG/XPROGProtocol.c2
-rw-r--r--Projects/AVRISP/makefile1
7 files changed, 3 insertions, 9 deletions
diff --git a/Projects/AVRISP/AVRISP.c b/Projects/AVRISP/AVRISP.c
index 48a90e3e4..c0572fca2 100644
--- a/Projects/AVRISP/AVRISP.c
+++ b/Projects/AVRISP/AVRISP.c
@@ -70,7 +70,6 @@ void SetupHardware(void)
/* Hardware Initialization */
LEDs_Init();
USB_Init();
- Serial_Init(9600, true);
#if defined(ADC)
/* Initialize the ADC converter for VTARGET level detection on supported AVR models */
diff --git a/Projects/AVRISP/AVRISP.h b/Projects/AVRISP/AVRISP.h
index cdd551636..a0f4d5e79 100644
--- a/Projects/AVRISP/AVRISP.h
+++ b/Projects/AVRISP/AVRISP.h
@@ -45,7 +45,6 @@
#include "Descriptors.h"
#include <LUFA/Version.h>
- #include <LUFA/Drivers/Peripheral/Serial.h>
#include <LUFA/Drivers/Board/LEDs.h>
#include <LUFA/Drivers/USB/USB.h>
diff --git a/Projects/AVRISP/AVRISP.txt b/Projects/AVRISP/AVRISP.txt
index 864946434..f39e68f2c 100644
--- a/Projects/AVRISP/AVRISP.txt
+++ b/Projects/AVRISP/AVRISP.txt
@@ -152,7 +152,7 @@
* </tr>
* </table>
*
- * <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
+ * <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
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>
*
* \section Sec_TPI TPI Connections
@@ -196,7 +196,7 @@
* </tr>
* </table>
*
- * <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
+ * <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
* via a pair of 300 ohm resistors, and the AVR's XCK pin becomes CLOCK.</i>
*
* \section SSec_Options Project Options
diff --git a/Projects/AVRISP/Lib/V2Protocol.c b/Projects/AVRISP/Lib/V2Protocol.c
index 0c4664e54..4f7904a21 100644
--- a/Projects/AVRISP/Lib/V2Protocol.c
+++ b/Projects/AVRISP/Lib/V2Protocol.c
@@ -51,8 +51,6 @@ void V2Protocol_ProcessCommand(void)
{
uint8_t V2Command = Endpoint_Read_Byte();
- Serial_TxByte(V2Command);
-
switch (V2Command)
{
case CMD_SIGN_ON:
diff --git a/Projects/AVRISP/Lib/V2Protocol.h b/Projects/AVRISP/Lib/V2Protocol.h
index 8cc4c3c68..db4d09f0a 100644
--- 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>
- #include <LUFA/Drivers/Peripheral/Serial.h>
#include "../Descriptors.h"
#include "V2ProtocolConstants.h"
diff --git a/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c b/Projects/AVRISP/Lib/XPROG/XPROGProtocol.c
index d91941307..98530e9aa 100644
--- 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;
/** Currently selected XPROG programming protocol */
-uint8_t XPROG_SelectedProtocol;
+uint8_t XPROG_SelectedProtocol = XPRG_PROTOCOL_PDI;
/** Handler for the CMD_XPROG_SETMODE command, which sets the programmer-to-target protocol used for PDI/TPI
diff --git a/Projects/AVRISP/makefile b/Projects/AVRISP/makefile
index 8db6ac97c..261d12787 100644
--- a/Projects/AVRISP/makefile
+++ b/Projects/AVRISP/makefile
@@ -136,7 +136,6 @@ SRC = $(TARGET).c \
Lib/XPROG/XMEGANVM.c \
Lib/XPROG/TPITarget.c \
Lib/XPROG/TINYNVM.c \
- $(LUFA_PATH)/LUFA/Drivers/Peripheral/Serial.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \