# HG changeset patch # User Michael Spacefalcon # Date 1367720696 0 # Node ID 05af070c4b60e45ddb12f89f0a55314d08f4ce2c # Parent 2c6b2a74ac7cee15b27cff59e7e120f0ff5f6af8 loadtool: preparations for dump2bin and dump2srec diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/Makefile --- a/loadtools/Makefile Sat May 04 08:47:53 2013 +0000 +++ b/loadtools/Makefile Sun May 05 02:24:56 2013 +0000 @@ -8,9 +8,9 @@ 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 ltdispatch.o ltexit.o ltmain.o \ - ltpassthru.o ltscript.o romload.o sercomm.o srecreader.o \ - tpinterf.o +LOADTOOL_OBJS= crc32tab.o defpath.o hexdecode.o hwparam.o ltdispatch.o \ + ltdump.o ltexit.o ltmain.o ltpassthru.o ltscript.o romload.o \ + sercomm.o srecreader.o tpinterf.o tpinterf2.o all: ${PROGS} diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/crc32tab.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loadtools/crc32tab.c Sun May 05 02:24:56 2013 +0000 @@ -0,0 +1,70 @@ +/* This CRC-32 table has been computed for the LSB-first direction */ + +#include + +uint32_t crc32_table[256] = { + 0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, + 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, + 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, + 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, + 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, + 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, + 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, + 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, + 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, + 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, + 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, + 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, + 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, + 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, + 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, + 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, + 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, + 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, + 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, + 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, + 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, + 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, + 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, + 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, + 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, + 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, + 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, + 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, + 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, + 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, + 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, + 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, + 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, + 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, + 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, + 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, + 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, + 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, + 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, + 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, + 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, + 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, + 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, + 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, + 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, + 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, + 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, + 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, + 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, + 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, + 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, + 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, + 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, + 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, + 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, + 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, + 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, + 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, + 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, + 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, + 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, + 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, + 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, + 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D, +}; diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/ltdispatch.c --- a/loadtools/ltdispatch.c Sat May 04 08:47:53 2013 +0000 +++ b/loadtools/ltdispatch.c Sun May 05 02:24:56 2013 +0000 @@ -8,6 +8,7 @@ #include #include +extern int cmd_crc32(); extern int cmd_exec(); extern int cmd_exit(); extern int loadtool_cmd_passthru(); @@ -18,6 +19,7 @@ int maxargs; int (*func)(); } cmdtab[] = { + {"crc32", 2, 2, cmd_crc32}, {"dump", 2, 2, loadtool_cmd_passthru}, {"exec", 1, 1, cmd_exec}, {"exit", 0, 1, cmd_exit}, diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/ltdump.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loadtools/ltdump.c Sun May 05 02:24:56 2013 +0000 @@ -0,0 +1,71 @@ +/* + * This module implements the dump2bin and dump2srec functionality + * of fc-loadtool. + */ + +#include +#include +#include +#include +#include +#include + +extern char target_response_line[]; + +crc32_on_target(area_base, area_len, retptr) + u_long area_base, area_len, *retptr; +{ + char arg1[10], arg2[10], *argv[4]; + int stat; + char *strtoul_endp; + + sprintf(arg1, "%lx", area_base); + sprintf(arg2, "%lx", area_len); + argv[0] = "crc32"; + argv[1] = arg1; + argv[2] = arg2; + argv[3] = 0; + tpinterf_make_cmd(argv); + if (tpinterf_send_cmd() < 0) + return(-1); + stat = tpinterf_capture_output_oneline(10); /* 10 s timeout */ + if (stat != 1) { +errout: fprintf(stderr, "error: malformed response to crc32 command\n"); + return(-1); + } + if (strlen(target_response_line) != 8) + goto errout; + *retptr = strtoul(target_response_line, &strtoul_endp, 16); + if (strtoul_endp != target_response_line + 8) + goto errout; + return(0); +} + +cmd_crc32(argc, argv) + char **argv; +{ + u_long area_base, area_len; + char *strtoul_endp; + u_long crc_result; + int stat; + + area_base = strtoul(argv[1], &strtoul_endp, 16); + if (*strtoul_endp) { +inv: fprintf(stderr, "usage: crc32 hex-start hex-len\n"); + return(-1); + } + area_len = strtoul(argv[2], &strtoul_endp, 16); + if (*strtoul_endp) + goto inv; + stat = crc32_on_target(area_base, area_len, &crc_result); + if (stat == 0) + printf("%08lX\n", crc_result); + return(stat); +} + +cmd_dump2bin(argc, argv) + char **argv; +{ + + +} diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/tpinterf.c --- a/loadtools/tpinterf.c Sat May 04 08:47:53 2013 +0000 +++ b/loadtools/tpinterf.c Sun May 05 02:24:56 2013 +0000 @@ -1,7 +1,8 @@ /* * Target program interface - this module provides some primitives * for communicating programmatically with loadagent and possibly - * other target-utils. + * other target-utils. This module will be linked by both + * fc-loadtool and fc-chainload. */ #include @@ -81,7 +82,7 @@ /* * This function sends the previously-constructed command to the target, - * and collects the expected response. + * and collects the expected echo. * * Return value: 0 if successful, -1 on errors (timeout or wrong response) */ diff -r 2c6b2a74ac7c -r 05af070c4b60 loadtools/tpinterf2.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loadtools/tpinterf2.c Sun May 05 02:24:56 2013 +0000 @@ -0,0 +1,113 @@ +/* + * This module provides a more advanced target interface function + * than tpinterf.c - programmatic capture of target responses, + * for dumps etc. It will be linked by fc-loadtool, but not fc-chainload. + */ + +#include +#include +#include +#include +#include +#include +#include + +extern int errno; + +extern int target_fd; + +/* + * This functions reads the serial output from the target until a + * '=' prompt is received. All intermediate output is parsed into + * lines and passed to a callback function. + * + * The callback function is called with a pointer to each received + * line, stored in a buffer ending in NUL, with CRLF stripped. + * The callback function is expected to return an int. If the + * callback return value is negative, this function returns immediately + * with that negative value. If the callback return value is positive + * or zero, it is added to an accumulator. + * + * Termination: this function returns when it has received a '=' at + * the beginning of a line (return value is the callback return + * accumulator, or 0 if no lines came), if the callback returns a + * negative value (that value is returned), or if an error is detected + * within this function (return value -1, and an error message + * printed on stderr). + */ +tpinterf_capture_output(timeout, callback) + int timeout; /* seconds */ + int (*callback)(); +{ + char buf[512], *cp; + char line[1024], *dp = line; + fd_set fds; + struct timeval tv; + int cc, linelen = 0; + int totout = 0, cbret; + + for (;;) { + FD_ZERO(&fds); + FD_SET(target_fd, &fds); + tv.tv_sec = timeout; + tv.tv_usec = 0; + cc = select(target_fd+1, &fds, NULL, NULL, &tv); + if (cc < 0) { + if (errno == EINTR) + continue; + perror("select"); + return(-1); + } + if (cc < 1) { + fprintf(stderr, + "error: timeout waiting for \'=\' prompt from target\n"); + return(-1); + } + cc = read(target_fd, buf, sizeof buf); + if (cc <= 0) { + perror("read after successful select"); + return(-1); + } + for (cp = buf; cc; cp++) { + cc--; + if (*cp == '=' && !linelen && !cc) + return(totout); + if (*cp == '\r') + continue; + if (*cp == '\n') { + *dp = '\0'; + cbret = callback(line); + if (cbret < 0) + return(cbret); + totout += cbret; + dp = line; + linelen = 0; + continue; + } + *dp++ = *cp; + linelen++; + if (linelen >= sizeof line) { + fprintf(stderr, + "error: target response line length exceeds buffer\n"); + return(-1); + } + } + } +} + +/* single line response capture mechanism */ +/* same line buffer size as in tpinterf_capture_output() */ +char target_response_line[1024]; + +static +oneline_catcher(linein) + char *linein; +{ + strcpy(target_response_line, linein); + return(1); +} + +tpinterf_capture_output_oneline(timeout) +{ + return tpinterf_capture_output(timeout, oneline_catcher); +}