From 4b32e1688000d306a676b0a5b89629b9d8da1ed7 Mon Sep 17 00:00:00 2001 From: aliguori Date: Tue, 7 Oct 2008 20:34:35 +0000 Subject: machine struct - use C99 initializers (Jes Sorensen) Modify all the machine struct declarations to use C99 initializers. This patch has no functional changes. Signed-off-by: Jes Sorensen Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5442 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/an5206.c | 8 ++++---- hw/dummy_m68k.c | 6 +++--- hw/etraxfs.c | 8 ++++---- hw/gumstix.c | 16 ++++++++-------- hw/integratorcp.c | 8 ++++---- hw/mainstone.c | 10 +++++----- hw/mcf5208.c | 8 ++++---- hw/musicpal.c | 8 ++++---- hw/nseries.c | 16 ++++++++-------- hw/palm.c | 8 ++++---- hw/ppc405_boards.c | 8 ++++---- hw/ppc_chrp.c | 8 ++++---- hw/ppc_oldworld.c | 8 ++++---- hw/ppc_prep.c | 8 ++++---- hw/r2d.c | 8 ++++---- hw/shix.c | 8 ++++---- hw/spitz.c | 32 ++++++++++++++++---------------- hw/stellaris.c | 16 ++++++++-------- hw/tosa.c | 8 ++++---- 19 files changed, 100 insertions(+), 100 deletions(-) diff --git a/hw/an5206.c b/hw/an5206.c index 8dd4db3..2981263 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -88,8 +88,8 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine an5206_machine = { - "an5206", - "Arnewsh 5206", - an5206_init, - 512, + .name = "an5206", + .desc = "Arnewsh 5206", + .init = an5206_init, + .ram_require = 512, }; diff --git a/hw/dummy_m68k.c b/hw/dummy_m68k.c index 1641d56..fc06e9c 100644 --- a/hw/dummy_m68k.c +++ b/hw/dummy_m68k.c @@ -63,7 +63,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine dummy_m68k_machine = { - "dummy", - "Dummy board", - dummy_m68k_init, + .name = "dummy", + .desc = "Dummy board", + .init = dummy_m68k_init, }; diff --git a/hw/etraxfs.c b/hw/etraxfs.c index 1ec0fa0..4d3f694 100644 --- a/hw/etraxfs.c +++ b/hw/etraxfs.c @@ -141,8 +141,8 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine bareetraxfs_machine = { - "bareetraxfs", - "Bare ETRAX FS board", - bareetraxfs_init, - 0x8000000, + .name = "bareetraxfs", + .desc = "Bare ETRAX FS board", + .init = bareetraxfs_init, + .ram_require = 0x8000000, }; diff --git a/hw/gumstix.c b/hw/gumstix.c index 89bf684..29cd69d 100644 --- a/hw/gumstix.c +++ b/hw/gumstix.c @@ -122,15 +122,15 @@ static void verdex_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine connex_machine = { - "connex", - "Gumstix Connex (PXA255)", - connex_init, - (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, + .name = "connex", + .desc = "Gumstix Connex (PXA255)", + .init = connex_init, + .ram_require = (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, }; QEMUMachine verdex_machine = { - "verdex", - "Gumstix Verdex (PXA270)", - verdex_init, - (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, + .name = "verdex", + .desc = "Gumstix Verdex (PXA270)", + .init = verdex_init, + .ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, }; diff --git a/hw/integratorcp.c b/hw/integratorcp.c index 4ac7c0c..779d46b 100644 --- a/hw/integratorcp.c +++ b/hw/integratorcp.c @@ -540,8 +540,8 @@ static void integratorcp_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine integratorcp_machine = { - "integratorcp", - "ARM Integrator/CP (ARM926EJ-S)", - integratorcp_init, - 0x100000, + .name = "integratorcp", + .desc = "ARM Integrator/CP (ARM926EJ-S)", + .init = integratorcp_init, + .ram_require = 0x100000, }; diff --git a/hw/mainstone.c b/hw/mainstone.c index 3de25d8..52485ce 100644 --- a/hw/mainstone.c +++ b/hw/mainstone.c @@ -144,9 +144,9 @@ static void mainstone_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine mainstone2_machine = { - "mainstone", - "Mainstone II (PXA27x)", - mainstone_init, - (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH + - PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, + .name = "mainstone", + .desc = "Mainstone II (PXA27x)", + .init = mainstone_init, + .ram_require = (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH + + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED, }; diff --git a/hw/mcf5208.c b/hw/mcf5208.c index dfb504b..3e0a811 100644 --- a/hw/mcf5208.c +++ b/hw/mcf5208.c @@ -305,8 +305,8 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine mcf5208evb_machine = { - "mcf5208evb", - "MCF5206EVB", - mcf5208evb_init, - 16384, + .name = "mcf5208evb", + .desc = "MCF5206EVB", + .init = mcf5208evb_init, + .ram_require = 16384, }; diff --git a/hw/musicpal.c b/hw/musicpal.c index e4d8c89..ccea19f 100644 --- a/hw/musicpal.c +++ b/hw/musicpal.c @@ -1509,8 +1509,8 @@ static void musicpal_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine musicpal_machine = { - "musicpal", - "Marvell 88w8618 / MusicPal (ARM926EJ-S)", - musicpal_init, - MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED + .name = "musicpal", + .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)", + .init = musicpal_init, + .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED, }; diff --git a/hw/nseries.c b/hw/nseries.c index 11e817b..ec56fad 100644 --- a/hw/nseries.c +++ b/hw/nseries.c @@ -1404,15 +1404,15 @@ static void n810_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine n800_machine = { - "n800", - "Nokia N800 tablet aka. RX-34 (OMAP2420)", - n800_init, - (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED, + .name = "n800", + .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)", + .init = n800_init, + .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED, }; QEMUMachine n810_machine = { - "n810", - "Nokia N810 tablet aka. RX-44 (OMAP2420)", - n810_init, - (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED, + .name = "n810", + .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)", + .init = n810_init, + .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED, }; diff --git a/hw/palm.c b/hw/palm.c index 9af0b13..79ea3a7 100644 --- a/hw/palm.c +++ b/hw/palm.c @@ -282,8 +282,8 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine palmte_machine = { - "cheetah", - "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", - palmte_init, - (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED, + .name = "cheetah", + .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)", + .init = palmte_init, + .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED, }; diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 296e071..c7a6959 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -355,10 +355,10 @@ static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine ref405ep_machine = { - "ref405ep", - "ref405ep", - ref405ep_init, - (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED, + .name = "ref405ep", + .desc = "ref405ep", + .init = ref405ep_init, + .ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED, }; /*****************************************************************************/ diff --git a/hw/ppc_chrp.c b/hw/ppc_chrp.c index a100896..140541f 100644 --- a/hw/ppc_chrp.c +++ b/hw/ppc_chrp.c @@ -331,8 +331,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine core99_machine = { - "mac99", - "Mac99 based PowerMAC", - ppc_core99_init, - BIOS_SIZE + VGA_RAM_SIZE, + .name = "mac99", + .desc = "Mac99 based PowerMAC", + .init = ppc_core99_init, + .ram_require = BIOS_SIZE + VGA_RAM_SIZE, }; diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index 85d3b2c..15e8022 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -366,8 +366,8 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine heathrow_machine = { - "g3bw", - "Heathrow based PowerMAC", - ppc_heathrow_init, - BIOS_SIZE + VGA_RAM_SIZE, + .name = "g3bw", + .desc = "Heathrow based PowerMAC", + .init = ppc_heathrow_init, + .ram_require = BIOS_SIZE + VGA_RAM_SIZE, }; diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 3c35d17..a955909 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -758,8 +758,8 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size, } QEMUMachine prep_machine = { - "prep", - "PowerPC PREP platform", - ppc_prep_init, - BIOS_SIZE + VGA_RAM_SIZE, + .name = "prep", + .desc = "PowerPC PREP platform", + .init = ppc_prep_init, + .ram_require = BIOS_SIZE + VGA_RAM_SIZE, }; diff --git a/hw/r2d.c b/hw/r2d.c index a7607d1..855aa41 100644 --- a/hw/r2d.c +++ b/hw/r2d.c @@ -164,8 +164,8 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine r2d_machine = { - "r2d", - "r2d-plus board", - r2d_init, - SDRAM_SIZE | RAMSIZE_FIXED + .name = "r2d", + .desc = "r2d-plus board", + .init = r2d_init, + .ram_require = SDRAM_SIZE | RAMSIZE_FIXED, }; diff --git a/hw/shix.c b/hw/shix.c index ff8afec..140efe9 100644 --- a/hw/shix.c +++ b/hw/shix.c @@ -108,8 +108,8 @@ static void shix_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine shix_machine = { - "shix", - "shix card", - shix_init, - (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED + .name = "shix", + .desc = "shix card", + .init = shix_init, + .ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED, }; diff --git a/hw/spitz.c b/hw/spitz.c index fef557a..fc77174 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -1010,29 +1010,29 @@ static void terrier_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine akitapda_machine = { - "akita", - "Akita PDA (PXA270)", - akita_init, - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, + .name = "akita", + .desc = "Akita PDA (PXA270)", + .init = akita_init, + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, }; QEMUMachine spitzpda_machine = { - "spitz", - "Spitz PDA (PXA270)", - spitz_init, - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, + .name = "spitz", + .desc = "Spitz PDA (PXA270)", + .init = spitz_init, + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, }; QEMUMachine borzoipda_machine = { - "borzoi", - "Borzoi PDA (PXA270)", - borzoi_init, - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, + .name = "borzoi", + .desc = "Borzoi PDA (PXA270)", + .init = borzoi_init, + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, }; QEMUMachine terrierpda_machine = { - "terrier", - "Terrier PDA (PXA270)", - terrier_init, - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, + .name = "terrier", + .desc = "Terrier PDA (PXA270)", + .init = terrier_init, + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, }; diff --git a/hw/stellaris.c b/hw/stellaris.c index 93f7511..5948079 100644 --- a/hw/stellaris.c +++ b/hw/stellaris.c @@ -1413,15 +1413,15 @@ static void lm3s6965evb_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine lm3s811evb_machine = { - "lm3s811evb", - "Stellaris LM3S811EVB", - lm3s811evb_init, - (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED, + .name = "lm3s811evb", + .desc = "Stellaris LM3S811EVB", + .init = lm3s811evb_init, + .ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED, }; QEMUMachine lm3s6965evb_machine = { - "lm3s6965evb", - "Stellaris LM3S6965EVB", - lm3s6965evb_init, - (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED, + .name = "lm3s6965evb", + .desc = "Stellaris LM3S6965EVB", + .init = lm3s6965evb_init, + .ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED, }; diff --git a/hw/tosa.c b/hw/tosa.c index f67d67e..75df52e 100644 --- a/hw/tosa.c +++ b/hw/tosa.c @@ -119,8 +119,8 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size, } QEMUMachine tosapda_machine = { - "tosa", - "Tosa PDA (PXA255)", - tosa_init, - TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, + .name = "tosa", + .desc = "Tosa PDA (PXA255)", + .init = tosa_init, + .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED, }; -- cgit v1.1