rlink: remove duplicated code
authorAndreas Fritiofson <andreas.fritiofson@gmail.com>
Sat, 16 Jul 2011 14:32:50 +0000 (16:32 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Wed, 10 Aug 2011 04:52:09 +0000 (06:52 +0200)
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>
src/jtag/drivers/rlink.c

index d0b18b1..4b2e542 100644 (file)
@@ -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;