From: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Date: Sat, 16 Jul 2011 14:32:50 +0000 (+0200)
Subject: rlink: remove duplicated code
X-Git-Tag: v0.6.0-rc1~626
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=5f698273c21ae969177c83fe094de9c7f0b83bf1

rlink: remove duplicated code

After the reply_index handling is fixed, there's no need to special case
the out scan.

Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
---

diff --git a/src/jtag/drivers/rlink.c b/src/jtag/drivers/rlink.c
index d0b18b1ba9..4b2e542831 100644
--- a/src/jtag/drivers/rlink.c
+++ b/src/jtag/drivers/rlink.c
@@ -688,26 +688,16 @@ dtc_queue_run(void) {
 
 	dtc_queue.cmd_buffer[dtc_queue.cmd_index++] = DTC_CMD_STOP;
 
-	/* run the cmd */
-	if (dtc_queue.rq_head == NULL) {
-		usb_err = dtc_run_download(pHDev,
-				dtc_queue.cmd_buffer, dtc_queue.cmd_index,
-				NULL, 0
-		);
-		if (usb_err < 0) {
-			LOG_ERROR("dtc_run_download: %s", usb_strerror());
-			exit(1);
-		}
-	} else {
-		usb_err = dtc_run_download(pHDev,
-				dtc_queue.cmd_buffer, dtc_queue.cmd_index,
-				reply_buffer, dtc_queue.reply_index
-		);
-		if (usb_err < 0) {
-			LOG_ERROR("dtc_run_download: %s", usb_strerror());
-			exit(1);
-		}
+	usb_err = dtc_run_download(pHDev,
+			dtc_queue.cmd_buffer, dtc_queue.cmd_index,
+			reply_buffer, dtc_queue.reply_index
+	);
+	if (usb_err < 0) {
+		LOG_ERROR("dtc_run_download: %s", usb_strerror());
+		exit(1);
+	}
 
+	if (dtc_queue.rq_head != NULL) {
 		/* process the reply, which empties the reply queue and frees its entries */
 		dtc_p = reply_buffer;