Use C99 initializers
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4996 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
		
							parent
							
								
									53e656001a
								
							
						
					
					
						commit
						66de733bdb
					
				
							
								
								
									
										96
									
								
								hw/sun4m.c
									
									
									
									
									
								
							
							
						
						
									
										96
									
								
								hw/sun4m.c
									
									
									
									
									
								
							@ -1238,73 +1238,73 @@ static void sbook_init(ram_addr_t RAM_size, int vga_ram_size,
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss5_machine = {
 | 
					QEMUMachine ss5_machine = {
 | 
				
			||||||
    "SS-5",
 | 
					    .name = "SS-5",
 | 
				
			||||||
    "Sun4m platform, SPARCstation 5",
 | 
					    .desc = "Sun4m platform, SPARCstation 5",
 | 
				
			||||||
    ss5_init,
 | 
					    .init = ss5_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss10_machine = {
 | 
					QEMUMachine ss10_machine = {
 | 
				
			||||||
    "SS-10",
 | 
					    .name = "SS-10",
 | 
				
			||||||
    "Sun4m platform, SPARCstation 10",
 | 
					    .desc = "Sun4m platform, SPARCstation 10",
 | 
				
			||||||
    ss10_init,
 | 
					    .init = ss10_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss600mp_machine = {
 | 
					QEMUMachine ss600mp_machine = {
 | 
				
			||||||
    "SS-600MP",
 | 
					    .name = "SS-600MP",
 | 
				
			||||||
    "Sun4m platform, SPARCserver 600MP",
 | 
					    .desc = "Sun4m platform, SPARCserver 600MP",
 | 
				
			||||||
    ss600mp_init,
 | 
					    .init = ss600mp_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss20_machine = {
 | 
					QEMUMachine ss20_machine = {
 | 
				
			||||||
    "SS-20",
 | 
					    .name = "SS-20",
 | 
				
			||||||
    "Sun4m platform, SPARCstation 20",
 | 
					    .desc = "Sun4m platform, SPARCstation 20",
 | 
				
			||||||
    ss20_init,
 | 
					    .init = ss20_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss2_machine = {
 | 
					QEMUMachine ss2_machine = {
 | 
				
			||||||
    "SS-2",
 | 
					    .name = "SS-2",
 | 
				
			||||||
    "Sun4c platform, SPARCstation 2",
 | 
					    .desc = "Sun4c platform, SPARCstation 2",
 | 
				
			||||||
    ss2_init,
 | 
					    .init = ss2_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine voyager_machine = {
 | 
					QEMUMachine voyager_machine = {
 | 
				
			||||||
    "Voyager",
 | 
					    .name = "Voyager",
 | 
				
			||||||
    "Sun4m platform, SPARCstation Voyager",
 | 
					    .desc = "Sun4m platform, SPARCstation Voyager",
 | 
				
			||||||
    vger_init,
 | 
					    .init = vger_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss_lx_machine = {
 | 
					QEMUMachine ss_lx_machine = {
 | 
				
			||||||
    "LX",
 | 
					    .name = "LX",
 | 
				
			||||||
    "Sun4m platform, SPARCstation LX",
 | 
					    .desc = "Sun4m platform, SPARCstation LX",
 | 
				
			||||||
    ss_lx_init,
 | 
					    .init = ss_lx_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss4_machine = {
 | 
					QEMUMachine ss4_machine = {
 | 
				
			||||||
    "SS-4",
 | 
					    .name = "SS-4",
 | 
				
			||||||
    "Sun4m platform, SPARCstation 4",
 | 
					    .desc = "Sun4m platform, SPARCstation 4",
 | 
				
			||||||
    ss4_init,
 | 
					    .init = ss4_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine scls_machine = {
 | 
					QEMUMachine scls_machine = {
 | 
				
			||||||
    "SPARCClassic",
 | 
					    .name = "SPARCClassic",
 | 
				
			||||||
    "Sun4m platform, SPARCClassic",
 | 
					    .desc = "Sun4m platform, SPARCClassic",
 | 
				
			||||||
    scls_init,
 | 
					    .init = scls_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine sbook_machine = {
 | 
					QEMUMachine sbook_machine = {
 | 
				
			||||||
    "SPARCbook",
 | 
					    .name = "SPARCbook",
 | 
				
			||||||
    "Sun4m platform, SPARCbook",
 | 
					    .desc = "Sun4m platform, SPARCbook",
 | 
				
			||||||
    sbook_init,
 | 
					    .init = sbook_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct sun4d_hwdef sun4d_hwdefs[] = {
 | 
					static const struct sun4d_hwdef sun4d_hwdefs[] = {
 | 
				
			||||||
@ -1538,15 +1538,15 @@ static void ss2000_init(ram_addr_t RAM_size, int vga_ram_size,
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss1000_machine = {
 | 
					QEMUMachine ss1000_machine = {
 | 
				
			||||||
    "SS-1000",
 | 
					    .name = "SS-1000",
 | 
				
			||||||
    "Sun4d platform, SPARCserver 1000",
 | 
					    .desc = "Sun4d platform, SPARCserver 1000",
 | 
				
			||||||
    ss1000_init,
 | 
					    .init = ss1000_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine ss2000_machine = {
 | 
					QEMUMachine ss2000_machine = {
 | 
				
			||||||
    "SS-2000",
 | 
					    .name = "SS-2000",
 | 
				
			||||||
    "Sun4d platform, SPARCcenter 2000",
 | 
					    .desc = "Sun4d platform, SPARCcenter 2000",
 | 
				
			||||||
    ss2000_init,
 | 
					    .init = ss2000_init,
 | 
				
			||||||
    PROM_SIZE_MAX + TCX_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + TCX_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										16
									
								
								hw/sun4u.c
									
									
									
									
									
								
							
							
						
						
									
										16
									
								
								hw/sun4u.c
									
									
									
									
									
								
							@ -446,15 +446,15 @@ static void sun4v_init(ram_addr_t RAM_size, int vga_ram_size,
 | 
				
			|||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine sun4u_machine = {
 | 
					QEMUMachine sun4u_machine = {
 | 
				
			||||||
    "sun4u",
 | 
					    .name = "sun4u",
 | 
				
			||||||
    "Sun4u platform",
 | 
					    .desc = "Sun4u platform",
 | 
				
			||||||
    sun4u_init,
 | 
					    .init = sun4u_init,
 | 
				
			||||||
    PROM_SIZE_MAX + VGA_RAM_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QEMUMachine sun4v_machine = {
 | 
					QEMUMachine sun4v_machine = {
 | 
				
			||||||
    "sun4v",
 | 
					    .name = "sun4v",
 | 
				
			||||||
    "Sun4v platform",
 | 
					    .desc = "Sun4v platform",
 | 
				
			||||||
    sun4v_init,
 | 
					    .init = sun4v_init,
 | 
				
			||||||
    PROM_SIZE_MAX + VGA_RAM_SIZE,
 | 
					    .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user