mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 23:33:54 -06:00
pflash_cfi01/pflash_cfi02: convert to memory API
cfi02 is annoying in that is ignores some address bits; we probably want explicit support in the memory API for that. In order to get the correct opaque into the MemoryRegion object, the allocation scheme is changed so that the flash emulation code allocates memory, instead of the caller. This clears a FIXME in the flash code. Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
ccbecf6237
commit
cfe5f01104
18 changed files with 187 additions and 181 deletions
13
hw/flash.h
13
hw/flash.h
|
@ -1,15 +1,22 @@
|
|||
/* NOR flash devices */
|
||||
|
||||
#include "memory.h"
|
||||
|
||||
typedef struct pflash_t pflash_t;
|
||||
|
||||
/* pflash_cfi01.c */
|
||||
pflash_t *pflash_cfi01_register(target_phys_addr_t base, ram_addr_t off,
|
||||
pflash_t *pflash_cfi01_register(target_phys_addr_t base,
|
||||
DeviceState *qdev, const char *name,
|
||||
target_phys_addr_t size,
|
||||
BlockDriverState *bs,
|
||||
uint32_t sector_len, int nb_blocs, int width,
|
||||
uint16_t id0, uint16_t id1,
|
||||
uint16_t id2, uint16_t id3, int be);
|
||||
|
||||
/* pflash_cfi02.c */
|
||||
pflash_t *pflash_cfi02_register(target_phys_addr_t base, ram_addr_t off,
|
||||
pflash_t *pflash_cfi02_register(target_phys_addr_t base,
|
||||
DeviceState *qdev, const char *name,
|
||||
target_phys_addr_t size,
|
||||
BlockDriverState *bs, uint32_t sector_len,
|
||||
int nb_blocs, int nb_mappings, int width,
|
||||
uint16_t id0, uint16_t id1,
|
||||
|
@ -17,6 +24,8 @@ pflash_t *pflash_cfi02_register(target_phys_addr_t base, ram_addr_t off,
|
|||
uint16_t unlock_addr0, uint16_t unlock_addr1,
|
||||
int be);
|
||||
|
||||
MemoryRegion *pflash_cfi01_get_memory(pflash_t *fl);
|
||||
|
||||
/* nand.c */
|
||||
DeviceState *nand_init(BlockDriverState *bdrv, int manf_id, int chip_id);
|
||||
void nand_setpins(DeviceState *dev, uint8_t cle, uint8_t ale,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue