From 72527867f6bd2d800bd0a71a90fe7079fbe1ab47 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Wed, 17 Mar 2010 13:07:22 +0000
Subject: [PATCH] Remove redundant check in the software PDI programming code
of the AVRISP project.
---
Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c | 2 +-
LUFA/ManPages/ChangeLog.txt | 3 +--
Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c | 4 ----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
index 341b0d50e..22ebc559a 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
@@ -142,7 +142,7 @@ void MouseHostTask(void)
break;
}
- if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != 0)
+ if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != HOST_SENDCONTROL_Successful)
{
printf("Could not Set Boot Protocol Mode.\r\n");
LEDs_SetAllLEDs(LEDMASK_USB_ERROR);
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 8ce9f2240..2840630db 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -12,9 +12,8 @@
* - (None)
*
* <b>Changed:</b>
- * - AVRISP programmer project now has a more robust timeout system, allowing for a doubling of the software USART speed
+ * - AVRISP programmer project now has a more robust timeout system, allowing for an increse of the software USART speed
* for PDI and TPI programming
- * - Increased the speed of both software and hardware TPI/PDI programming modes of the AVRISP project
* - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond
* - Webserver project now uses the board LEDs to indicate the current IP configuration state
* - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired
diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 15467fe84..bfc2e824d 100644
--- a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
+++ b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
@@ -80,10 +80,6 @@ ISR(TIMER1_COMPA_vect, ISR_BLOCK)
}
else
{
- /* If not sending or receiving, just exit */
- if (!(SoftUSART_BitCount))
- return;
-
/* If at falling clock edge and we are in receive mode, abort */
if (!IsSending)
return;
--
GitLab