[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 19/27] hw/block/pflash_cfi02: Extract pflash_regions_
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-block] [PULL 19/27] hw/block/pflash_cfi02: Extract pflash_regions_count() |
Date: |
Mon, 1 Jul 2019 21:59:04 -0300 |
Extract the pflash_regions_count() function, the code will be
easier to review.
Reviewed-by: Alistair Francis <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
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
- [Qemu-block] [PULL 12/27] hw/block/pflash_cfi02: Fix command address comparison, (continued)
- [Qemu-block] [PULL 12/27] hw/block/pflash_cfi02: Fix command address comparison, Philippe Mathieu-Daudé, 2019/07/01
- [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Philippe Mathieu-Daudé, 2019/07/01
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Stephen Checkoway, 2019/07/03
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Philippe Mathieu-Daudé, 2019/07/03
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Stephen Checkoway, 2019/07/03
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Philippe Mathieu-Daudé, 2019/07/03
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Philippe Mathieu-Daudé, 2019/07/04
- Re: [Qemu-block] [PULL 27/27] hw/block/pflash_cfi02: Reduce I/O accesses to 16-bit, Stephen Checkoway, 2019/07/08
[Qemu-block] [PULL 21/27] hw/block/pflash_cfi02: Fix CFI in autoselect mode, Philippe Mathieu-Daudé, 2019/07/01
[Qemu-block] [PULL 13/27] tests/pflash-cfi02: Refactor to support testing multiple configurations, Philippe Mathieu-Daudé, 2019/07/01
[Qemu-block] [PULL 19/27] hw/block/pflash_cfi02: Extract pflash_regions_count(),
Philippe Mathieu-Daudé <=
Re: [Qemu-block] [Qemu-devel] [PULL 00/27] pflash-next patches, Peter Maydell, 2019/07/02