[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 2/5] hw/block/pflash_cfi01: Extract the pflash_r
From: |
Wei Yang |
Subject: |
Re: [Qemu-devel] [PATCH 2/5] hw/block/pflash_cfi01: Extract the pflash_reset() code |
Date: |
Mon, 6 May 2019 08:54:57 +0800 |
User-agent: |
Mutt/1.10.1 (2018-07-13) |
On Sun, May 05, 2019 at 10:05:59PM +0200, Philippe Mathieu-Daudé wrote:
>The reset() code is used in various places, refactor it.
>
>Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
>---
> hw/block/pflash_cfi01.c | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
>diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
>index 6dc04f156a7..073cd14978f 100644
>--- a/hw/block/pflash_cfi01.c
>+++ b/hw/block/pflash_cfi01.c
>@@ -108,6 +108,15 @@ static const VMStateDescription vmstate_pflash = {
> }
> };
>
>+static void pflash_reset(PFlashCFI01 *pfl)
>+{
>+ trace_pflash_reset();
>+ pfl->wcycle = 0;
>+ pfl->cmd = 0;
>+ pfl->status = 0;
>+ memory_region_rom_device_set_romd(&pfl->mem, true);
>+}
>+
> /* Perform a CFI query based on the bank width of the flash.
> * If this code is called we know we have a device_width set for
> * this flash.
>@@ -275,8 +284,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwaddr
>offset,
> default:
> /* This should never happen : reset state & treat it as a read */
> DPRINTF("%s: unknown command state: %x\n", __func__, pfl->cmd);
>- pfl->wcycle = 0;
>- pfl->cmd = 0;
>+ pflash_reset(pfl);
> /* fall through to read code */
> case 0x00:
> /* Flash area read */
>@@ -639,10 +647,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset,
> "\n", __func__, offset, pfl->wcycle, pfl->cmd, value);
>
> reset_flash:
>- trace_pflash_reset();
>- memory_region_rom_device_set_romd(&pfl->mem, true);
>- pfl->wcycle = 0;
>- pfl->cmd = 0;
>+ pflash_reset(pfl);
> }
>
>
>@@ -757,9 +762,7 @@ static void pflash_cfi01_realize(DeviceState *dev, Error
>**errp)
> pfl->max_device_width = pfl->device_width;
> }
>
>- pfl->wcycle = 0;
>- pfl->cmd = 0;
>- pfl->status = 0;
>+ pflash_reset(pfl);
> /* Hardcoded CFI table */
> /* Standard "QRY" string */
> pfl->cfi_table[0x10] = 'Q';
>--
>2.20.1
--
Wei Yang
Help you, Help me
- [Qemu-devel] [PATCH 0/5] hw/block/pflash: Add DeviceReset() handlers, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 1/5] hw/block/pflash_cfi01: Removed an unused timer, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 2/5] hw/block/pflash_cfi01: Extract the pflash_reset() code, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 3/5] hw/block/pflash_cfi01: Add the DeviceReset() handler, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 4/5] hw/block/pflash_cfi02: Extract the pflash_reset() code, Philippe Mathieu-Daudé, 2019/05/05
- [Qemu-devel] [PATCH 5/5] hw/block/pflash_cfi02: Add the DeviceReset() handler, Philippe Mathieu-Daudé, 2019/05/05