[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field |
Date: |
Fri, 5 Apr 2013 18:13:15 +0100 |
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 <address@hidden>
Message-id: address@hidden
---
hw/pflash_cfi01.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c
index 5d57bab..20d10b3 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;
}
--
1.7.9.5
- [Qemu-devel] [PATCH 04/14] vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro, (continued)
- [Qemu-devel] [PATCH 04/14] vmstate.h: introduce VMSTATE_BUFFER_POINTER_UNSAFE macro, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 14/14] hw/nand.c: Fix nand erase operation, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 03/14] hw/arm_mptimer: Save the timer state, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 12/14] pl330: Don't inhibit ES bits on INTEN, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 11/14] pflash_cfi01: Implement migration support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 05/14] hw/sd.c: fix migration of dynamically allocated buffer "buf", Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 01/14] hw/arm/nseries: don't print to stdout or stderr, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 13/14] cadence_uart: Flush queued characters on reset, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 09/14] hw/arm_gic_common: Use vmstate struct rather than save/load functions, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 08/14] arm_gic: Fix sizes of state fields in preparation for vmstate support, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 10/14] pflash_cfi01: Drop unused 'bypass' field,
Peter Maydell <=
- [Qemu-devel] [PATCH 07/14] vmstate: Add support for two dimensional arrays, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 02/14] pl050: Don't send always-constant is_mouse field, Peter Maydell, 2013/04/05
- [Qemu-devel] [PATCH 06/14] hw/onenand.c: fix migration of dynamically allocated buffer "otp", Peter Maydell, 2013/04/05
- Re: [Qemu-devel] [PULL 00/14] arm-devs queue, Blue Swirl, 2013/04/06