diff options
| author | Avi Kivity <avi@redhat.com> | 2011-08-04 15:55:30 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-08-25 10:56:33 +0300 |
| commit | c8a50e596c8eeb41bf5718df5bad6be4080f40c7 (patch) | |
| tree | 589bfb006ec42863a518debd4775d88a3abfe185 /hw/flash.h | |
| parent | a1807ef2954d3ddbf9a9bca3949bd0c69fd45a0e (diff) | |
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.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'hw/flash.h')
| -rw-r--r-- | hw/flash.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/hw/flash.h b/hw/flash.h index 140ae39801..7fb012bb06 100644 --- a/hw/flash.h +++ b/hw/flash.h @@ -1,21 +1,27 @@ +#include "memory.h" + /* NOR flash devices */ typedef struct pflash_t pflash_t; /* pflash_cfi01.c */ -pflash_t *pflash_cfi01_register(target_phys_addr_t base, ram_addr_t off, +extern const MemoryRegionOps pflash_cfi01_ops_be; +extern const MemoryRegionOps pflash_cfi01_ops_le; +extern const MemoryRegionOps pflash_cfi02_ops_be; +extern const MemoryRegionOps pflash_cfi02_ops_le; + +pflash_t *pflash_cfi01_register(target_phys_addr_t base, MemoryRegion *mem, 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); + uint16_t id2, uint16_t id3); /* 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, MemoryRegion *mem, BlockDriverState *bs, uint32_t sector_len, int nb_blocs, int nb_mappings, int width, uint16_t id0, uint16_t id1, uint16_t id2, uint16_t id3, - uint16_t unlock_addr0, uint16_t unlock_addr1, - int be); + uint16_t unlock_addr0, uint16_t unlock_addr1); /* nand.c */ DeviceState *nand_init(BlockDriverState *bdrv, int manf_id, int chip_id); |