From 6f4af95c14e43ad901ce4f6cb2a40d9114bb5e1e Mon Sep 17 00:00:00 2001 From: Toni Wilen Date: Sat, 3 Feb 2018 11:19:02 +0200 Subject: [PATCH] Don't enable KS 1.2 hack if boot rom force-enabled but no harddrives mounted. --- filesys.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/filesys.cpp b/filesys.cpp index d30ae45e..6c14a460 100644 --- a/filesys.cpp +++ b/filesys.cpp @@ -7387,13 +7387,15 @@ static uae_u32 REGPARAM2 filesys_diagentry (TrapContext *ctx) resaddr += 0x10; } - put_long_host(baseaddr + 0x2100, EXPANSION_explibname); - put_long_host(baseaddr + 0x2104, filesys_configdev); - put_long_host(baseaddr + 0x2108, EXPANSION_doslibname); - put_word_host(baseaddr + 0x210c, 0); - put_word_host(baseaddr + 0x210e, nr_units()); - put_word_host(baseaddr + 0x2110, 0); - put_word_host(baseaddr + 0x2112, 1 | (currprefs.uae_hide_autoconfig || currprefs.uaeboard > 1 ? 16 : 0)); + if (baseaddr) { + put_long_host(baseaddr + 0x2100, EXPANSION_explibname); + put_long_host(baseaddr + 0x2104, filesys_configdev); + put_long_host(baseaddr + 0x2108, EXPANSION_doslibname); + put_word_host(baseaddr + 0x210c, 0); + put_word_host(baseaddr + 0x210e, nr_units()); + put_word_host(baseaddr + 0x2110, 0); + put_word_host(baseaddr + 0x2112, 1 | (currprefs.uae_hide_autoconfig || currprefs.uaeboard > 1 ? 16 : 0)); + } native2amiga_startup(); @@ -7484,7 +7486,7 @@ static uae_u32 REGPARAM2 filesys_diagentry (TrapContext *ctx) putmsg_hack_filesystemtask = 0; ks12hack_deviceproc = 0; - if (KS12_BOOT_HACK && nr_units() && filesys_configdev == 0) { + if (KS12_BOOT_HACK && nr_units() && filesys_configdev == 0 && baseaddr) { resaddr_hack = resaddr; putmsg_hack_state = -1; if (uip[0].bootpri > -128) { -- 2.47.3