Remove redundant check in the software PDI programming code of the AVRISP project.

diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
index 341b0d5..22ebc55 100644 (file)
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/HostFunctions.c
@@ -142,7 +142,7 @@ void MouseHostTask(void)
                                break;\r
                        }\r
 \r
                                break;\r
                        }\r
 \r

-                       if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != 0)\r
+                       if (HID_Host_SetBootProtocol(&Mouse_HID_Host_Interface) != HOST_SENDCONTROL_Successful)\r

                        {\r
                                printf("Could not Set Boot Protocol Mode.\r\n");\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r
                        {\r
                                printf("Could not Set Boot Protocol Mode.\r\n");\r
                                LEDs_SetAllLEDs(LEDMASK_USB_ERROR);\r

diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 8ce9f22..2840630 100644 (file)
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -12,9 +12,8 @@
   *  - (None)\r
   *\r
   *  <b>Changed:</b>\r
   *  - (None)\r
   *\r
   *  <b>Changed:</b>\r

-  *  - AVRISP programmer project now has a more robust timeout system, allowing for a doubling of the software USART speed\r
+  *  - AVRISP programmer project now has a more robust timeout system, allowing for an increse of the software USART speed\r

   *    for PDI and TPI programming\r
   *    for PDI and TPI programming\r

-  *  - Increased the speed of both software and hardware TPI/PDI programming modes of the AVRISP project\r

   *  - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond\r
   *  - Webserver project now uses the board LEDs to indicate the current IP configuration state\r
   *  - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired\r
   *  - Added a timeout value to the TWI_StartTransmission() function, within which the addressed device must respond\r
   *  - Webserver project now uses the board LEDs to indicate the current IP configuration state\r
   *  - Added ENABLE_TELNET_SERVER compile time option to the Webserver project to disable the TELNET server if desired\r

diff --git a/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c b/Projects/AVRISP-MKII/Lib/XPROG/XPROGTarget.c
index 15467fe..bfc2e82 100644 (file)
--- 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)
        }\r
        else\r
        {\r
        }\r
        else\r
        {\r

-               /* If not sending or receiving, just exit */\r
-               if (!(SoftUSART_BitCount))\r
-                 return;\r
-\r

                /* If at falling clock edge and we are in receive mode, abort */\r
                if (!IsSending)\r
                  return;\r
                /* If at falling clock edge and we are in receive mode, abort */\r
                if (!IsSending)\r
                  return;\r