diff options
| author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-10 00:28:27 +0000 |
|---|---|---|
| committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-12-10 00:28:27 +0000 |
| commit | 88eeee0a31c696b26f8df3dfe2221b955f8d878e (patch) | |
| tree | b20e27ed080dc3a0d8657635447a918f814e87b7 /hw/flash.h | |
| parent | 52fc1d83bc50b0b6fc6861cfecc5763edbad7e60 (diff) | |
| download | qemu-88eeee0a31c696b26f8df3dfe2221b955f8d878e.tar.gz | |
Desambiguate pflash_register().
pflash_t is still ambiguous... perhaps both emulations should sit in a single file.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3794 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/flash.h')
| -rw-r--r-- | hw/flash.h | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/hw/flash.h b/hw/flash.h index e3c898a34c..95ac62862d 100644 --- a/hw/flash.h +++ b/hw/flash.h @@ -1,11 +1,19 @@ /* NOR flash devices */ typedef struct pflash_t pflash_t; -pflash_t *pflash_register (target_phys_addr_t base, ram_addr_t off, - BlockDriverState *bs, - uint32_t sector_len, int nb_blocs, int width, - uint16_t id0, uint16_t id1, - uint16_t id2, uint16_t id3); +/* pflash_cfi01.c */ +pflash_t *pflash_cfi01_register(target_phys_addr_t base, ram_addr_t off, + BlockDriverState *bs, + uint32_t sector_len, int nb_blocs, int width, + uint16_t id0, uint16_t id1, + uint16_t id2, uint16_t id3); + +/* pflash_cfi02.c */ +pflash_t *pflash_cfi02_register(target_phys_addr_t base, ram_addr_t off, + BlockDriverState *bs, + uint32_t sector_len, int nb_blocs, int width, + uint16_t id0, uint16_t id1, + uint16_t id2, uint16_t id3); /* nand.c */ struct nand_flash_s; @@ -37,4 +45,3 @@ uint8_t ecc_digest(struct ecc_state_s *s, uint8_t sample); void ecc_reset(struct ecc_state_s *s); void ecc_put(QEMUFile *f, struct ecc_state_s *s); void ecc_get(QEMUFile *f, struct ecc_state_s *s); - |