Permalink
Browse files

Check if mask is all zero and replace following XSDRTDO with XSDR if …

…so; convert XSDRB, XSDRC*, XSDRE to XSDR too. Remove support for XSDRB, XSDRC & XSDRE from csvfplay.c, add support for XSDR.
  • Loading branch information...
makestuff
makestuff committed Mar 2, 2012
1 parent 46b06f7 commit 671afd548bf4bae30d874d74e3b916c019bcc951
Showing with 232 additions and 52 deletions.
  1. +165 −0 COPYING.LESSER
  2. +2 −12 csvfplay.c
  3. +65 −40 xsvf2csvf.c
View
@@ -0,0 +1,165 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+ This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+ 0. Additional Definitions.
+
+ As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+ "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+ An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+ A "Combined Work" is a work produced by combining or linking an
+Application with the Library. The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+ The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+ The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+ 1. Exception to Section 3 of the GNU GPL.
+
+ You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+ 2. Conveying Modified Versions.
+
+ If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+ a) under this License, provided that you make a good faith effort to
+ ensure that, in the event an Application does not supply the
+ function or data, the facility still operates, and performs
+ whatever part of its purpose remains meaningful, or
+
+ b) under the GNU GPL, with none of the additional permissions of
+ this License applicable to that copy.
+
+ 3. Object Code Incorporating Material from Library Header Files.
+
+ The object code form of an Application may incorporate material from
+a header file that is part of the Library. You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+ a) Give prominent notice with each copy of the object code that the
+ Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the object code with a copy of the GNU GPL and this license
+ document.
+
+ 4. Combined Works.
+
+ You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+ a) Give prominent notice with each copy of the Combined Work that
+ the Library is used in it and that the Library and its use are
+ covered by this License.
+
+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
+ document.
+
+ c) For a Combined Work that displays copyright notices during
+ execution, include the copyright notice for the Library among
+ these notices, as well as a reference directing the user to the
+ copies of the GNU GPL and this license document.
+
+ d) Do one of the following:
+
+ 0) Convey the Minimal Corresponding Source under the terms of this
+ License, and the Corresponding Application Code in a form
+ suitable for, and under terms that permit, the user to
+ recombine or relink the Application with a modified version of
+ the Linked Version to produce a modified Combined Work, in the
+ manner specified by section 6 of the GNU GPL for conveying
+ Corresponding Source.
+
+ 1) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (a) uses at run time
+ a copy of the Library already present on the user's computer
+ system, and (b) will operate properly with a modified version
+ of the Library that is interface-compatible with the Linked
+ Version.
+
+ e) Provide Installation Information, but only if you would otherwise
+ be required to provide such information under section 6 of the
+ GNU GPL, and only to the extent that such information is
+ necessary to install and execute a modified version of the
+ Combined Work produced by recombining or relinking the
+ Application with a modified version of the Linked Version. (If
+ you use option 4d0, the Installation Information must accompany
+ the Minimal Corresponding Source and Corresponding Application
+ Code. If you use option 4d1, you must provide the Installation
+ Information in the manner specified by section 6 of the GNU GPL
+ for conveying Corresponding Source.)
+
+ 5. Combined Libraries.
+
+ You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+ a) Accompany the combined library with a copy of the same work based
+ on the Library, uncombined with any other library facilities,
+ conveyed under the terms of this License.
+
+ b) Give prominent notice with the combined library that part of it
+ is a work based on the Library, and explaining where to find the
+ accompanying uncombined form of the same work.
+
+ 6. Revised Versions of the GNU Lesser General Public License.
+
+ The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+ If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
View
@@ -139,7 +139,7 @@ int csvfPlay(const uint8 *csvfData, struct NeroHandle *nero, const char **error)
}
break;
- case XSDRB:
+ case XSDR:
nStatus = neroClockFSM(nero, 0x00000001, 3, error); // -> Shift-DR
CHECK_STATUS(nStatus, "csvfPlay()", nStatus);
numBytes = bitsToBytes(xsdrSize);
@@ -148,19 +148,9 @@ int csvfPlay(const uint8 *csvfData, struct NeroHandle *nero, const char **error)
while ( numBytes-- ) {
*ptr++ = csvfGetByte(&cp);
}
- nStatus = neroShift(nero, xsdrSize, tdiAll, NULL, false, error); // -> Shift-DR
+ nStatus = neroShift(nero, xsdrSize, tdiAll, NULL, true, error); // -> Exit1-DR
free(tdiAll);
CHECK_STATUS(nStatus, "csvfPlay()", nStatus);
- break;
-
- case XSDRE:
- numBytes = bitsToBytes(xsdrSize);
- ptr = tdiData;
- while ( numBytes-- ) {
- *ptr++ = csvfGetByte(&cp);
- }
- nStatus = neroShift(nero, xsdrSize, tdiData, NULL, true, error); // -> Exit1-DR
- CHECK_STATUS(nStatus, "csvfPlay()", nStatus);
nStatus = neroClockFSM(nero, 0x00000001, 2, error); // -> Run-Test/Idle
CHECK_STATUS(nStatus, "csvfPlay()", nStatus);
if ( xruntest ) {
View
@@ -46,24 +46,22 @@ static uint8 getNextByte(XC *xc) {
//
static FLStatus swapBytes(XC *xc, uint32 numBytes, struct Buffer *outBuf, const char **error) {
FLStatus returnCode = FL_SUCCESS;
- uint8 swapBuffer[2*BUF_SIZE]; // XSDRTDO accepts 2x XSDRSIZE bytes; all must be swapped
- uint8 *ptr = swapBuffer + numBytes - 1;
- uint32 n = numBytes;
+ uint8 *ptr;
BufferStatus status;
- while ( n-- ) {
- *ptr-- = getNextByte(xc);
- }
#ifdef ENABLE_SWAP
- ptr = swapBuffer;
+ status = bufAppendZeros(outBuf, numBytes, NULL, error);
+ CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ ptr = outBuf->data + outBuf->length - 1;
while ( numBytes-- ) {
- status = bufAppendByte(outBuf, *ptr++, error);
- CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ *ptr-- = getNextByte(xc);
}
#else
- ptr = swapBuffer + numBytes - 1;
+ uint32 initLength = outBuf->length;
+ status = bufAppendZeros(outBuf, numBytes, NULL, error);
+ CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ ptr = outBuf->data + initLength - 1;
while ( numBytes-- ) {
- status = bufAppendByte(outBuf, *ptr--, error);
- CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ *ptr++ = getNextByte(xc);
}
#endif
cleanup:
@@ -135,6 +133,7 @@ static FLStatus xsvfSwapBytes(XC *xc, struct Buffer *outBuf, uint32 *maxBufSize,
BufferStatus status;
uint8 thisByte;
uint32 dummy;
+ bool zeroMask = false;
if ( !maxBufSize ) {
maxBufSize = &dummy;
@@ -143,24 +142,37 @@ static FLStatus xsvfSwapBytes(XC *xc, struct Buffer *outBuf, uint32 *maxBufSize,
thisByte = getNextByte(xc);
while ( thisByte != XCOMPLETE ) {
switch ( thisByte ) {
- case XTDOMASK:
+ case XTDOMASK:{
// Swap the XTDOMASK bytes.
+ uint32 initLength;
+ const uint8 *p;
+ const uint8 *end;
if ( newXSize != curXSize ) {
curXSize = newXSize;
sendXSize(outBuf, curXSize, error);
}
+ initLength = outBuf->length;
numBytes = bitsToBytes(curXSize);
- if ( numBytes > BUF_SIZE ) {
- FAIL(FL_UNSUPPORTED_SIZE_ERR);
- }
- if ( numBytes > *maxBufSize ) {
- *maxBufSize = numBytes;
- }
status = bufAppendByte(outBuf, XTDOMASK, error);
CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
returnCode = swapBytes(xc, numBytes, outBuf, error);
CHECK_RETURN();
+ p = outBuf->data + initLength + 1;
+ end = outBuf->data + outBuf->length;
+ while ( *p == 0 && p < end ) p++;
+ if ( p == end ) {
+ // All zeros so delete the command
+ outBuf->length = initLength;
+ zeroMask = true;
+ } else {
+ // Keep the command
+ if ( numBytes > *maxBufSize ) {
+ *maxBufSize = numBytes;
+ }
+ zeroMask = false;
+ }
break;
+ }
case XSDRTDO:
// Swap the tdiValue and tdoExpected bytes.
@@ -169,16 +181,29 @@ static FLStatus xsvfSwapBytes(XC *xc, struct Buffer *outBuf, uint32 *maxBufSize,
sendXSize(outBuf, curXSize, error);
}
numBytes = bitsToBytes(curXSize);
- if ( numBytes > BUF_SIZE ) {
- FAIL(FL_UNSUPPORTED_SIZE_ERR);
- }
- if ( numBytes > *maxBufSize ) {
- *maxBufSize = numBytes;
+ if ( zeroMask ) {
+ // The last mask was all zeros, so replace this XSDRTDO with an XSDR and throw away
+ // the tdoExpected bytes.
+ status = bufAppendByte(outBuf, XSDR, error);
+ CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ returnCode = swapBytes(xc, numBytes, outBuf, error);
+ CHECK_RETURN();
+ while ( numBytes-- ) {
+ getNextByte(xc);
+ }
+ } else {
+ // The last mask was not all zeros, so we must honour the XSDRTDO's tdoExpected bytes.
+ if ( numBytes > BUF_SIZE ) {
+ FAIL(FL_UNSUPPORTED_SIZE_ERR);
+ }
+ if ( numBytes > *maxBufSize ) {
+ *maxBufSize = numBytes;
+ }
+ status = bufAppendByte(outBuf, XSDRTDO, error);
+ CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ returnCode = swapBytes(xc, 2*numBytes, outBuf, error);
+ CHECK_RETURN();
}
- status = bufAppendByte(outBuf, XSDRTDO, error);
- CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
- returnCode = swapBytes(xc, 2*numBytes, outBuf, error);
- CHECK_RETURN();
break;
case XREPEAT:
@@ -223,36 +248,31 @@ static FLStatus xsvfSwapBytes(XC *xc, struct Buffer *outBuf, uint32 *maxBufSize,
break;
case XSDRB:
- // Swap the tdiValue bytes.
+ // Roll XSDRB, XSDRC*, XSDRE into one XSDR
curXSize = newXSize;
sendXSize(outBuf, curXSize, error);
totXSize = curXSize;
totOffset = outBuf->length - 4;
- status = bufAppendByte(outBuf, XSDRB, error);
+ status = bufAppendByte(outBuf, XSDR, error);
CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
returnCode = swapBytes(xc, bitsToBytes(curXSize), outBuf, error);
CHECK_RETURN();
break;
case XSDRC:
- // Just add the XSDRC data to the end of the previous XSDRB
- if ( newXSize != curXSize ) {
- curXSize = newXSize;
- }
+ // Just add the XSDRC data to the end of the previous XSDR
+ curXSize = newXSize;
totXSize += curXSize;
writeLong(outBuf, totOffset, totXSize);
returnCode = swapBytes(xc, bitsToBytes(curXSize), outBuf, error);
CHECK_RETURN();
break;
case XSDRE:
- // Swap the tdiValue bytes.
- //status = bufWriteBinaryFile(outBuf, "before.bin", totOffset, totXSize);
- //CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ // Just add the XSDRE data to the end of the previous XSDR
curXSize = newXSize;
- sendXSize(outBuf, curXSize, error);
- status = bufAppendByte(outBuf, XSDRE, error);
- CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+ totXSize += curXSize;
+ writeLong(outBuf, totOffset, totXSize);
returnCode = swapBytes(xc, bitsToBytes(curXSize), outBuf, error);
CHECK_RETURN();
break;
@@ -292,6 +312,11 @@ static FLStatus xsvfSwapBytes(XC *xc, struct Buffer *outBuf, uint32 *maxBufSize,
// Add the XCOMPLETE command
status = bufAppendByte(outBuf, XCOMPLETE, error);
CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+
+ // Uncomment this to dump the result out for debugging purposes...
+ //status = bufWriteBinaryFile(outBuf, "foo.xsvf", 0, outBuf->length, error);
+ //CHECK_BUF_STATUS(FL_BUF_APPEND_ERR);
+
cleanup:
return returnCode;

0 comments on commit 671afd5

Please sign in to comment.