From b165bbbaf889e644b2ba2e07b0fae6ed36dc08ef Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Tue, 19 Nov 2002 10:47:36 +0000
Subject: [PATCH] Moved help command implementation to separate file (help.c).

git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@270 b68d4a1b-bc3d-0410-92ed-d4ac073336b7
---
 jtag/src/Makefile.am |  2 +-
 jtag/src/help.c      | 51 ++++++++++++++++++++++++++++++++++++++++++++
 jtag/src/jtag.c      | 24 ++++++---------------
 3 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 jtag/src/help.c

diff --git a/jtag/src/Makefile.am b/jtag/src/Makefile.am
index cff3e020..8e8901da 100644
--- a/jtag/src/Makefile.am
+++ b/jtag/src/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = \
 
 bin_PROGRAMS = jtag
 
-jtag_SOURCES = jtag.c detect.c readmem.c detect.h bus.h pxa250.c sa1110.c cfi.c flash.c
+jtag_SOURCES = jtag.c detect.c readmem.c detect.h bus.h pxa250.c sa1110.c cfi.c flash.c help.c
 
 jtag_DEPENDENCIES = tap/libtap.a part/libpart.a
 
diff --git a/jtag/src/help.c b/jtag/src/help.c
new file mode 100644
index 00000000..86299093
--- /dev/null
+++ b/jtag/src/help.c
@@ -0,0 +1,51 @@
+/*
+ * $Id$
+ *
+ * Copyright (C) 2002 ETC s.r.o.
+ *
+ * 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.
+ *
+ * Written by Marcel Telka <marcel@telka.sk>, 2002.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdio.h>
+
+void
+help( const char *cmd )
+{
+	if (!cmd) {
+		printf( "Command list:\n\n" );
+		printf( "quit\t\texit from jtag\n" );
+		printf( "help\t\tdisplay this help\n" );
+		printf( "detect\t\tdetect parts on the JTAG chain\n" );
+		printf( "print\t\tdisplay JTAG chain list/status\n" );
+		printf( "instruction\tchange active instruction for a part\n" );
+		printf( "shift\t\tshift data/instruction register through JTAG chain\n" );
+		printf( "dr\t\tdisplay active data register for a part\n" );
+		printf( "detectflash\tdetect parameters of flash chip attached to a part\n" );
+		printf( "readmem\t\tread content of the memory and write it to file\n" );
+		printf( "flashmem\tburn flash memory with data from a file\n" );
+		printf( "set\t\tTODO\n" );
+		printf( "\nType \"help <command>\" for details about particular command.\n" );
+	} else {
+		printf( "Not implemented. Sorry.\n" );
+	}
+}
diff --git a/jtag/src/jtag.c b/jtag/src/jtag.c
index 09224d8d..4f65fafe 100644
--- a/jtag/src/jtag.c
+++ b/jtag/src/jtag.c
@@ -51,6 +51,8 @@ void readmem( parts *ps, FILE *f, uint32_t addr, uint32_t len );
 void flashmem( parts *ps, FILE *f, uint32_t addr );
 void flashmsbin( parts *ps, FILE *f );
 
+void help( const char *cmd );
+
 int
 main( void )
 {
@@ -94,24 +96,10 @@ main( void )
 
 		if (strcmp( t, "help" ) == 0) {
 			t = get_token( NULL );
-			if (!t) {
-				printf( "Command list:\n\n" );
-				printf( "quit\t\texit from jtag\n" );
-				printf( "help\t\tdisplay this help\n" );
-				printf( "detect\t\tdetect parts on the JTAG chain\n" );
-				printf( "print\t\tdisplay JTAG chain list/status\n" );
-				printf( "instruction\tchange active instruction for a part\n" );
-				printf( "shift\t\tshift data/instruction register through JTAG chain\n" );
-				printf( "dr\t\tdisplay active data register for a part\n" );
-				printf( "detectflash\tdetect parameters of flash chip attached to a part\n" );
-				printf( "readmem\t\tread content of the memory and write it to file\n" );
-				printf( "flashmem\tburn flash memory with data from a file\n" );
-				printf( "set\t\tTODO\n" );
-				printf( "\nType \"help <command>\" for details about particular command.\n" );
-				continue;
-			} else {
-				printf( "Not implemented. Sorry.\n" );
-			}
+			if (get_token( NULL ))
+				printf( "help: Syntax error!\n" );
+			else
+				help( t );
 			continue;
 		}