From 88eeee0a31c696b26f8df3dfe2221b955f8d878e Mon Sep 17 00:00:00 2001 From: balrog Date: Mon, 10 Dec 2007 00:28:27 +0000 Subject: 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 --- hw/ppc405_boards.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'hw/ppc405_boards.c') diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 597f9b58a..b96a18849 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -234,9 +234,9 @@ static void ref405ep_init (int ram_size, int vga_ram_size, fl_idx, bios_size, bios_offset, -bios_size, bdrv_get_device_name(drives_table[index].bdrv), fl_sectors); #endif - pflash_register((uint32_t)(-bios_size), bios_offset, - drives_table[index].bdrv, 65536, fl_sectors, 2, - 0x0001, 0x22DA, 0x0000, 0x0000); + pflash_cfi02_register((uint32_t)(-bios_size), bios_offset, + drives_table[index].bdrv, 65536, fl_sectors, 2, + 0x0001, 0x22DA, 0x0000, 0x0000); fl_idx++; } else #endif @@ -551,9 +551,9 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, fl_idx, bios_size, bios_offset, -bios_size, bdrv_get_device_name(drives_table[index].bdrv), fl_sectors); #endif - pflash_register((uint32_t)(-bios_size), bios_offset, - drives_table[index].bdrv, 65536, fl_sectors, 4, - 0x0001, 0x22DA, 0x0000, 0x0000); + pflash_cfi02_register((uint32_t)(-bios_size), bios_offset, + drives_table[index].bdrv, 65536, fl_sectors, 4, + 0x0001, 0x22DA, 0x0000, 0x0000); fl_idx++; } else #endif @@ -587,9 +587,9 @@ static void taihu_405ep_init(int ram_size, int vga_ram_size, fl_idx, bios_size, bios_offset, (target_ulong)0xfc000000, bdrv_get_device_name(drives_table[index].bdrv)); #endif - pflash_register(0xfc000000, bios_offset, drives_table[index].bdrv, - 65536, fl_sectors, 4, - 0x0001, 0x22DA, 0x0000, 0x0000); + pflash_cfi02_register(0xfc000000, bios_offset, + drives_table[index].bdrv, 65536, fl_sectors, 4, + 0x0001, 0x22DA, 0x0000, 0x0000); fl_idx++; } /* Register CLPD & LCD display */ -- cgit v1.2.3