# HG changeset patch # User Michael Spacefalcon # Date 1367642189 0 # Node ID e658a84b37df365446e05f180168250e39a2d7fb # Parent 67a39d8914a83882c3cb528b73cb9ca8cb6b532b loadtool coming along diff -r 67a39d8914a8 -r e658a84b37df loadtools/Makefile --- a/loadtools/Makefile Sat May 04 03:47:40 2013 +0000 +++ b/loadtools/Makefile Sat May 04 04:36:29 2013 +0000 @@ -5,8 +5,8 @@ SERTOOL_OBJS= defpath.o hexdecode.o hwparam.o romload.o sercomm.o sertool.o \ srecreader.o ttypassthru.o -LOADTOOL_OBJS= defpath.o hexdecode.o hwparam.o romload.o sercomm.o \ - srecreader.o tpinterf.o +LOADTOOL_OBJS= defpath.o hexdecode.o hwparam.o ltdispatch.o ltmain.o \ + romload.o sercomm.o srecreader.o tpinterf.o all: ${PROGS} ${LOADTOOL_OBJS} diff -r 67a39d8914a8 -r e658a84b37df loadtools/defpath.c --- a/loadtools/defpath.c Sat May 04 03:47:40 2013 +0000 +++ b/loadtools/defpath.c Sat May 04 04:36:29 2013 +0000 @@ -5,3 +5,4 @@ */ char default_helpers_dir[] = "/usr/local/share/freecalypso"; +char default_loadagent_image[] = "/usr/local/share/freecalypso/loadagent.srec"; diff -r 67a39d8914a8 -r e658a84b37df loadtools/ltdispatch.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loadtools/ltdispatch.c Sat May 04 04:36:29 2013 +0000 @@ -0,0 +1,82 @@ +/* + * This module implements the command dispatch for fc-loadtool + */ + +#include +#include +#include +#include +#include + +extern char loadtool_command[]; + +extern int loadtool_cmd_passthru(); + +static int +exitcmd() +{ + exit(0); +} + +static struct cmdtab { + char *cmd; + int minargs; + int maxargs; + int (*func)(); +} cmdtab[] = { + {"dump", 2, 2, loadtool_cmd_passthru}, + {"exit", 0, 0, &exitcmd}, + {"quit", 0, 0, &exitcmd}, + {"r8", 1, 1, loadtool_cmd_passthru}, + {"r16", 1, 1, loadtool_cmd_passthru}, + {"r32", 1, 1, loadtool_cmd_passthru}, + {"w8", 2, 2, loadtool_cmd_passthru}, + {"w16", 2, 2, loadtool_cmd_passthru}, + {"w32", 2, 2, loadtool_cmd_passthru}, + {0, 0, 0, 0} +}; + +loadtool_dispatch_cmd() +{ + char *argv[10]; + char *cp, **ap; + struct cmdtab *tp; + + for (cp = loadtool_command; isspace(*cp); cp++) + ; + if (!*cp || *cp == '#') + return(0); + argv[0] = cp; + while (*cp && !isspace(*cp)) + cp++; + if (*cp) + *cp++ = '\0'; + for (tp = cmdtab; tp->cmd; tp++) + if (!strcmp(tp->cmd, argv[0])) + break; + if (!tp->func) { + fprintf(stderr, "error: no such command\n"); + return(-1); + } + for (ap = argv + 1; ; ) { + while (isspace(*cp)) + cp++; + if (!*cp || *cp == '#') + break; + if (ap - argv - 1 > tp->maxargs) { + fprintf(stderr, "error: too many arguments\n"); + return(-1); + } + *ap++ = cp; + while (*cp && !isspace(*cp)) + cp++; + if (*cp) + *cp++ = '\0'; + } + if (ap - argv - 1 < tp->minargs) { + fprintf(stderr, "error: too few arguments\n"); + return(-1); + } + *ap = 0; + return tp->func(ap - argv, argv); +} diff -r 67a39d8914a8 -r e658a84b37df loadtools/ltmain.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loadtools/ltmain.c Sat May 04 04:36:29 2013 +0000 @@ -0,0 +1,68 @@ +/* + * This module contains the main() function for fc-loadtool + */ + +#include +#include +#include +#include +#include +#include "srecreader.h" + +extern char *target_ttydev; +extern struct srecreader iramimage; +extern char default_loadagent_image[]; + +char loadtool_command[512]; + +main(argc, argv) + char **argv; +{ + extern char *optarg; + extern int optind; + int c; + + while ((c = getopt(argc, argv, "a:h:H:i:")) != EOF) + switch (c) { + case 'a': + iramimage.filename = optarg; + continue; + case 'h': + read_hwparam_file_shortname(optarg); + continue; + case 'H': + read_hwparam_file_fullpath(optarg); + continue; + case 'i': + set_beacon_interval(optarg); + continue; + case '?': + default: +usage: fprintf(stderr, + "usage: fc-loadtool [options] ttyport\n"); + exit(1); + } + if (argc - optind != 1) + goto usage; + target_ttydev = argv[optind]; + if (!iramimage.filename) + iramimage.filename = default_loadagent_image; + + open_target_serial(); + perform_romload(); + putchar('\n'); + if (tpinterf_pass_output() < 0) { + fprintf(stderr, + "loadtool error: no '=' prompt received from target\n"); + exit(1); + } + for (;;) { + if (isatty(0)) { + fputs("loadtool> ", stdout); + fflush(stdout); + } + if (!fgets(loadtool_command, sizeof loadtool_command, stdin)) + exit(0); + loadtool_dispatch_cmd(); + } +}