mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- temporary PCI IRQ initialisation fixed (should be done by the PCI BIOS)

Browse Source
This commit is contained in:
Volker Ruppert 2004-09-10 11:54:46 +00:00
parent 88efb988ac
commit 11c81a46eb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/iodev/ne2k.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: ne2k.cc,v 1.67 2004-09-05 10:30:19 vruppert Exp $
// $Id: ne2k.cc,v 1.68 2004-09-10 11:54:46 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -131,7 +131,7 @@ bx_ne2k_c::reset(unsigned type)
&BX_NE2K_THIS s.base_address, &BX_NE2K_THIS s.pci_conf[0x10],
32, &ne2k_iomask[0], "NE2000 PCI NIC");
BX_NE2K_THIS s.pci_conf[0x3c] = bx_options.ne2k.Oirq->get ();
DEV_pci_init_irq(BX_NE2K_THIS s.devfunc, BX_NE2K_THIS s.pci_conf[0x3d], BX_NE2K_THIS s.base_irq);
DEV_pci_init_irq(BX_NE2K_THIS s.devfunc, BX_NE2K_THIS s.pci_conf[0x3d], bx_options.ne2k.Oirq->get ());
}
#endif
set_irq_level(0);
@ -1305,7 +1305,7 @@ bx_ne2k_c::init(void)
{
char devname[16];
BX_DEBUG(("Init $Id: ne2k.cc,v 1.67 2004-09-05 10:30:19 vruppert Exp $"));
BX_DEBUG(("Init $Id: ne2k.cc,v 1.68 2004-09-10 11:54:46 vruppert Exp $"));
// Read in values from config file
memcpy(BX_NE2K_THIS s.physaddr, bx_options.ne2k.Omacaddr->getptr (), 6);