diff options
author | balrog | 2007-12-10 01:28:27 +0100 |
---|---|---|
committer | balrog | 2007-12-10 01:28:27 +0100 |
commit | 88eeee0a31c696b26f8df3dfe2221b955f8d878e (patch) | |
tree | b20e27ed080dc3a0d8657635447a918f814e87b7 /hw/pflash_cfi01.c | |
parent | Save/load PCI-device, PCI-bus and PIIX3 irq-related state (patches by Uri Lub... (diff) | |
download | qemu-88eeee0a31c696b26f8df3dfe2221b955f8d878e.tar.gz qemu-88eeee0a31c696b26f8df3dfe2221b955f8d878e.tar.xz qemu-88eeee0a31c696b26f8df3dfe2221b955f8d878e.zip |
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/pflash_cfi01.c')
-rw-r--r-- | hw/pflash_cfi01.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/pflash_cfi01.c b/hw/pflash_cfi01.c index f50d7bae77..745f5e57c5 100644 --- a/hw/pflash_cfi01.c +++ b/hw/pflash_cfi01.c @@ -483,11 +483,11 @@ static int ctz32 (uint32_t n) return ret; } -pflash_t *pflash_register (target_phys_addr_t base, ram_addr_t off, - BlockDriverState *bs, - target_ulong sector_len, int nb_blocs, int width, - uint16_t id0, uint16_t id1, - uint16_t id2, uint16_t id3) +pflash_t *pflash_cfi01_register(target_phys_addr_t base, ram_addr_t off, + BlockDriverState *bs, target_ulong sector_len, + int nb_blocs, int width, + uint16_t id0, uint16_t id1, + uint16_t id2, uint16_t id3) { pflash_t *pfl; target_long total_len; |