From: Toni Wilen <twilen@winuae.net>
Date: Sat, 28 May 2016 15:05:36 +0000 (+0300)
Subject: Skip new trap system tests if no uaeboard.
X-Git-Tag: 3300~13
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=56d34d5f237e5de959ae7243e1528c8857192259;p=francis%2Fwinuae.git

Skip new trap system tests if no uaeboard.
---

diff --git a/autoconf.cpp b/autoconf.cpp
index 68b24683..44f0a9a7 100644
--- a/autoconf.cpp
+++ b/autoconf.cpp
@@ -54,6 +54,8 @@ addrbank rtarea_bank = {
 
 static void hwtrap_check_int(void)
 {
+	if (currprefs.uaeboard < 2)
+		return;
 	if (hwtrap_waiting == 0) {
 		atomic_and(&uae_int_requested, ~0x2000);
 	} else {
@@ -92,18 +94,24 @@ bool rethink_traps(void)
 
 static bool rtarea_trap_data(uaecptr addr)
 {
+	if (currprefs.uaeboard < 2)
+		return false;
 	if (addr >= RTAREA_TRAP_DATA && addr < RTAREA_TRAP_DATA + (RTAREA_TRAP_DATA_NUM + RTAREA_TRAP_DATA_SEND_NUM) * RTAREA_TRAP_DATA_SLOT_SIZE)
 		return true;
 	return false;
 }
 static bool rtarea_trap_status(uaecptr addr)
 {
+	if (currprefs.uaeboard < 2)
+		return false;
 	if (addr >= RTAREA_TRAP_STATUS && addr < RTAREA_TRAP_STATUS + (RTAREA_TRAP_DATA_NUM + RTAREA_TRAP_DATA_SEND_NUM) * RTAREA_TRAP_STATUS_SIZE)
 		return true;
 	return false;
 }
 static bool rtarea_trap_status_extra(uaecptr addr)
 {
+	if (currprefs.uaeboard < 2)
+		return false;
 	if (addr >= RTAREA_TRAP_STATUS + 0x100 && addr < RTAREA_TRAP_STATUS + 0x100 + (RTAREA_TRAP_DATA_NUM + RTAREA_TRAP_DATA_SEND_NUM) * RTAREA_TRAP_STATUS_SIZE)
 		return true;
 	return false;