openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Peter Maydell 2013-04-05 16:18:00 +01:00
parent 2e19a7035a
commit 5d79b80b33
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/pflash_cfi01.c
View File

@ -68,7 +68,6 @@ struct pflash_t {
uint8_t width; uint8_t width;
uint8_t be; uint8_t be;
int wcycle; /* if 0, the flash is read normally */ int wcycle; /* if 0, the flash is read normally */
int bypass;
int ro; int ro;
uint8_t cmd; uint8_t cmd;
uint8_t status; uint8_t status;
@ -93,12 +92,8 @@ static void pflash_timer (void *opaque)
DPRINTF("%s: command %02x done\n", __func__, pfl->cmd); DPRINTF("%s: command %02x done\n", __func__, pfl->cmd);
/* Reset flash */ /* Reset flash */
pfl->status ^= 0x80; pfl->status ^= 0x80;
if (pfl->bypass) { memory_region_rom_device_set_readable(&pfl->mem, true);
pfl->wcycle = 2; pfl->wcycle = 0;
} else {
memory_region_rom_device_set_readable(&pfl->mem, true);
pfl->wcycle = 0;
}
pfl->cmd = 0; pfl->cmd = 0;
} }
@ -452,7 +447,6 @@ static void pflash_write(pflash_t *pfl, hwaddr offset,
reset_flash: reset_flash:
memory_region_rom_device_set_readable(&pfl->mem, true); memory_region_rom_device_set_readable(&pfl->mem, true);
pfl->bypass = 0;
pfl->wcycle = 0; pfl->wcycle = 0;
pfl->cmd = 0; pfl->cmd = 0;
} }