Revision 3023f332 hw/sun4m.c

b/hw/sun4m.c
423 423

  
424 424
static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
425 425
                          const char *boot_device,
426
                          DisplayState *ds, const char *kernel_filename,
426
                          const char *kernel_filename,
427 427
                          const char *kernel_cmdline,
428 428
                          const char *initrd_filename, const char *cpu_model)
429 429

  
......
533 533
        exit (1);
534 534
    }
535 535
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
536
    tcx_init(ds, hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
536
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
537 537
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
538 538

  
539 539
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
......
978 978

  
979 979
/* SPARCstation 5 hardware initialisation */
980 980
static void ss5_init(ram_addr_t RAM_size, int vga_ram_size,
981
                     const char *boot_device, DisplayState *ds,
981
                     const char *boot_device,
982 982
                     const char *kernel_filename, const char *kernel_cmdline,
983 983
                     const char *initrd_filename, const char *cpu_model)
984 984
{
985
    sun4m_hw_init(&sun4m_hwdefs[0], RAM_size, boot_device, ds, kernel_filename,
985
    sun4m_hw_init(&sun4m_hwdefs[0], RAM_size, boot_device, kernel_filename,
986 986
                  kernel_cmdline, initrd_filename, cpu_model);
987 987
}
988 988

  
989 989
/* SPARCstation 10 hardware initialisation */
990 990
static void ss10_init(ram_addr_t RAM_size, int vga_ram_size,
991
                      const char *boot_device, DisplayState *ds,
991
                      const char *boot_device,
992 992
                      const char *kernel_filename, const char *kernel_cmdline,
993 993
                      const char *initrd_filename, const char *cpu_model)
994 994
{
995
    sun4m_hw_init(&sun4m_hwdefs[1], RAM_size, boot_device, ds, kernel_filename,
995
    sun4m_hw_init(&sun4m_hwdefs[1], RAM_size, boot_device, kernel_filename,
996 996
                  kernel_cmdline, initrd_filename, cpu_model);
997 997
}
998 998

  
999 999
/* SPARCserver 600MP hardware initialisation */
1000 1000
static void ss600mp_init(ram_addr_t RAM_size, int vga_ram_size,
1001
                         const char *boot_device, DisplayState *ds,
1001
                         const char *boot_device,
1002 1002
                         const char *kernel_filename,
1003 1003
                         const char *kernel_cmdline,
1004 1004
                         const char *initrd_filename, const char *cpu_model)
1005 1005
{
1006
    sun4m_hw_init(&sun4m_hwdefs[2], RAM_size, boot_device, ds, kernel_filename,
1006
    sun4m_hw_init(&sun4m_hwdefs[2], RAM_size, boot_device, kernel_filename,
1007 1007
                  kernel_cmdline, initrd_filename, cpu_model);
1008 1008
}
1009 1009

  
1010 1010
/* SPARCstation 20 hardware initialisation */
1011 1011
static void ss20_init(ram_addr_t RAM_size, int vga_ram_size,
1012
                      const char *boot_device, DisplayState *ds,
1012
                      const char *boot_device,
1013 1013
                      const char *kernel_filename, const char *kernel_cmdline,
1014 1014
                      const char *initrd_filename, const char *cpu_model)
1015 1015
{
1016
    sun4m_hw_init(&sun4m_hwdefs[3], RAM_size, boot_device, ds, kernel_filename,
1016
    sun4m_hw_init(&sun4m_hwdefs[3], RAM_size, boot_device, kernel_filename,
1017 1017
                  kernel_cmdline, initrd_filename, cpu_model);
1018 1018
}
1019 1019

  
1020 1020
/* SPARCstation Voyager hardware initialisation */
1021 1021
static void vger_init(ram_addr_t RAM_size, int vga_ram_size,
1022
                      const char *boot_device, DisplayState *ds,
1022
                      const char *boot_device,
1023 1023
                      const char *kernel_filename, const char *kernel_cmdline,
1024 1024
                      const char *initrd_filename, const char *cpu_model)
1025 1025
{
1026
    sun4m_hw_init(&sun4m_hwdefs[4], RAM_size, boot_device, ds, kernel_filename,
1026
    sun4m_hw_init(&sun4m_hwdefs[4], RAM_size, boot_device, kernel_filename,
1027 1027
                  kernel_cmdline, initrd_filename, cpu_model);
1028 1028
}
1029 1029

  
1030 1030
/* SPARCstation LX hardware initialisation */
1031 1031
static void ss_lx_init(ram_addr_t RAM_size, int vga_ram_size,
1032
                       const char *boot_device, DisplayState *ds,
1032
                       const char *boot_device,
1033 1033
                       const char *kernel_filename, const char *kernel_cmdline,
1034 1034
                       const char *initrd_filename, const char *cpu_model)
1035 1035
{
1036
    sun4m_hw_init(&sun4m_hwdefs[5], RAM_size, boot_device, ds, kernel_filename,
1036
    sun4m_hw_init(&sun4m_hwdefs[5], RAM_size, boot_device, kernel_filename,
1037 1037
                  kernel_cmdline, initrd_filename, cpu_model);
1038 1038
}
1039 1039

  
1040 1040
/* SPARCstation 4 hardware initialisation */
1041 1041
static void ss4_init(ram_addr_t RAM_size, int vga_ram_size,
1042
                     const char *boot_device, DisplayState *ds,
1042
                     const char *boot_device,
1043 1043
                     const char *kernel_filename, const char *kernel_cmdline,
1044 1044
                     const char *initrd_filename, const char *cpu_model)
1045 1045
{
1046
    sun4m_hw_init(&sun4m_hwdefs[6], RAM_size, boot_device, ds, kernel_filename,
1046
    sun4m_hw_init(&sun4m_hwdefs[6], RAM_size, boot_device, kernel_filename,
1047 1047
                  kernel_cmdline, initrd_filename, cpu_model);
1048 1048
}
1049 1049

  
1050 1050
/* SPARCClassic hardware initialisation */
1051 1051
static void scls_init(ram_addr_t RAM_size, int vga_ram_size,
1052
                      const char *boot_device, DisplayState *ds,
1052
                      const char *boot_device,
1053 1053
                      const char *kernel_filename, const char *kernel_cmdline,
1054 1054
                      const char *initrd_filename, const char *cpu_model)
1055 1055
{
1056
    sun4m_hw_init(&sun4m_hwdefs[7], RAM_size, boot_device, ds, kernel_filename,
1056
    sun4m_hw_init(&sun4m_hwdefs[7], RAM_size, boot_device, kernel_filename,
1057 1057
                  kernel_cmdline, initrd_filename, cpu_model);
1058 1058
}
1059 1059

  
1060 1060
/* SPARCbook hardware initialisation */
1061 1061
static void sbook_init(ram_addr_t RAM_size, int vga_ram_size,
1062
                       const char *boot_device, DisplayState *ds,
1062
                       const char *boot_device,
1063 1063
                       const char *kernel_filename, const char *kernel_cmdline,
1064 1064
                       const char *initrd_filename, const char *cpu_model)
1065 1065
{
1066
    sun4m_hw_init(&sun4m_hwdefs[8], RAM_size, boot_device, ds, kernel_filename,
1066
    sun4m_hw_init(&sun4m_hwdefs[8], RAM_size, boot_device, kernel_filename,
1067 1067
                  kernel_cmdline, initrd_filename, cpu_model);
1068 1068
}
1069 1069

  
......
1224 1224

  
1225 1225
static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,
1226 1226
                          const char *boot_device,
1227
                          DisplayState *ds, const char *kernel_filename,
1227
                          const char *kernel_filename,
1228 1228
                          const char *kernel_cmdline,
1229 1229
                          const char *initrd_filename, const char *cpu_model)
1230 1230
{
......
1316 1316
        exit (1);
1317 1317
    }
1318 1318
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
1319
    tcx_init(ds, hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1319
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1320 1320
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
1321 1321

  
1322 1322
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
......
1366 1366

  
1367 1367
/* SPARCserver 1000 hardware initialisation */
1368 1368
static void ss1000_init(ram_addr_t RAM_size, int vga_ram_size,
1369
                        const char *boot_device, DisplayState *ds,
1369
                        const char *boot_device,
1370 1370
                        const char *kernel_filename, const char *kernel_cmdline,
1371 1371
                        const char *initrd_filename, const char *cpu_model)
1372 1372
{
1373
    sun4d_hw_init(&sun4d_hwdefs[0], RAM_size, boot_device, ds, kernel_filename,
1373
    sun4d_hw_init(&sun4d_hwdefs[0], RAM_size, boot_device, kernel_filename,
1374 1374
                  kernel_cmdline, initrd_filename, cpu_model);
1375 1375
}
1376 1376

  
1377 1377
/* SPARCcenter 2000 hardware initialisation */
1378 1378
static void ss2000_init(ram_addr_t RAM_size, int vga_ram_size,
1379
                        const char *boot_device, DisplayState *ds,
1379
                        const char *boot_device,
1380 1380
                        const char *kernel_filename, const char *kernel_cmdline,
1381 1381
                        const char *initrd_filename, const char *cpu_model)
1382 1382
{
1383
    sun4d_hw_init(&sun4d_hwdefs[1], RAM_size, boot_device, ds, kernel_filename,
1383
    sun4d_hw_init(&sun4d_hwdefs[1], RAM_size, boot_device, kernel_filename,
1384 1384
                  kernel_cmdline, initrd_filename, cpu_model);
1385 1385
}
1386 1386

  
......
1439 1439

  
1440 1440
static void sun4c_hw_init(const struct sun4c_hwdef *hwdef, ram_addr_t RAM_size,
1441 1441
                          const char *boot_device,
1442
                          DisplayState *ds, const char *kernel_filename,
1442
                          const char *kernel_filename,
1443 1443
                          const char *kernel_cmdline,
1444 1444
                          const char *initrd_filename, const char *cpu_model)
1445 1445
{
......
1522 1522
        exit (1);
1523 1523
    }
1524 1524
    tcx_offset = qemu_ram_alloc(hwdef->vram_size);
1525
    tcx_init(ds, hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1525
    tcx_init(hwdef->tcx_base, phys_ram_base + tcx_offset, tcx_offset,
1526 1526
             hwdef->vram_size, graphic_width, graphic_height, graphic_depth);
1527 1527

  
1528 1528
    lance_init(&nd_table[0], hwdef->le_base, ledma, *ledma_irq, le_reset);
......
1584 1584

  
1585 1585
/* SPARCstation 2 hardware initialisation */
1586 1586
static void ss2_init(ram_addr_t RAM_size, int vga_ram_size,
1587
                     const char *boot_device, DisplayState *ds,
1587
                     const char *boot_device,
1588 1588
                     const char *kernel_filename, const char *kernel_cmdline,
1589 1589
                     const char *initrd_filename, const char *cpu_model)
1590 1590
{
1591
    sun4c_hw_init(&sun4c_hwdefs[0], RAM_size, boot_device, ds, kernel_filename,
1591
    sun4c_hw_init(&sun4c_hwdefs[0], RAM_size, boot_device, kernel_filename,
1592 1592
                  kernel_cmdline, initrd_filename, cpu_model);
1593 1593
}
1594 1594

  

Also available in: Unified diff