Remove since long deprecated ft2232 driver

[openocd.git] / src / svf / svf.c

diff --git a/src/svf/svf.c b/src/svf/svf.c
index cf0cfae5a031ecf17b23b95e8a174b213680993d..e7e815c1046513e8a9f003477a28f7dfb89c7923 100644 (file)
--- a/src/svf/svf.c
+++ b/src/svf/svf.c
@@ -13,9 +13,7 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *

  ***************************************************************************/
 
 /* The specification for SVF is available here:
  ***************************************************************************/
 
 /* The specification for SVF is available here:


@@ -216,13 +214,14 @@ static int svf_read_command_from_file(FILE *fd);
 static int svf_check_tdo(void);
 static int svf_add_check_para(uint8_t enabled, int buffer_offset, int bit_len);
 static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str);
 static int svf_check_tdo(void);
 static int svf_add_check_para(uint8_t enabled, int buffer_offset, int bit_len);
 static int svf_run_command(struct command_context *cmd_ctx, char *cmd_str);

+static int svf_execute_tap(void);

 
 static FILE *svf_fd;
 static char *svf_read_line;
 static size_t svf_read_line_size;
 static char *svf_command_buffer;
 static size_t svf_command_buffer_size;
 
 static FILE *svf_fd;
 static char *svf_read_line;
 static size_t svf_read_line_size;
 static char *svf_command_buffer;
 static size_t svf_command_buffer_size;

-static int svf_line_number = 1;
+static int svf_line_number;

 static int svf_getline(char **lineptr, size_t *n, FILE *stream);
 
 #define SVF_MAX_BUFFER_SIZE_TO_COMMIT   (1024 * 1024)
 static int svf_getline(char **lineptr, size_t *n, FILE *stream);
 
 #define SVF_MAX_BUFFER_SIZE_TO_COMMIT   (1024 * 1024)


@@ -258,7 +257,7 @@ static void svf_hexbuf_print(int dbg_lvl, const char *file, unsigned line,
        int msbits = bit_len % 8;
 
        /* allocate 2 bytes per hex digit */
        int msbits = bit_len % 8;
 
        /* allocate 2 bytes per hex digit */

-       char *prbuf = malloc((byte_len * 2) + 1);
+       char *prbuf = malloc((byte_len * 2) + 2 + 1);

        if (!prbuf)
                return;
 
        if (!prbuf)
                return;
 


@@ -277,6 +276,9 @@ static int svf_realloc_buffers(size_t len)
 {
        void *ptr;
 
 {
        void *ptr;
 

+       if (svf_execute_tap() != ERROR_OK)
+               return ERROR_FAIL;
+

        ptr = realloc(svf_tdi_buffer, len);
        if (!ptr)
                return ERROR_FAIL;
        ptr = realloc(svf_tdi_buffer, len);
        if (!ptr)
                return ERROR_FAIL;


@@ -359,7 +361,7 @@ COMMAND_HANDLER(handle_svf_command)
 #define SVF_MAX_NUM_OF_OPTIONS 5
        int command_num = 0;
        int ret = ERROR_OK;
 #define SVF_MAX_NUM_OF_OPTIONS 5
        int command_num = 0;
        int ret = ERROR_OK;

-       long long time_measure_ms;
+       int64_t time_measure_ms;

        int time_measure_s, time_measure_m;
 
        /* use NULL to indicate a "plain" svf file which accounts for
        int time_measure_s, time_measure_m;
 
        /* use NULL to indicate a "plain" svf file which accounts for


@@ -374,6 +376,7 @@ COMMAND_HANDLER(handle_svf_command)
        /* parse command line */
        svf_quiet = 0;
        svf_nil = 0;
        /* parse command line */
        svf_quiet = 0;
        svf_nil = 0;

+       svf_progress_enabled = 0;

        svf_ignore_error = 0;
        for (unsigned int i = 0; i < CMD_ARGC; i++) {
                if (strcmp(CMD_ARGV[i], "-tap") == 0) {
        svf_ignore_error = 0;
        for (unsigned int i = 0; i < CMD_ARGC; i++) {
                if (strcmp(CMD_ARGV[i], "-tap") == 0) {


@@ -413,7 +416,7 @@ COMMAND_HANDLER(handle_svf_command)
        time_measure_ms = timeval_ms();
 
        /* init */
        time_measure_ms = timeval_ms();
 
        /* init */

-       svf_line_number = 1;
+       svf_line_number = 0;

        svf_command_buffer_size = 0;
 
        svf_check_tdo_para_index = 0;
        svf_command_buffer_size = 0;
 
        svf_check_tdo_para_index = 0;


@@ -532,7 +535,7 @@ COMMAND_HANDLER(handle_svf_command)
        time_measure_s %= 60;
        if (time_measure_ms < 1000)
                command_print(CMD_CTX,
        time_measure_s %= 60;
        if (time_measure_ms < 1000)
                command_print(CMD_CTX,

-                       "\r\nTime used: %dm%ds%lldms ",
+                       "\r\nTime used: %dm%ds%" PRId64 "ms ",

                        time_measure_m,
                        time_measure_s,
                        time_measure_ms);
                        time_measure_m,
                        time_measure_s,
                        time_measure_ms);


@@ -1030,6 +1033,19 @@ XXR_common:
                        }
                        i_tmp = xxr_para_tmp->len;
                        xxr_para_tmp->len = atoi(argus[1]);
                        }
                        i_tmp = xxr_para_tmp->len;
                        xxr_para_tmp->len = atoi(argus[1]);

+                       /* If we are to enlarge the buffers, all parts of xxr_para_tmp
+                        * need to be freed */
+                       if (i_tmp < xxr_para_tmp->len) {
+                               free(xxr_para_tmp->tdi);
+                               xxr_para_tmp->tdi = NULL;
+                               free(xxr_para_tmp->tdo);
+                               xxr_para_tmp->tdo = NULL;
+                               free(xxr_para_tmp->mask);
+                               xxr_para_tmp->mask = NULL;
+                               free(xxr_para_tmp->smask);
+                               xxr_para_tmp->smask = NULL;
+                       }
+

                        LOG_DEBUG("\tlength = %d", xxr_para_tmp->len);
                        xxr_para_tmp->data_mask = 0;
                        for (i = 2; i < num_of_argu; i += 2) {
                        LOG_DEBUG("\tlength = %d", xxr_para_tmp->len);
                        xxr_para_tmp->data_mask = 0;
                        for (i = 2; i < num_of_argu; i += 2) {