From: Toni Wilen <twilen@winuae.net>
Date: Tue, 15 May 2018 17:21:06 +0000 (+0300)
Subject: Separated Casablanca and DraCo hardware.
X-Git-Tag: 4000~57
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=0c65af191672673ec388e948e8706c5cf3767fe3;p=francis%2Fwinuae.git

Separated Casablanca and DraCo hardware.
---

diff --git a/cfgfile.cpp b/cfgfile.cpp
index aa6d70b1..b5a6b414 100644
--- a/cfgfile.cpp
+++ b/cfgfile.cpp
@@ -178,7 +178,7 @@ static const TCHAR *ksmirrortype[] = { _T("none"), _T("e0"), _T("a8+e0"), 0 };
 static const TCHAR *cscompa[] = {
 	_T("-"), _T("Generic"), _T("CDTV"), _T("CDTV-CR"), _T("CD32"), _T("A500"), _T("A500+"), _T("A600"),
 	_T("A1000"), _T("A1200"), _T("A2000"), _T("A3000"), _T("A3000T"), _T("A4000"), _T("A4000T"),
-	_T("Velvet"), _T("Casablanca"),
+	_T("Velvet"), _T("Casablanca"), _T("DraCo"),
 	NULL
 };
 static const TCHAR *qsmodes[] = {
@@ -8642,6 +8642,8 @@ int built_in_chipset_prefs (struct uae_prefs *p)
 		break;
 	case CP_CASABLANCA:
 		break;
+	case CP_DRACO:
+		break;
 	}
 	if (p->cpu_model >= 68040)
 		p->cs_bytecustomwritebug = true;
diff --git a/include/options.h b/include/options.h
index 74aa0062..0f49f3be 100644
--- a/include/options.h
+++ b/include/options.h
@@ -241,8 +241,9 @@ struct uaedev_config_data
 	int unitnum; // scsi unit number (if tape currently)
 };
 
-enum { CP_GENERIC = 1, CP_CDTV, CP_CDTVCR, CP_CD32, CP_A500, CP_A500P, CP_A600, CP_A1000,
-	CP_A1200, CP_A2000, CP_A3000, CP_A3000T, CP_A4000, CP_A4000T, CP_VELVET, CP_CASABLANCA };
+enum { CP_GENERIC = 1, CP_CDTV, CP_CDTVCR, CP_CD32, CP_A500, CP_A500P, CP_A600,
+	CP_A1000, CP_A1200, CP_A2000, CP_A3000, CP_A3000T, CP_A4000, CP_A4000T,
+	CP_VELVET, CP_CASABLANCA, CP_DRACO };
 
 #define IDE_A600A1200 1
 #define IDE_A4000 2
diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index f95dbef6..1a5733af 100644
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -6297,7 +6297,7 @@ static struct amigamodels amodels[] = {
 	{ 4, IDS_QS_MODEL_CD32 }, // "CD32"
 	{ 4, IDS_QS_MODEL_CDTV }, // "CDTV"
 	{ 4, IDS_QS_MODEL_ARCADIA }, // "Arcadia"
-	{ 1, IDS_QS_MODEL_CASABLANCA },
+	{ 1, IDS_QS_MODEL_MACROSYSTEM },
 	{ 1, IDS_QS_MODEL_UAE }, // "Expanded UAE example configuration"
 	{ -1 }
 };