diff options
| author | Peter Maydell | 2013-04-05 17:18:00 +0200 |
|---|---|---|
| committer | Peter Maydell | 2013-04-05 17:18:00 +0200 |
| commit | 5d79b80b335c5f65f148d1bb1672d9d534ace73b (patch) | |
| tree | 254ec82fbe0bef501fbf07e73cbdb1e4288364f4 /hw | |
| parent | hw/arm_gic_common: Use vmstate struct rather than save/load functions (diff) | |
| download | qemu-5d79b80b335c5f65f148d1bb1672d9d534ace73b.tar.gz qemu-5d79b80b335c5f65f148d1bb1672d9d534ace73b.tar.xz qemu-5d79b80b335c5f65f148d1bb1672d9d534ace73b.zip | |
pflash_cfi01: Drop unused 'bypass' field
For pflash_cfi01 the 'bypass' field is set to zero and never changes,
so remove it (it is a leftover from pflash_cfi02, where bypass is
implemented).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1363717469-30980-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pflash_cfi01.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index 5d57babe07..20d10b3b13 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -68,7 +68,6 @@ struct pflash_t { uint8_t width; uint8_t be; int wcycle; /* if 0, the flash is read normally */ - int bypass; int ro; uint8_t cmd; uint8_t status; @@ -93,12 +92,8 @@ static void pflash_timer (void *opaque) DPRINTF("%s: command %02x done\n", __func__, pfl->cmd); /* Reset flash */ pfl->status ^= 0x80; - if (pfl->bypass) { - pfl->wcycle = 2; - } else { - memory_region_rom_device_set_readable(&pfl->mem, true); - pfl->wcycle = 0; - } + memory_region_rom_device_set_readable(&pfl->mem, true); + pfl->wcycle = 0; pfl->cmd = 0; } @@ -452,7 +447,6 @@ static void pflash_write(pflash_t *pfl, hwaddr offset, reset_flash: memory_region_rom_device_set_readable(&pfl->mem, true); - pfl->bypass = 0; pfl->wcycle = 0; pfl->cmd = 0; } |