sync up to tap_xxx rename + add with-ioutil for standalone openocd implemetnations

git-svn-id: svn://svn.berlios.de/openocd/trunk@1243 b42882b7-edfa-0310-969c-e2dbd0fdcd60

configure.in

@@ -67,6 +67,10 @@ AC_ARG_ENABLE(ecosboard,
   AS_HELP_STRING([--enable-ecosboard], [Enable building support for eCosBoard based JTAG debugger]), 
   [build_ecosboard=$enableval], [build_ecosboard=no])
 
+AC_ARG_ENABLE(ioutil,
+  AS_HELP_STRING([--enable-ioutil], [Enable ioutil functions - useful for standalone OpenOCD implementations]), 
+  [build_ioutil=$enableval], [build_ioutil=no])
+
 case "${host_cpu}" in 
   arm*)
     AC_ARG_ENABLE(ep93xx,
@@ -179,6 +183,12 @@ else
   AC_DEFINE(BUILD_ECOSBOARD, 0, [0 if you don't want eCosBoard.])
 fi
 
+if test $build_ioutil = yes; then
+  AC_DEFINE(BUILD_IOUTIL, 1, [1 if you want ioutils.])
+else
+  AC_DEFINE(BUILD_IOUTIL, 0, [0 if you don't want ioutils.])
+fi
+
 if test $build_at91rm9200 = yes; then
   build_bitbang=yes
   AC_DEFINE(BUILD_AT91RM9200, 1, [1 if you want at91rm9200.])
@@ -274,6 +284,7 @@ AM_CONDITIONAL(DUMMY, test $build_dummy = yes)
 AM_CONDITIONAL(GIVEIO, test $parport_use_giveio = yes)
 AM_CONDITIONAL(EP93XX, test $build_ep93xx = yes)
 AM_CONDITIONAL(ECOSBOARD, test $build_ecosboard = yes)
+AM_CONDITIONAL(IOUTIL, test $build_ioutil = yes)
 AM_CONDITIONAL(AT91RM9200, test $build_at91rm9200 = yes)
 AM_CONDITIONAL(BITBANG, test $build_bitbang = yes)
 AM_CONDITIONAL(FT2232_LIBFTDI, test $build_ft2232_libftdi = yes)

src/Makefile.am

@@ -6,6 +6,7 @@ else
 MAINFILE = main.c
 endif
 
+
 openocd_SOURCES = $(MAINFILE) openocd.c
 
 # set the include path found by configure

src/helper/Makefile.am

@@ -9,9 +9,16 @@ else
 CONFIGFILES = options.c jim.c jim-eventloop.c 
 endif
 
+
+
 libhelper_a_SOURCES = binarybuffer.c $(CONFIGFILES) configuration.c log.c command.c time_support.c \
 	replacements.c fileio.c startup_tcl.c
 
+if IOUTIL
+libhelper_a_SOURCES += ioutil.c
+endif
+
+
 noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
 	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
 	startup.tcl bin2char.c

src/helper/ioutil.c

+/***************************************************************************
+ *   Copyright (C) 2007-2008 by yvind Harboe                              *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   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.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+/* this file contains various functionality useful to standalone systems */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "log.h"
+#include "types.h"
+#include "configuration.h"
+#include "target.h"
+
+#include "command.h"
+
+#include <time_support.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <strings.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#if !BUILD_ECOSBOARD
+#include <malloc.h>
+#endif
+#include <errno.h>
+
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <netinet/tcp.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <unistd.h>
+#include <arpa/inet.h>
+#include <stdio.h>
+#include <string.h>
+
+
+#include <unistd.h>
+#include <stdio.h>
+
+int handle_rm_command(struct command_context_s *cmd_ctx, char *cmd,
+		char **args, int argc)
+{
+	if (argc != 1)
+	{
+		command_print(cmd_ctx, "rm <filename>");
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	if (unlink(args[0]) != 0)
+	{
+		command_print(cmd_ctx, "failed: %d", errno);
+	}
+
+	return ERROR_OK;
+}
+
+
+/* loads a file and returns a pointer to it in memory. The file contains
+ * a 0 byte(sentinel) after len bytes - the length of the file. */
+int loadFile(const char *fileName, void **data, int *len)
+{
+	FILE * pFile;
+	pFile = fopen(fileName,"rb");
+	if (pFile==NULL)
+	{
+		LOG_ERROR("Can't open %s\n", fileName);
+		return ERROR_FAIL;
+	}
+	if (fseek(pFile, 0, SEEK_END)!=0)
+	{
+		LOG_ERROR("Can't open %s\n", fileName);
+		fclose(pFile);
+		return ERROR_FAIL;
+	}
+	*len=ftell(pFile);
+	if (*len==-1)
+	{
+		LOG_ERROR("Can't open %s\n", fileName);
+		fclose(pFile);
+		return ERROR_FAIL;
+	}
+
+	if (fseek(pFile, 0, SEEK_SET)!=0)
+	{
+		LOG_ERROR("Can't open %s\n", fileName);
+		fclose(pFile);
+		return ERROR_FAIL;
+	}
+	*data=malloc(*len+1);
+	if (*data==NULL)
+	{
+		LOG_ERROR("Can't open %s\n", fileName);
+		fclose(pFile);
+		return ERROR_FAIL;
+	}
+
+	if (fread(*data, 1, *len, pFile)!=*len)
+	{
+		fclose(pFile);
+		free(*data);
+		LOG_ERROR("Can't open %s\n", fileName);
+		return ERROR_FAIL;
+	}
+	fclose(pFile);
+	*(((char *)(*data))+*len)=0; /* sentinel */
+
+	return ERROR_OK;
+
+
+
+}
+
+
+
+int handle_cat_command(struct command_context_s *cmd_ctx, char *cmd,
+		char **args, int argc)
+{
+	if (argc != 1)
+	{
+		command_print(cmd_ctx, "cat <filename>");
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	// NOTE!!! we only have line printing capability so we print the entire file as a single line.
+	void *data;
+	int len;
+
+	int retval = loadFile(args[0], &data, &len);
+	if (retval == ERROR_OK)
+	{
+		command_print(cmd_ctx, "%s", data);
+		free(data);
+	}
+	else
+	{
+		command_print(cmd_ctx, "%s not found %d", args[0], retval);
+	}
+
+	return ERROR_OK;
+}
+int handle_trunc_command(struct command_context_s *cmd_ctx, char *cmd,
+		char **args, int argc)
+{
+	if (argc != 1)
+	{
+		command_print(cmd_ctx, "trunc <filename>");
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	FILE *config_file = NULL;
+	config_file = fopen(args[0], "w");
+	if (config_file != NULL)
+		fclose(config_file);
+
+	return ERROR_OK;
+}
+
+
+int handle_meminfo_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	static int prev = 0;
+	struct mallinfo info;
+
+	if (argc != 0)
+	{
+		command_print(cmd_ctx, "meminfo");
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	info = mallinfo();
+
+	if (prev > 0)
+	{
+		command_print(cmd_ctx, "Diff:            %d", prev - info.fordblks);
+	}
+	prev = info.fordblks;
+
+	command_print(cmd_ctx, "Available ram:   %d", info.fordblks );
+
+	return ERROR_OK;
+}
+
+
+int handle_append_command(struct command_context_s *cmd_ctx, char *cmd,
+		char **args, int argc)
+{
+	if (argc < 1)
+	{
+		command_print(cmd_ctx,
+				"append <filename> [<string1>, [<string2>, ...]]");
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	FILE *config_file = NULL;
+	config_file = fopen(args[0], "a");
+	if (config_file != NULL)
+	{
+		int i;
+		fseek(config_file, 0, SEEK_END);
+
+		for (i = 1; i < argc; i++)
+		{
+			fwrite(args[i], strlen(args[i]), 1, config_file);
+			if (i != argc - 1)
+			{
+				fwrite(" ", 1, 1, config_file);
+			}
+		}
+		fwrite("\n", 1, 1, config_file);
+		fclose(config_file);
+	}
+
+	return ERROR_OK;
+}
+
+
+
+int handle_cp_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	if (argc != 2)
+	{
+		return ERROR_INVALID_ARGUMENTS;
+	}
+
+	// NOTE!!! we only have line printing capability so we print the entire file as a single line.
+	void *data;
+	int len;
+
+	int retval = loadFile(args[0], &data, &len);
+	if (retval != ERROR_OK)
+		return retval;
+
+	FILE *f = fopen(args[1], "wb");
+	if (f == NULL)
+		retval = ERROR_INVALID_ARGUMENTS;
+
+	int pos = 0;
+	for (;;)
+	{
+		int chunk = len - pos;
+		static const int maxChunk = 512 * 1024; // ~1/sec
+		if (chunk > maxChunk)
+		{
+			chunk = maxChunk;
+		}
+
+		if ((retval==ERROR_OK)&&(fwrite(((char *)data)+pos, 1, chunk, f)!=chunk))
+			retval = ERROR_INVALID_ARGUMENTS;
+
+		if (retval != ERROR_OK)
+		{
+			break;
+		}
+
+		command_print(cmd_ctx, "%d", len - pos);
+
+		pos += chunk;
+
+		if (pos == len)
+			break;
+	}
+
+	if (retval == ERROR_OK)
+	{
+		command_print(cmd_ctx, "Copied %s to %s", args[0], args[1]);
+	} else
+	{
+		command_print(cmd_ctx, "Failed: %d", retval);
+	}
+
+	if (data != NULL)
+		free(data);
+	if (f != NULL)
+		fclose(f);
+
+	if (retval != ERROR_OK)
+		unlink(args[1]);
+
+	return retval;
+}
+
+
+
+
+#define SHOW_RESULT(a, b) LOG_ERROR(#a " failed %d\n", (int)b)
+
+#define IOSIZE 512
+void copyfile(char *name2, char *name1)
+{
+
+	int err;
+	char buf[IOSIZE];
+	int fd1, fd2;
+	ssize_t done, wrote;
+
+	fd1 = open(name1, O_WRONLY | O_CREAT);
+	if (fd1 < 0)
+		SHOW_RESULT( open, fd1 );
+
+	fd2 = open(name2, O_RDONLY);
+	if (fd2 < 0)
+		SHOW_RESULT( open, fd2 );
+
+	for (;;)
+	{
+		done = read(fd2, buf, IOSIZE );
+		if (done < 0)
+		{
+			SHOW_RESULT( read, done );
+			break;
+		}
+
+        if( done == 0 ) break;
+
+		wrote = write(fd1, buf, done);
+        if( wrote != done ) SHOW_RESULT( write, wrote );
+
+        if( wrote != done ) break;
+	}
+
+	err = close(fd1);
+    if( err < 0 ) SHOW_RESULT( close, err );
+
+	err = close(fd2);
+    if( err < 0 ) SHOW_RESULT( close, err );
+
+}
+
+/* utility fn to copy a directory */
+void copydir(char *name, char *destdir)
+{
+	int err;
+	DIR *dirp;
+
+	dirp = opendir(destdir);
+	if (dirp==NULL)
+	{
+		mkdir(destdir, 0777);
+	} else
+	{
+		err = closedir(dirp);
+	}
+
+	dirp = opendir(name);
+    if( dirp == NULL ) SHOW_RESULT( opendir, -1 );
+
+	for (;;)
+	{
+		struct dirent *entry = readdir(dirp);
+
+		if (entry == NULL)
+			break;
+
+		if (strcmp(entry->d_name, ".") == 0)
+			continue;
+		if (strcmp(entry->d_name, "..") == 0)
+			continue;
+
+		int isDir = 0;
+		struct stat buf;
+		char fullPath[PATH_MAX];
+		strncpy(fullPath, name, PATH_MAX);
+		strcat(fullPath, "/");
+		strncat(fullPath, entry->d_name, PATH_MAX - strlen(fullPath));
+
+		if (stat(fullPath, &buf) == -1)
+		{
+			LOG_ERROR("unable to read status from %s", fullPath);
+			break;
+		}
+		isDir = S_ISDIR(buf.st_mode) != 0;
+
+		if (isDir)
+			continue;
+
+		//        diag_printf("<INFO>: entry %14s",entry->d_name);
+		char fullname[PATH_MAX];
+		char fullname2[PATH_MAX];
+
+		strcpy(fullname, name);
+		strcat(fullname, "/");
+		strcat(fullname, entry->d_name);
+
+		strcpy(fullname2, destdir);
+		strcat(fullname2, "/");
+		strcat(fullname2, entry->d_name);
+		//        diag_printf("from %s to %s\n", fullname, fullname2);
+		copyfile(fullname, fullname2);
+
+		//       diag_printf("\n");
+	}
+
+	err = closedir(dirp);
+    if( err < 0 ) SHOW_RESULT( stat, err );
+}
+
+
+
+
+static int
+zylinjtag_Jim_Command_rm(Jim_Interp *interp,
+                                   int argc,
+		Jim_Obj * const *argv)
+{
+	int del;
+	if (argc != 2)
+	{
+		Jim_WrongNumArgs(interp, 1, argv, "rm ?dirorfile?");
+		return JIM_ERR;
+	}
+
+	del = 0;
+	if (unlink(Jim_GetString(argv[1], NULL)) == 0)
+		del = 1;
+	if (rmdir(Jim_GetString(argv[1], NULL)) == 0)
+		del = 1;
+
+	return del ? JIM_OK : JIM_ERR;
+}
+
+
+static int
+zylinjtag_Jim_Command_ls(Jim_Interp *interp,
+                                   int argc,
+		Jim_Obj * const *argv)
+{
+	if (argc != 2)
+	{
+		Jim_WrongNumArgs(interp, 1, argv, "ls ?dir?");
+		return JIM_ERR;
+	}
+
+	char *name = (char*) Jim_GetString(argv[1], NULL);
+
+	DIR *dirp = NULL;
+	dirp = opendir(name);
+	if (dirp == NULL)
+	{
+		return JIM_ERR;
+	}
+	Jim_Obj *objPtr = Jim_NewListObj(interp, NULL, 0);
+
+	for (;;)
+	{
+		struct dirent *entry = NULL;
+		entry = readdir(dirp);
+		if (entry == NULL)
+			break;
+
+		if ((strcmp(".", entry->d_name)==0)||(strcmp("..", entry->d_name)==0))
+			continue;
+
+        Jim_ListAppendElement(interp, objPtr, Jim_NewStringObj(interp, entry->d_name, strlen(entry->d_name)));
+	}
+	closedir(dirp);
+
+	Jim_SetResult(interp, objPtr);
+
+	return JIM_OK;
+}
+
+int handle_peek_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	if (argc != 1)
+	{
+		return ERROR_COMMAND_SYNTAX_ERROR;
+	}
+	volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
+	int value=*address;
+	command_print(cmd_ctx, "0x%x : 0x%x", address, value);
+	return ERROR_OK;
+}
+
+int handle_poke_command(struct command_context_s *cmd_ctx, char *cmd, char **args, int argc)
+{
+	if (argc != 2)
+	{
+		return ERROR_INVALID_ARGUMENTS;
+	}
+	volatile int *address=(volatile int *)strtoul(args[0], NULL, 0);
+	int value=strtoul(args[1], NULL, 0);
+	*address=value;
+	return ERROR_OK;
+}
+
+static int
+zylinjtag_Jim_Command_peek(Jim_Interp *interp,
+                                   int argc,
+		Jim_Obj * const *argv)
+{
+	if (argc != 2)
+	{
+		Jim_WrongNumArgs(interp, 1, argv, "peek ?address?");
+		return JIM_ERR;
+	}
+
+	long address;
+	if (Jim_GetLong(interp, argv[1], &address) != JIM_OK)
+		return JIM_ERR;
+
+	int value = *((volatile int *) address);
+
+	Jim_SetResult(interp, Jim_NewIntObj(interp, value));
+
+	return JIM_OK;
+}
+
+static int
+zylinjtag_Jim_Command_poke(Jim_Interp *interp,
+                                   int argc,
+		Jim_Obj * const *argv)
+{
+	if (argc != 3)
+	{
+		Jim_WrongNumArgs(interp, 1, argv, "poke ?address? ?value?");
+		return JIM_ERR;
+	}
+
+	long address;
+	if (Jim_GetLong(interp, argv[1], &address) != JIM_OK)
+		return JIM_ERR;
+	long value;
+	if (Jim_GetLong(interp, argv[2], &value) != JIM_OK)
+		return JIM_ERR;
+
+	*((volatile int *) address) = value;
+
+	return JIM_OK;
+}
+
+int ioutil_init(struct command_context_s *cmd_ctx)
+{
+	register_command(cmd_ctx, NULL, "rm", handle_rm_command, COMMAND_ANY,
+			"remove file");
+
+	register_command(cmd_ctx, NULL, "cat", handle_cat_command, COMMAND_ANY,
+			"display file content");
+
+	register_command(cmd_ctx, NULL, "trunc", handle_trunc_command, COMMAND_ANY,
+			"truncate a file to 0 size");
+
+	register_command(cmd_ctx, NULL, "cp", handle_cp_command,