gwj / at91sam9263 · Commits

Commit 66de733bdb37a7542e5313c18f44d99d5faf6cb7

Authored by blueswir1
1 parent 53e65600

Use C99 initializers 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4996 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 56 additions and 56 deletions
hw/sun4m.c
  View file @66de733
@@ -1238,73 +1238,73 @@ static void sbook_init(ram_addr_t RAM_size, int vga_ram_size, @@ -1238,73 +1238,73 @@ static void sbook_init(ram_addr_t RAM_size, int vga_ram_size,
1238 } 1238 }
1239 1239
1240 QEMUMachine ss5_machine = { 1240 QEMUMachine ss5_machine = {
1241 - "SS-5",  
1242 - "Sun4m platform, SPARCstation 5",  
1243 - ss5_init,  
1244 - PROM_SIZE_MAX + TCX_SIZE, 1241 + .name = "SS-5",
  1242 + .desc = "Sun4m platform, SPARCstation 5",
  1243 + .init = ss5_init,
  1244 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1245 }; 1245 };
1246 1246
1247 QEMUMachine ss10_machine = { 1247 QEMUMachine ss10_machine = {
1248 - "SS-10",  
1249 - "Sun4m platform, SPARCstation 10",  
1250 - ss10_init,  
1251 - PROM_SIZE_MAX + TCX_SIZE, 1248 + .name = "SS-10",
  1249 + .desc = "Sun4m platform, SPARCstation 10",
  1250 + .init = ss10_init,
  1251 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1252 }; 1252 };
1253 1253
1254 QEMUMachine ss600mp_machine = { 1254 QEMUMachine ss600mp_machine = {
1255 - "SS-600MP",  
1256 - "Sun4m platform, SPARCserver 600MP",  
1257 - ss600mp_init,  
1258 - PROM_SIZE_MAX + TCX_SIZE, 1255 + .name = "SS-600MP",
  1256 + .desc = "Sun4m platform, SPARCserver 600MP",
  1257 + .init = ss600mp_init,
  1258 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1259 }; 1259 };
1260 1260
1261 QEMUMachine ss20_machine = { 1261 QEMUMachine ss20_machine = {
1262 - "SS-20",  
1263 - "Sun4m platform, SPARCstation 20",  
1264 - ss20_init,  
1265 - PROM_SIZE_MAX + TCX_SIZE, 1262 + .name = "SS-20",
  1263 + .desc = "Sun4m platform, SPARCstation 20",
  1264 + .init = ss20_init,
  1265 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1266 }; 1266 };
1267 1267
1268 QEMUMachine ss2_machine = { 1268 QEMUMachine ss2_machine = {
1269 - "SS-2",  
1270 - "Sun4c platform, SPARCstation 2",  
1271 - ss2_init,  
1272 - PROM_SIZE_MAX + TCX_SIZE, 1269 + .name = "SS-2",
  1270 + .desc = "Sun4c platform, SPARCstation 2",
  1271 + .init = ss2_init,
  1272 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1273 }; 1273 };
1274 1274
1275 QEMUMachine voyager_machine = { 1275 QEMUMachine voyager_machine = {
1276 - "Voyager",  
1277 - "Sun4m platform, SPARCstation Voyager",  
1278 - vger_init,  
1279 - PROM_SIZE_MAX + TCX_SIZE, 1276 + .name = "Voyager",
  1277 + .desc = "Sun4m platform, SPARCstation Voyager",
  1278 + .init = vger_init,
  1279 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1280 }; 1280 };
1281 1281
1282 QEMUMachine ss_lx_machine = { 1282 QEMUMachine ss_lx_machine = {
1283 - "LX",  
1284 - "Sun4m platform, SPARCstation LX",  
1285 - ss_lx_init,  
1286 - PROM_SIZE_MAX + TCX_SIZE, 1283 + .name = "LX",
  1284 + .desc = "Sun4m platform, SPARCstation LX",
  1285 + .init = ss_lx_init,
  1286 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1287 }; 1287 };
1288 1288
1289 QEMUMachine ss4_machine = { 1289 QEMUMachine ss4_machine = {
1290 - "SS-4",  
1291 - "Sun4m platform, SPARCstation 4",  
1292 - ss4_init,  
1293 - PROM_SIZE_MAX + TCX_SIZE, 1290 + .name = "SS-4",
  1291 + .desc = "Sun4m platform, SPARCstation 4",
  1292 + .init = ss4_init,
  1293 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1294 }; 1294 };
1295 1295
1296 QEMUMachine scls_machine = { 1296 QEMUMachine scls_machine = {
1297 - "SPARCClassic",  
1298 - "Sun4m platform, SPARCClassic",  
1299 - scls_init,  
1300 - PROM_SIZE_MAX + TCX_SIZE, 1297 + .name = "SPARCClassic",
  1298 + .desc = "Sun4m platform, SPARCClassic",
  1299 + .init = scls_init,
  1300 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1301 }; 1301 };
1302 1302
1303 QEMUMachine sbook_machine = { 1303 QEMUMachine sbook_machine = {
1304 - "SPARCbook",  
1305 - "Sun4m platform, SPARCbook",  
1306 - sbook_init,  
1307 - PROM_SIZE_MAX + TCX_SIZE, 1304 + .name = "SPARCbook",
  1305 + .desc = "Sun4m platform, SPARCbook",
  1306 + .init = sbook_init,
  1307 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1308 }; 1308 };
1309 1309
1310 static const struct sun4d_hwdef sun4d_hwdefs[] = { 1310 static const struct sun4d_hwdef sun4d_hwdefs[] = {
@@ -1538,15 +1538,15 @@ static void ss2000_init(ram_addr_t RAM_size, int vga_ram_size, @@ -1538,15 +1538,15 @@ static void ss2000_init(ram_addr_t RAM_size, int vga_ram_size,
1538 } 1538 }
1539 1539
1540 QEMUMachine ss1000_machine = { 1540 QEMUMachine ss1000_machine = {
1541 - "SS-1000",  
1542 - "Sun4d platform, SPARCserver 1000",  
1543 - ss1000_init,  
1544 - PROM_SIZE_MAX + TCX_SIZE, 1541 + .name = "SS-1000",
  1542 + .desc = "Sun4d platform, SPARCserver 1000",
  1543 + .init = ss1000_init,
  1544 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1545 }; 1545 };
1546 1546
1547 QEMUMachine ss2000_machine = { 1547 QEMUMachine ss2000_machine = {
1548 - "SS-2000",  
1549 - "Sun4d platform, SPARCcenter 2000",  
1550 - ss2000_init,  
1551 - PROM_SIZE_MAX + TCX_SIZE, 1548 + .name = "SS-2000",
  1549 + .desc = "Sun4d platform, SPARCcenter 2000",
  1550 + .init = ss2000_init,
  1551 + .ram_require = PROM_SIZE_MAX + TCX_SIZE,
1552 }; 1552 };
hw/sun4u.c
  View file @66de733
@@ -446,15 +446,15 @@ static void sun4v_init(ram_addr_t RAM_size, int vga_ram_size, @@ -446,15 +446,15 @@ static void sun4v_init(ram_addr_t RAM_size, int vga_ram_size,
446 } 446 }
447 447
448 QEMUMachine sun4u_machine = { 448 QEMUMachine sun4u_machine = {
449 - "sun4u",  
450 - "Sun4u platform",  
451 - sun4u_init,  
452 - PROM_SIZE_MAX + VGA_RAM_SIZE, 449 + .name = "sun4u",
  450 + .desc = "Sun4u platform",
  451 + .init = sun4u_init,
  452 + .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
453 }; 453 };
454 454
455 QEMUMachine sun4v_machine = { 455 QEMUMachine sun4v_machine = {
456 - "sun4v",  
457 - "Sun4v platform",  
458 - sun4v_init,  
459 - PROM_SIZE_MAX + VGA_RAM_SIZE, 456 + .name = "sun4v",
  457 + .desc = "Sun4v platform",
  458 + .init = sun4v_init,
  459 + .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
460 }; 460 };