Revision 8d11df9e hw/pc.c

b/hw/pc.c
314 314

  
315 315
#define NE2000_NB_MAX 6
316 316

  
317
static uint32_t ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 };
317
static int ne2000_io[NE2000_NB_MAX] = { 0x300, 0x320, 0x340, 0x360, 0x280, 0x380 };
318 318
static int ne2000_irq[NE2000_NB_MAX] = { 9, 10, 11, 3, 4, 5 };
319 319

  
320
static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 };
321
static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 };
322

  
320 323
/* PC hardware initialisation */
321 324
void pc_init(int ram_size, int vga_ram_size, int boot_device,
322 325
             DisplayState *ds, const char **fd_filename, int snapshot,
......
471 474
    pic_init();
472 475
    pit = pit_init(0x40, 0);
473 476

  
474
    serial_init(0x3f8, 4, serial_hd);
477
    for(i = 0; i < MAX_SERIAL_PORTS; i++) {
478
        if (serial_hds[i]) {
479
            serial_init(serial_io[i], serial_irq[i], serial_hds[i]);
480
        }
481
    }
475 482

  
476 483
    if (pci_enabled) {
477 484
        for(i = 0; i < nb_nics; i++) {

Also available in: Unified diff