diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2010-02-07 08:05:03 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-02-07 08:05:03 +0000 |
| commit | 43a347045768ce843987649bafc5bc1dd18d4d0f (patch) | |
| tree | 34e6917f0518bab55d3d821ad852eb09b0e8ada9 /hw/sun4u.c | |
| parent | 1cd62ae9f8ed624263e4779d2c71908aa41137fb (diff) | |
m48t59: don't use reserved _t suffix
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/sun4u.c')
| -rw-r--r-- | hw/sun4u.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/hw/sun4u.c b/hw/sun4u.c index 1e011233e..f339df38d 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -118,16 +118,15 @@ static int fw_cfg_boot_set(void *opaque, const char *boot_device) return 0; } -static int sun4u_NVRAM_set_params (m48t59_t *nvram, uint16_t NVRAM_size, - const char *arch, - ram_addr_t RAM_size, - const char *boot_devices, - uint32_t kernel_image, uint32_t kernel_size, - const char *cmdline, - uint32_t initrd_image, uint32_t initrd_size, - uint32_t NVRAM_image, - int width, int height, int depth, - const uint8_t *macaddr) +static int sun4u_NVRAM_set_params(M48t59State *nvram, uint16_t NVRAM_size, + const char *arch, ram_addr_t RAM_size, + const char *boot_devices, + uint32_t kernel_image, uint32_t kernel_size, + const char *cmdline, + uint32_t initrd_image, uint32_t initrd_size, + uint32_t NVRAM_image, + int width, int height, int depth, + const uint8_t *macaddr) { unsigned int i; uint32_t start, end; @@ -736,7 +735,7 @@ static void sun4uv_init(ram_addr_t RAM_size, const struct hwdef *hwdef) { CPUState *env; - m48t59_t *nvram; + M48t59State *nvram; unsigned int i; long initrd_size, kernel_size; PCIBus *pci_bus, *pci_bus2, *pci_bus3; |