gwj / at91sam9263 · Commits

Commit 4b32e1688000d306a676b0a5b89629b9d8da1ed7

Authored by aliguori
1 parent 0f431527

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 <jes@sgi.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>



git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5442 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 19 changed files with 100 additions and 100 deletions
hw/an5206.c
  View file @4b32e16
... ... @@ -88,8 +88,8 @@ static void an5206_init(ram_addr_t ram_size, int vga_ram_size,
88 88 }
89 89  
90 90 QEMUMachine an5206_machine = {
91   - "an5206",
92   - "Arnewsh 5206",
93   - an5206_init,
94   - 512,
  91 + .name = "an5206",
  92 + .desc = "Arnewsh 5206",
  93 + .init = an5206_init,
  94 + .ram_require = 512,
95 95 };
... ...
hw/dummy_m68k.c
  View file @4b32e16
... ... @@ -63,7 +63,7 @@ static void dummy_m68k_init(ram_addr_t ram_size, int vga_ram_size,
63 63 }
64 64  
65 65 QEMUMachine dummy_m68k_machine = {
66   - "dummy",
67   - "Dummy board",
68   - dummy_m68k_init,
  66 + .name = "dummy",
  67 + .desc = "Dummy board",
  68 + .init = dummy_m68k_init,
69 69 };
... ...
hw/etraxfs.c
  View file @4b32e16
... ... @@ -141,8 +141,8 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
141 141 }
142 142  
143 143 QEMUMachine bareetraxfs_machine = {
144   - "bareetraxfs",
145   - "Bare ETRAX FS board",
146   - bareetraxfs_init,
147   - 0x8000000,
  144 + .name = "bareetraxfs",
  145 + .desc = "Bare ETRAX FS board",
  146 + .init = bareetraxfs_init,
  147 + .ram_require = 0x8000000,
148 148 };
... ...
hw/gumstix.c
  View file @4b32e16
... ... @@ -122,15 +122,15 @@ static void verdex_init(ram_addr_t ram_size, int vga_ram_size,
122 122 }
123 123  
124 124 QEMUMachine connex_machine = {
125   - "connex",
126   - "Gumstix Connex (PXA255)",
127   - connex_init,
128   - (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
  125 + .name = "connex",
  126 + .desc = "Gumstix Connex (PXA255)",
  127 + .init = connex_init,
  128 + .ram_require = (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
129 129 };
130 130  
131 131 QEMUMachine verdex_machine = {
132   - "verdex",
133   - "Gumstix Verdex (PXA270)",
134   - verdex_init,
135   - (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
  132 + .name = "verdex",
  133 + .desc = "Gumstix Verdex (PXA270)",
  134 + .init = verdex_init,
  135 + .ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
136 136 };
... ...
hw/integratorcp.c
  View file @4b32e16
... ... @@ -540,8 +540,8 @@ static void integratorcp_init(ram_addr_t ram_size, int vga_ram_size,
540 540 }
541 541  
542 542 QEMUMachine integratorcp_machine = {
543   - "integratorcp",
544   - "ARM Integrator/CP (ARM926EJ-S)",
545   - integratorcp_init,
546   - 0x100000,
  543 + .name = "integratorcp",
  544 + .desc = "ARM Integrator/CP (ARM926EJ-S)",
  545 + .init = integratorcp_init,
  546 + .ram_require = 0x100000,
547 547 };
... ...
hw/mainstone.c
  View file @4b32e16
... ... @@ -144,9 +144,9 @@ static void mainstone_init(ram_addr_t ram_size, int vga_ram_size,
144 144 }
145 145  
146 146 QEMUMachine mainstone2_machine = {
147   - "mainstone",
148   - "Mainstone II (PXA27x)",
149   - mainstone_init,
150   - (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
151   - PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
  147 + .name = "mainstone",
  148 + .desc = "Mainstone II (PXA27x)",
  149 + .init = mainstone_init,
  150 + .ram_require = (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
  151 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
152 152 };
... ...
hw/mcf5208.c
  View file @4b32e16
... ... @@ -305,8 +305,8 @@ static void mcf5208evb_init(ram_addr_t ram_size, int vga_ram_size,
305 305 }
306 306  
307 307 QEMUMachine mcf5208evb_machine = {
308   - "mcf5208evb",
309   - "MCF5206EVB",
310   - mcf5208evb_init,
311   - 16384,
  308 + .name = "mcf5208evb",
  309 + .desc = "MCF5206EVB",
  310 + .init = mcf5208evb_init,
  311 + .ram_require = 16384,
312 312 };
... ...
hw/musicpal.c
  View file @4b32e16
... ... @@ -1509,8 +1509,8 @@ static void musicpal_init(ram_addr_t ram_size, int vga_ram_size,
1509 1509 }
1510 1510  
1511 1511 QEMUMachine musicpal_machine = {
1512   - "musicpal",
1513   - "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
1514   - musicpal_init,
1515   - MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED
  1512 + .name = "musicpal",
  1513 + .desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
  1514 + .init = musicpal_init,
  1515 + .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE + MP_FLASH_SIZE_MAX + RAMSIZE_FIXED,
1516 1516 };
... ...
hw/nseries.c
  View file @4b32e16
... ... @@ -1404,15 +1404,15 @@ static void n810_init(ram_addr_t ram_size, int vga_ram_size,
1404 1404 }
1405 1405  
1406 1406 QEMUMachine n800_machine = {
1407   - "n800",
1408   - "Nokia N800 tablet aka. RX-34 (OMAP2420)",
1409   - n800_init,
1410   - (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
  1407 + .name = "n800",
  1408 + .desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
  1409 + .init = n800_init,
  1410 + .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
1411 1411 };
1412 1412  
1413 1413 QEMUMachine n810_machine = {
1414   - "n810",
1415   - "Nokia N810 tablet aka. RX-44 (OMAP2420)",
1416   - n810_init,
1417   - (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
  1414 + .name = "n810",
  1415 + .desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
  1416 + .init = n810_init,
  1417 + .ram_require = (0x08000000 + 0x00010000 + OMAP242X_SRAM_SIZE) | RAMSIZE_FIXED,
1418 1418 };
... ...
hw/palm.c
  View file @4b32e16
... ... @@ -282,8 +282,8 @@ static void palmte_init(ram_addr_t ram_size, int vga_ram_size,
282 282 }
283 283  
284 284 QEMUMachine palmte_machine = {
285   - "cheetah",
286   - "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
287   - palmte_init,
288   - (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED,
  285 + .name = "cheetah",
  286 + .desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
  287 + .init = palmte_init,
  288 + .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) | RAMSIZE_FIXED,
289 289 };
... ...
hw/ppc405_boards.c
  View file @4b32e16
... ... @@ -355,10 +355,10 @@ static void ref405ep_init (ram_addr_t ram_size, int vga_ram_size,
355 355 }
356 356  
357 357 QEMUMachine ref405ep_machine = {
358   - "ref405ep",
359   - "ref405ep",
360   - ref405ep_init,
361   - (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
  358 + .name = "ref405ep",
  359 + .desc = "ref405ep",
  360 + .init = ref405ep_init,
  361 + .ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
362 362 };
363 363  
364 364 /*****************************************************************************/
... ...
hw/ppc_chrp.c
  View file @4b32e16
... ... @@ -331,8 +331,8 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size,
331 331 }
332 332  
333 333 QEMUMachine core99_machine = {
334   - "mac99",
335   - "Mac99 based PowerMAC",
336   - ppc_core99_init,
337   - BIOS_SIZE + VGA_RAM_SIZE,
  334 + .name = "mac99",
  335 + .desc = "Mac99 based PowerMAC",
  336 + .init = ppc_core99_init,
  337 + .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
338 338 };
... ...
hw/ppc_oldworld.c
  View file @4b32e16
... ... @@ -366,8 +366,8 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size,
366 366 }
367 367  
368 368 QEMUMachine heathrow_machine = {
369   - "g3bw",
370   - "Heathrow based PowerMAC",
371   - ppc_heathrow_init,
372   - BIOS_SIZE + VGA_RAM_SIZE,
  369 + .name = "g3bw",
  370 + .desc = "Heathrow based PowerMAC",
  371 + .init = ppc_heathrow_init,
  372 + .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
373 373 };
... ...
hw/ppc_prep.c
  View file @4b32e16
... ... @@ -758,8 +758,8 @@ static void ppc_prep_init (ram_addr_t ram_size, int vga_ram_size,
758 758 }
759 759  
760 760 QEMUMachine prep_machine = {
761   - "prep",
762   - "PowerPC PREP platform",
763   - ppc_prep_init,
764   - BIOS_SIZE + VGA_RAM_SIZE,
  761 + .name = "prep",
  762 + .desc = "PowerPC PREP platform",
  763 + .init = ppc_prep_init,
  764 + .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
765 765 };
... ...
hw/r2d.c
  View file @4b32e16
... ... @@ -164,8 +164,8 @@ static void r2d_init(ram_addr_t ram_size, int vga_ram_size,
164 164 }
165 165  
166 166 QEMUMachine r2d_machine = {
167   - "r2d",
168   - "r2d-plus board",
169   - r2d_init,
170   - SDRAM_SIZE | RAMSIZE_FIXED
  167 + .name = "r2d",
  168 + .desc = "r2d-plus board",
  169 + .init = r2d_init,
  170 + .ram_require = SDRAM_SIZE | RAMSIZE_FIXED,
171 171 };
... ...
hw/shix.c
  View file @4b32e16
... ... @@ -108,8 +108,8 @@ static void shix_init(ram_addr_t ram_size, int vga_ram_size,
108 108 }
109 109  
110 110 QEMUMachine shix_machine = {
111   - "shix",
112   - "shix card",
113   - shix_init,
114   - (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED
  111 + .name = "shix",
  112 + .desc = "shix card",
  113 + .init = shix_init,
  114 + .ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
115 115 };
... ...
hw/spitz.c
  View file @4b32e16
... ... @@ -1010,29 +1010,29 @@ static void terrier_init(ram_addr_t ram_size, int vga_ram_size,
1010 1010 }
1011 1011  
1012 1012 QEMUMachine akitapda_machine = {
1013   - "akita",
1014   - "Akita PDA (PXA270)",
1015   - akita_init,
1016   - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
  1013 + .name = "akita",
  1014 + .desc = "Akita PDA (PXA270)",
  1015 + .init = akita_init,
  1016 + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1017 1017 };
1018 1018  
1019 1019 QEMUMachine spitzpda_machine = {
1020   - "spitz",
1021   - "Spitz PDA (PXA270)",
1022   - spitz_init,
1023   - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
  1020 + .name = "spitz",
  1021 + .desc = "Spitz PDA (PXA270)",
  1022 + .init = spitz_init,
  1023 + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1024 1024 };
1025 1025  
1026 1026 QEMUMachine borzoipda_machine = {
1027   - "borzoi",
1028   - "Borzoi PDA (PXA270)",
1029   - borzoi_init,
1030   - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
  1027 + .name = "borzoi",
  1028 + .desc = "Borzoi PDA (PXA270)",
  1029 + .init = borzoi_init,
  1030 + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1031 1031 };
1032 1032  
1033 1033 QEMUMachine terrierpda_machine = {
1034   - "terrier",
1035   - "Terrier PDA (PXA270)",
1036   - terrier_init,
1037   - SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
  1034 + .name = "terrier",
  1035 + .desc = "Terrier PDA (PXA270)",
  1036 + .init = terrier_init,
  1037 + .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
1038 1038 };
... ...
hw/stellaris.c
  View file @4b32e16
... ... @@ -1413,15 +1413,15 @@ static void lm3s6965evb_init(ram_addr_t ram_size, int vga_ram_size,
1413 1413 }
1414 1414  
1415 1415 QEMUMachine lm3s811evb_machine = {
1416   - "lm3s811evb",
1417   - "Stellaris LM3S811EVB",
1418   - lm3s811evb_init,
1419   - (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
  1416 + .name = "lm3s811evb",
  1417 + .desc = "Stellaris LM3S811EVB",
  1418 + .init = lm3s811evb_init,
  1419 + .ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
1420 1420 };
1421 1421  
1422 1422 QEMUMachine lm3s6965evb_machine = {
1423   - "lm3s6965evb",
1424   - "Stellaris LM3S6965EVB",
1425   - lm3s6965evb_init,
1426   - (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
  1423 + .name = "lm3s6965evb",
  1424 + .desc = "Stellaris LM3S6965EVB",
  1425 + .init = lm3s6965evb_init,
  1426 + .ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
1427 1427 };
... ...
hw/tosa.c
  View file @4b32e16
... ... @@ -119,8 +119,8 @@ static void tosa_init(ram_addr_t ram_size, int vga_ram_size,
119 119 }
120 120  
121 121 QEMUMachine tosapda_machine = {
122   - "tosa",
123   - "Tosa PDA (PXA255)",
124   - tosa_init,
125   - TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
  122 + .name = "tosa",
  123 + .desc = "Tosa PDA (PXA255)",
  124 + .init = tosa_init,
  125 + .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
126 126 };
... ...