From 034f28a4f628d2eb55e72ee54065662df808aa4e Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Tue, 27 Oct 2009 23:32:09 +0000 Subject: [PATCH] - change names of block align functions Committed on the Free edition of March Hare Software CVSNT Server. Upgrade to CVS Suite for more features and support: http://march-hare.com/cvsnt/ git-svn-id: http://moon:8086/svn/vhdl/trunk@542 cc03376c-175c-47c8-b038-4cd826a8556b --- lib/CPUs/MIPS/bsp/examples/cfiflash.c | 12 ++++++------ lib/CPUs/MIPS/bsp/examples/cfiflash.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/CPUs/MIPS/bsp/examples/cfiflash.c b/lib/CPUs/MIPS/bsp/examples/cfiflash.c index c2beb7a..7ab15be 100644 --- a/lib/CPUs/MIPS/bsp/examples/cfiflash.c +++ b/lib/CPUs/MIPS/bsp/examples/cfiflash.c @@ -394,12 +394,7 @@ UINT32 flash_get_blocknum_by_offset(flash_t *pObj, UINT32 offset) return blocknum; } -UINT32 flash_aligned_addr_by_offset(flash_t *pObj, UINT32 offset) -{ - return flash_get_blocknum_by_offset(pObj, offset) * pObj->info.blocksize; -} - -UINT32 flash_aligned_addr_by_blocknum(flash_t *pObj, UINT32 blocknum) +UINT32 flash_get_offset_by_blocknum(flash_t *pObj, UINT32 blocknum) { if (blocknum >= pObj->info.nblocks) blocknum = pObj->info.nblocks - 1; @@ -407,3 +402,8 @@ UINT32 flash_aligned_addr_by_blocknum(flash_t *pObj, UINT32 blocknum) return blocknum*pObj->info.blocksize; } +UINT32 flash_get_offset_blockaligned(flash_t *pObj, UINT32 offset) +{ + return flash_get_blocknum_by_offset(pObj, offset) * pObj->info.blocksize; +} + diff --git a/lib/CPUs/MIPS/bsp/examples/cfiflash.h b/lib/CPUs/MIPS/bsp/examples/cfiflash.h index b1638e1..1233642 100644 --- a/lib/CPUs/MIPS/bsp/examples/cfiflash.h +++ b/lib/CPUs/MIPS/bsp/examples/cfiflash.h @@ -47,9 +47,9 @@ UINT32 cfi_block_unlock(flash_t *pObj, UINT32 word_index); UINT32 cfi_program_single(flash_t *pObj, UINT32 word_index, UINT32 word); UINT32 cfi_program_multi(flash_t *pObj, UINT32 word_index, UINT32 *pWords, UINT32 num_words); -UINT32 flash_aligned_addr_by_offset(flash_t *pObj, UINT32 offset); -UINT32 flash_aligned_addr_by_blocknum(flash_t *pObj, UINT32 blocknum); +UINT32 flash_get_offset_by_blocknum(flash_t *pObj, UINT32 blocknum); UINT32 flash_get_blocknum_by_offset(flash_t *pObj, UINT32 offset); +UINT32 flash_get_offset_blockaligned(flash_t *pObj, UINT32 offset); UINT32 flash_find(flash_t *pObj, UINT32 base_addr); UINT32 flash_erase(flash_t *pObj, UINT32 offset, UINT32 size); UINT32 flash_program(flash_t *pObj, UINT32 offset, UINT8 *pData, UINT32 size);