From 943b1e0ed49588f32ec2fb22c7050d02136252b8 Mon Sep 17 00:00:00 2001
From: Hannes Weisbach <hannes_weisbach@gmx.net>
Date: Thu, 19 Sep 2013 16:07:35 +0000
Subject: [PATCH] task #12798 Please cleanup #ifdef notyet entries in avrftdi.c

git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@1245 81a1dc3b-b13d-400b-aceb-764788c761c2
---
 ChangeLog |  5 ++++
 avrftdi.c | 72 -------------------------------------------------------
 2 files changed, 5 insertions(+), 72 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e44602e7..c7be1bb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-19  Hannes Weisbach <hannes_weisbach@gmx.net>
+
+	task #12798: Please cleanup #ifdef notyet entries in avrftdi.c
+	* avrftdi.c: ditto.
+
 2013-09-17  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	bug #40055: AVRDUDE segfaults when writing eeprom
diff --git a/avrftdi.c b/avrftdi.c
index 40a09015..c2ef4246 100644
--- a/avrftdi.c
+++ b/avrftdi.c
@@ -490,73 +490,6 @@ static inline int avrftdi_transmit(PROGRAMMER * pgm, unsigned char mode, const u
 		return avrftdi_transmit_mpsse(pdata, mode, buf, data, buf_size);
 }
 
-#ifdef notyet
-/* this function tries to sync up with the FTDI. See FTDI application note AN_129.
- * AN_135 uses 0xab as bad command and enables/disables loopback around synchronisation.
- * This may fail if data is left in the buffer (i.e. avrdude aborted with ctrl-c)
- * or the device is in an illegal state (i.e. a previous program).
- * If the FTDI is out of sync, the buffers are cleared ("purged") and the
- * sync is re-tried.
- * if it still fails, we return an error code. higher level code may than abort.
- * the device may be reset by unplugging the device and plugging it back in.
- * resetting the device did not always help for me.
- */
-static int ftdi_sync(avrftdi_t* pdata)
-{
-	unsigned char illegal_cmd[] = {0xaa};
-	unsigned char reply[2];
-	unsigned int i, n;
-	unsigned int retry = 0;
-	unsigned char latency;
-
-	ftdi_get_latency_timer(pdata->ftdic, &latency);
-	fprintf(stderr, "Latency: %d\n", latency);
-
-	do{
-		n = ftdi_read_data(pdata->ftdic, reply, 1);
-	} while(n > 0);
-retry:
-	/* send command "0xaa", which is an illegal command. */
-	E(ftdi_write_data(pdata->ftdic, illegal_cmd, sizeof(illegal_cmd)) != sizeof(illegal_cmd), pdata->ftdic);
-	
-	i = 0;
-	do {
-#ifndef DRYRUN
-		n = ftdi_read_data(pdata->ftdic, &reply[i], sizeof(reply) - i);
-		E(n < 0, pdata->ftdic);
-		//fprintf(stderr, "%s\n", ftdi_get_error_string(pdata->ftdic));
-#else
-		n = sizeof(reply) - i;
-#endif
-		i += n;
-	} while (i < sizeof(reply));
-
-	/* 0xfa is return code for illegal command - we expect that, since we issued an
-	 * illegal command (0xaa)
-	 * the next byte will be the illegal command, the FTDI is complaining about.
-	 */
-	if(reply[0] == 0xfa && reply[1] == illegal_cmd[0])
-	{
-		/* if the FTDI is complaining about the right thing, everything is fine */
-		fprintf(stderr, "FTDI is in sync.\n");
-		return 0;
-	}
-		else
-	{
-		fprintf(stderr, "FTDI out of sync. Received 0x%02x 0x%02x\n", reply[0], reply[1]);
-		if(retry < 4)
-		{
-			fprintf(stderr, "Trying to re-sync by purging buffers. Attempt\n");
-			E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
-			retry++;
-			goto retry;
-		} else
-			fprintf(stderr, "Aborting. Try resetting or unplugging the device.\n");
-	}
-	return -1;
-}
-#endif /* notyet */
-
 static int write_flush(avrftdi_t* pdata)
 {
 	unsigned char buf[6];
@@ -810,11 +743,6 @@ static int avrftdi_open(PROGRAMMER * pgm, char *port)
 	E(ftdi_set_bitmode(pdata->ftdic, pdata->pin_direction & 0xff, BITMODE_MPSSE) < 0, pdata->ftdic);
 	E(ftdi_usb_purge_buffers(pdata->ftdic), pdata->ftdic);
 
-#ifdef notyet
-	ret = ftdi_sync(pdata);
-	if(ret < 0)
-		return ret;
-#endif
 	write_flush(pdata);
 
 	if (pgm->baudrate) {