On Thu, Jun 27, 2019 at 1:54 PM Philippe Mathieu-Daudé
<phi...@redhat.com> wrote:
>
> Extract the pflash_regions_count() function, the code will be
> easier to review.
>
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/block/pflash_cfi02.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 1f096ec185..a0d3bd60dc 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -157,6 +157,11 @@ static void pflash_register_memory(PFlashCFI02 *pfl, int
> rom_mode)
> pfl->rom_mode = rom_mode;
> }
>
> +static size_t pflash_regions_count(PFlashCFI02 *pfl)
> +{
> + return pfl->cfi_table[0x2c];
> +}
> +
> static void pflash_timer (void *opaque)
> {
> PFlashCFI02 *pfl = opaque;
> @@ -192,9 +197,8 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr
> offset,
> static uint32_t pflash_sector_len(PFlashCFI02 *pfl, hwaddr offset)
> {
> assert(offset < pfl->chip_len);
> - int nb_regions = pfl->cfi_table[0x2C];
> hwaddr addr = 0;
> - for (int i = 0; i < nb_regions; ++i) {
> + for (int i = 0; i < pflash_regions_count(pfl); ++i) {
> uint64_t region_size = (uint64_t)pfl->nb_blocs[i] *
> pfl->sector_len[i];
> if (addr <= offset && offset < addr + region_size) {
> return pfl->sector_len[i];
> --
> 2.20.1
>
>
