summaryrefslogtreecommitdiffstats
path: root/cpukit
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2012-03-13 14:52:57 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2012-03-14 11:26:17 +0100
commitd22a91e8f2ac24994a9979e5c64bc62947ba3ffb (patch)
tree08a8bf3013f27af2f6b5d3b04097b331c9eac24b /cpukit
parentPR2040: libblock: Use segment control as parameter (diff)
downloadrtems-d22a91e8f2ac24994a9979e5c64bc62947ba3ffb.tar.bz2
PR2040: libblock: Track number of erased blocks
Diffstat (limited to 'cpukit')
-rw-r--r--cpukit/libblock/src/flashdisk.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpukit/libblock/src/flashdisk.c b/cpukit/libblock/src/flashdisk.c
index a4098b65fb..3333b8c110 100644
--- a/cpukit/libblock/src/flashdisk.c
+++ b/cpukit/libblock/src/flashdisk.c
@@ -252,6 +252,7 @@ typedef struct rtems_flashdisk
mappings. */
uint32_t block_count; /**< The number of avail. blocks. */
uint32_t unavail_blocks; /**< The number of unavail blocks. */
+ uint32_t erased_blocks; /**< The number of erased blocks. */
rtems_fdisk_device_ctl* devices; /**< The flash devices for this
disk. */
@@ -968,6 +969,7 @@ rtems_fdisk_seg_write_page (rtems_flashdisk* fd,
if (ret)
return ret;
}
+ --fd->erased_blocks;
return rtems_fdisk_seg_write (fd, sc,
page * fd->block_size, buffer, fd->block_size);
}
@@ -1145,6 +1147,7 @@ rtems_fdisk_erase_segment (rtems_flashdisk* fd, rtems_fdisk_segment_ctl* sc)
return ret;
}
+ fd->erased_blocks += sc->pages;
sc->erased++;
memset (sc->page_descriptors, 0xff, sc->pages_desc * fd->block_size);
@@ -1608,7 +1611,11 @@ rtems_fdisk_recover_block_mappings (rtems_flashdisk* fd)
ret = rtems_fdisk_seg_blank_check_page (fd, sc,
page + sc->pages_desc);
- if (ret)
+ if (ret == 0)
+ {
+ ++fd->erased_blocks;
+ }
+ else
{
#if RTEMS_FDISK_TRACE
rtems_fdisk_warning (fd, "page not blank: %d-%d-%d",