Mercurial > nand-ecoscentric

changeset 3374:a1c18cad62b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
devs/nand/synth: Fix test for CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES.
author Nick Garnett <nickg@ecoscentric.com>
date Tue, 24 Aug 2010 17:43:04 +0100
parents 62b2c0f5902b
children fc2f77453935
files packages/devs/nand/synth/current/ChangeLog packages/devs/nand/synth/current/src/nand_synth.c
diffstat 2 files changed, 9 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/packages/devs/nand/synth/current/ChangeLog
+++ b/packages/devs/nand/synth/current/ChangeLog
@@ -2,6 +2,12 @@ 2014-08-01  Ross Younger  <wry@ecoscentr
 
 	* nand_synth.c: Make it build with recent gcc
 
+2010-08-24  Nick Garnett  <nickg@ecoscentric.com>
+
+	* src/nand_synth.c (synth_writebegin, synth_writestride)
+	(synth_writefinish):
+	Fix test for CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES.
+
 2010-07-09  Ross Younger  <wry@ecoscentric.com>
 
 	* nand_synth.c: Cope with CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES not
--- a/packages/devs/nand/synth/current/src/nand_synth.c
+++ b/packages/devs/nand/synth/current/src/nand_synth.c
@@ -1604,7 +1604,7 @@ synth_writebegin(cyg_nand_device *dev, c
     // Do we make it bad this time?
     if (0 == result) _page_going_bad = write_check_injections(page);
 
-#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES_1
+#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES
     (void) i;
 #else
     // Do not allow multiple writes to a single page, for now.
@@ -1651,7 +1651,7 @@ synth_writestride(cyg_nand_device *dev, 
     }
 
     if (src && (size > 0)) {
-#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES_1
+#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES
         for (i=0; i<size; i++)
             image_data[_offset + _stridden + i] &= ((unsigned char*)src)[i];
 #else
@@ -1708,7 +1708,7 @@ synth_writefinish(cyg_nand_device *dev, 
 
     if (0 == result) {
         if (spare && (spare_size > 0)) {
-#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES_1
+#ifdef CYGSEM_NAND_SYNTH_ALLOW_MULTIPLE_WRITES
             for (i=0; i<spare_size; i++)
                 image_data[_offset + PAGESIZE + i] &= ((unsigned char*)spare)[i];
 #else