CMSIS-DAP: Fix build errors on Mac OS X

[openocd.git] / src / jtag / drivers / ft2232.c

diff --git a/src/jtag/drivers/ft2232.c b/src/jtag/drivers/ft2232.c
index 4b3360fe701bb92bf1d4c690c469e5930633c60d..c4a74ef7f38de2171336214131762d7a34cf5840 100644 (file)
--- a/src/jtag/drivers/ft2232.c
+++ b/src/jtag/drivers/ft2232.c
@@ -24,7 +24,7 @@
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+*   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
 ***************************************************************************/
 
 /**
@@ -1108,6 +1108,11 @@ static int ft2232_large_scan(struct scan_command *cmd,
        int retval;
        int thisrun_read = 0;
 
+       if (!receive_buffer) {
+               LOG_ERROR("failed to allocate memory");
+               exit(-1);
+       }
+
        if (cmd->ir_scan) {
                LOG_ERROR("BUG: large IR scans are not supported");
                exit(-1);
@@ -1273,6 +1278,8 @@ static int ft2232_large_scan(struct scan_command *cmd,
                        (int)bytes_read);
        }
 
+       free(receive_buffer);
+
        return ERROR_OK;
 }
 
@@ -1504,7 +1511,8 @@ static void minimodule_reset(int trst, int srst)
 
 static void turtle_reset(int trst, int srst)
 {
-       trst = trst;
+       if (trst == 1)
+               LOG_ERROR("Can't assert TRST: the adapter lacks this signal");
 
        if (srst == 1)
                low_output |= nSRST;
@@ -3134,9 +3142,8 @@ static void flossjtag_blink(void)
 static int ft2232_quit(void)
 {
 #if BUILD_FT2232_FTD2XX == 1
-       FT_STATUS status;
 
-       status = FT_Close(ftdih);
+       FT_Close(ftdih);
 #elif BUILD_FT2232_LIBFTDI == 1
        ftdi_usb_close(&ftdic);