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

- fix for crash when PCINic is compiled in but no ne2k line present in conf file.

Browse Source 
Thanks to Ari Entlich
This commit is contained in:
Christophe Bothamy 2004-06-21 10:52:50 +00:00
parent b69d0f43e7
commit 28f70482f0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bochs/iodev/devices.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: devices.cc,v 1.69 2004-06-21 10:39:24 cbothamy Exp $
// $Id: devices.cc,v 1.70 2004-06-21 10:52:50 cbothamy Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -106,7 +106,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
{
unsigned i;
BX_DEBUG(("Init $Id: devices.cc,v 1.69 2004-06-21 10:39:24 cbothamy Exp $"));
BX_DEBUG(("Init $Id: devices.cc,v 1.70 2004-06-21 10:52:50 cbothamy Exp $"));
mem = newmem;
/* set no-default handlers, will be overwritten by the real default handler */
@ -173,7 +173,7 @@ bx_devices_c::init(BX_MEM_C *newmem)
pluginUnmapped->init ();
// NE2000 NIC
if (bx_options.ne2k.Opresent->get ()) {
if (bx_options.ne2k.Opresent->get ()) > {
#if BX_NE2K_SUPPORT
PLUG_load_plugin(ne2k, PLUGTYPE_OPTIONAL);
#else
@ -322,7 +322,7 @@ bx_devices_c::reset(unsigned type)
pluginPciUSBAdapter->reset(type);
#endif
#if BX_PCI_PNIC_SUPPORT
pluginPciPNicAdapter->reset(type);
if (pluginPciPNicAdapter) pluginPciPNicAdapter->reset(type);
#endif
}
#endif