From f1f7220187fb5f648ade9339c78973dd04b02b8d Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sun, 7 May 2017 15:03:20 +0300 Subject: [PATCH] x86 bridge NE2000 crash fix. --- qemuvga/ne2000.cpp | 2 +- x86.cpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qemuvga/ne2000.cpp b/qemuvga/ne2000.cpp index 406192f2..3efbc348 100644 --- a/qemuvga/ne2000.cpp +++ b/qemuvga/ne2000.cpp @@ -1332,7 +1332,7 @@ static bool ne2000_init_2(struct pci_board_state *pcibs, int romtype, const TCHA static bool ne2000_init(struct pci_board_state *pcibs, struct autoconfig_info *aci) { - return ne2000_init_2(pcibs, ROMTYPE_NE2KPCI, aci->rc->configtext); + return ne2000_init_2(pcibs, ROMTYPE_NE2KPCI, aci && aci->rc ? aci->rc->configtext : NULL); } static const struct pci_config ne2000_pci_config = diff --git a/x86.cpp b/x86.cpp index af99fb4c..f1380666 100644 --- a/x86.cpp +++ b/x86.cpp @@ -3462,7 +3462,10 @@ bool x86_bridge_init(struct autoconfig_info *aci, uae_u32 romtype, int type) xb->ne2000_irq = 15; break; } - if (xb->ne2000_isa->init(xb->ne2000_isa_board_state, NULL)) { + struct romconfig *rc = get_device_romconfig(&currprefs, ROMTYPE_NE2KISA, 0); + struct autoconfig_info aci = { 0 }; + aci.rc = rc; + if (xb->ne2000_isa->init(xb->ne2000_isa_board_state, &aci)) { write_log(_T("NE2000 ISA configured, IO=%3X, IRQ=%d\n"), xb->ne2000_io, xb->ne2000_irq); } else { xb->ne2000_isa = NULL; -- 2.47.3