From: Dean Camera <dean@fourwalledcubicle.com>
Date: Thu, 25 Feb 2010 02:47:42 +0000 (+0000)
Subject: Fix TWI driver not aborting when faced with no response after attempting to address... 
X-Git-Tag: LUFA-110528-BETA~568
X-Git-Url: http://git.linex4red.de/pub/USBasp.git/commitdiff_plain/634abab38ac6a9ebdae67b2da5d100874b6c4f73

Fix TWI driver not aborting when faced with no response after attempting to address a device on the bus.
---

diff --git a/LUFA/Drivers/Peripheral/TWI.c b/LUFA/Drivers/Peripheral/TWI.c
index eb513c454..798667997 100644
--- a/LUFA/Drivers/Peripheral/TWI.c
+++ b/LUFA/Drivers/Peripheral/TWI.c
@@ -66,8 +66,8 @@ bool TWI_StartTransmission(uint8_t SlaveAddress, uint8_t TimeoutMS)
 			case TW_MR_SLA_ACK:
 				return true;
 			default:
-				TWI_StopTransmission();
-				break;
+				TWCR = ((1 << TWINT) | (1 << TWSTO) | (1 << TWEN));
+				return false;
 		}
 	}
 }
diff --git a/LUFA/ManPages/ChangeLog.txt b/LUFA/ManPages/ChangeLog.txt
index 155afa099..0ef0fbc95 100644
--- a/LUFA/ManPages/ChangeLog.txt
+++ b/LUFA/ManPages/ChangeLog.txt
@@ -20,6 +20,7 @@
   *  <b>Fixed:</b>
   *  - Fixed software PDI/TPI programming mode in the AVRISP project not correctly toggling just the clock pin
   *  - Fixed TWI_StartTransmission() corrupting the contents of the GPIOR0 register
+  *  - Fix TWI driver not aborting when faced with no response after attempting to address a device on the bus
   *
   *  \section Sec_ChangeLog100219 Version 100219
   *