aboutsummaryrefslogtreecommitdiffstats
path: root/hw/pflash_cfi02.c
diff options
context:
space:
mode:
authorbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-10 00:28:27 +0000
committerbalrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>2007-12-10 00:28:27 +0000
commit88eeee0a31c696b26f8df3dfe2221b955f8d878e (patch)
treeb20e27ed080dc3a0d8657635447a918f814e87b7 /hw/pflash_cfi02.c
parent52fc1d83bc50b0b6fc6861cfecc5763edbad7e60 (diff)
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_cfi02.c')
-rw-r--r--hw/pflash_cfi02.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/hw/pflash_cfi02.c b/hw/pflash_cfi02.c
index eaf6750bb..d5b3f3279 100644
--- a/hw/pflash_cfi02.c
+++ b/hw/pflash_cfi02.c
@@ -524,11 +524,11 @@ static int ctz32 (uint32_t n)
return ret;
}
-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_t *pflash_cfi02_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;
int32_t total_len;