# HG changeset patch # User Jonathan Larmour # Date 1378504875 -3600 # Node ID 0928a0a0c30f2faa4da7edafbd1a6245ffd7d50a # Parent 6d93cd3d335060387cf6c2ef36e1e4c51af37d9b io/nand: Some trivial cleanups, partly to work with gcc 4.7, and partly as I noticed them. Details: * src/nand_bbt.c (LOCK_PAGEBUF, UNLOCK_PAGEBUF, bbti_incorporate_one, bbti_write_one_table): Remove all uses of i_locked variable as it wasn't really used. * tests/nand_eccequiv.c (cyg_user_start): Don't use CYG_ASSERTC checks, which only tests for debug builds. Use MUST instead. * tests/nand_readwrite.c (cyg_user_start): Ditto. * tests/nand_sweccwalk.c (cyg_user_start): Ditto. diff --git a/packages/io/nand/current/ChangeLog b/packages/io/nand/current/ChangeLog --- a/packages/io/nand/current/ChangeLog +++ b/packages/io/nand/current/ChangeLog @@ -2,6 +2,16 @@ 2014-08-11 Ross Younger + + * src/nand_bbt.c (LOCK_PAGEBUF, UNLOCK_PAGEBUF, bbti_incorporate_one, + bbti_write_one_table): Remove all uses of i_locked variable as it + wasn't really used. + * tests/nand_eccequiv.c (cyg_user_start): Don't use CYG_ASSERTC checks, + which only tests for debug builds. Use MUST instead. + * tests/nand_readwrite.c (cyg_user_start): Ditto. + * tests/nand_sweccwalk.c (cyg_user_start): Ditto. + 2013-06-28 Jonathan Larmour * src/nand.c (nandi_read_whole_page_raw): Remove unused var 'step'. diff --git a/packages/io/nand/current/src/nand_bbt.c b/packages/io/nand/current/src/nand_bbt.c --- a/packages/io/nand/current/src/nand_bbt.c +++ b/packages/io/nand/current/src/nand_bbt.c @@ -87,12 +87,10 @@ cyg_drv_mutex_t nand_bbt_pagebuf_lock; #define LOCK_PAGEBUF() do { \ cyg_drv_mutex_lock(&nand_bbt_pagebuf_lock); \ - i_locked = 1; \ } while(0) #define UNLOCK_PAGEBUF() do { \ cyg_drv_mutex_unlock(&nand_bbt_pagebuf_lock); \ - i_locked = 0; \ } while(0) CYG_BYTE* nandi_grab_pagebuf(void) @@ -251,7 +249,7 @@ static inline CYG_BYTE worst_of_the_two( static int bbti_incorporate_one(cyg_nand_device *dev, cyg_nand_block_addr blk, CYG_BYTE version) { - int rv = 0, i_locked = 0; + int rv = 0; LOCK_PAGEBUF(); cyg_nand_page_addr pg = CYG_NAND_BLOCK2PAGEADDR(dev,blk); @@ -304,7 +302,7 @@ static int bbti_incorporate_one(cyg_nand ++pg; } // outer while(blks_to_read>0) err_exit: - if (i_locked) UNLOCK_PAGEBUF(); + UNLOCK_PAGEBUF(); return rv; } @@ -600,8 +598,6 @@ static int bbti_write_one_table(cyg_nand CYG_BYTE *iptr = dev->bbt.data; int to_write = bbt_disk_size; // on-chip size, number of bytes - int i_locked = 0; - (void) i_locked; LOCK_PAGEBUF(); diff --git a/packages/io/nand/current/tests/nand_eccequiv.c b/packages/io/nand/current/tests/nand_eccequiv.c --- a/packages/io/nand/current/tests/nand_eccequiv.c +++ b/packages/io/nand/current/tests/nand_eccequiv.c @@ -106,11 +106,11 @@ int cyg_user_start(void) #define datasize (fakenand.ecc->data_size) #define eccsize (fakenand.ecc->ecc_size) - CYG_ASSERTC(fakenand.ecc->data_size == fakenand2.ecc->data_size); - CYG_ASSERTC(fakenand.ecc->ecc_size == fakenand2.ecc->ecc_size); + MUST(fakenand.ecc->data_size == fakenand2.ecc->data_size); + MUST(fakenand.ecc->ecc_size == fakenand2.ecc->ecc_size); - CYG_ASSERTC(datasize <= CYGNUM_NAND_PAGEBUFFER); - CYG_ASSERTC(eccsize <= ECC_BUFFER_SIZE); + MUST(datasize <= CYGNUM_NAND_PAGEBUFFER); + MUST(eccsize <= ECC_BUFFER_SIZE); diag_printf("ECC sizes: data %d, ecc %d\n", datasize, eccsize); diff --git a/packages/io/nand/current/tests/nand_readwrite.c b/packages/io/nand/current/tests/nand_readwrite.c --- a/packages/io/nand/current/tests/nand_readwrite.c +++ b/packages/io/nand/current/tests/nand_readwrite.c @@ -126,7 +126,7 @@ int cyg_user_start(void) diag_printf("Erasing block %d\n", blk); MUST(0==cyg_nandp_erase_block(prt, blk)); - CYG_ASSERTC(CYG_NAND_BYTES_PER_PAGE(dev) <= CYGNUM_NAND_PAGEBUFFER); + MUST(CYG_NAND_BYTES_PER_PAGE(dev) <= CYGNUM_NAND_PAGEBUFFER); ar4prng_many(&rnd, buf, datasize); diag_printf("Read/write to page %d (block %d)\n", pg, blk); diff --git a/packages/io/nand/current/tests/nand_sweccwalk.c b/packages/io/nand/current/tests/nand_sweccwalk.c --- a/packages/io/nand/current/tests/nand_sweccwalk.c +++ b/packages/io/nand/current/tests/nand_sweccwalk.c @@ -107,8 +107,8 @@ int cyg_user_start(void) #define datasize (fakenand.ecc->data_size) #define eccsize (fakenand.ecc->ecc_size) - CYG_ASSERTC(datasize <= CYGNUM_NAND_PAGEBUFFER); - CYG_ASSERTC(eccsize <= ECC_BUFFER_SIZE); + MUST(datasize <= CYGNUM_NAND_PAGEBUFFER); + MUST(eccsize <= ECC_BUFFER_SIZE); diag_printf("ECC sizes: data %d, ecc %d\n", datasize, eccsize); @@ -128,12 +128,12 @@ int cyg_user_start(void) ecc(dev, buf, msg, ecc2); st = dev->ecc->repair(dev, buf, sizeof buf, ecc1, ecc2); - CYG_ASSERTC(st==1); - CYG_ASSERTC(buf[0] == 0xff); + MUST(st==1); + MUST(buf[0] == 0xff); ecc(dev, buf, msg, ecc2); st = dev->ecc->repair(dev, buf, sizeof buf, ecc1, ecc2); - CYG_ASSERTC(st==0); + MUST(st==0); } int max; switch(datasize) { @@ -152,12 +152,12 @@ int cyg_user_start(void) buf[1<ecc->repair(dev, buf, sizeof buf, ecc1, ecc2); - CYG_ASSERTC(st==1); - CYG_ASSERTC(buf[1<ecc->repair(dev, buf, sizeof buf, ecc1, ecc2); - CYG_ASSERTC(st==0); + MUST(st==0); } int fail=0;