On Thu, Jun 27, 2019 at 1:44 PM Philippe Mathieu-Daudé
<phi...@redhat.com> wrote:
>
> No change in functionality is intended with this commit.
>
> Signed-off-by: Stephen Checkoway <stephen.checko...@oberlin.edu>
> Message-Id: <20190426162624.55977-3-stephen.checko...@oberlin.edu>
> Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com>
> [PMD: Extracted from bigger patch]
> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> hw/block/pflash_cfi02.c | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
> index 43796e551a..303d225f23 100644
> --- a/hw/block/pflash_cfi02.c
> +++ b/hw/block/pflash_cfi02.c
> @@ -57,6 +57,11 @@ do {
> \
>
> #define PFLASH_LAZY_ROMD_THRESHOLD 42
>
> +/* Special write cycles for CFI queries. */
> +enum {
> + WCYCLE_CFI = 7,
> +};
> +
> struct PFlashCFI02 {
> /*< private >*/
> SysBusDevice parent_obj;
> @@ -286,7 +291,7 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset,
> if (boff == 0x55 && cmd == 0x98) {
> enter_CFI_mode:
> /* Enter CFI query mode */
> - pfl->wcycle = 7;
> + pfl->wcycle = WCYCLE_CFI;
> pfl->cmd = 0x98;
> return;
> }
> @@ -458,7 +463,8 @@ static void pflash_write(PFlashCFI02 *pfl, hwaddr offset,
> goto reset_flash;
> }
> break;
> - case 7: /* Special value for CFI queries */
> + /* Special values for CFI queries */
> + case WCYCLE_CFI:
> DPRINTF("%s: invalid write in CFI query mode\n", __func__);
> goto reset_flash;
> default:
> --
> 2.20.1
>
>
