diff --git a/Changes.txt b/Changes.txt
index 5ac11ec81..e09466f15 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -37,8 +37,8 @@
finding documentation that finally describes in more detail how the
M6532 chip actually works.
- * Added BUS and CDF bankswitching schemes, and also ARM Timer 1
- support; special thanks to SpiceWare for the code.
+ * Added BUS (experimental) and CDF bankswitching schemes, and also
+ ARM Timer 1 support; special thanks to SpiceWare for the code.
* Fixed bug with SaveKey and AtariVox not properly closing their memory
files before starting another instance of the same ROM, when the ROM
diff --git a/docs/index.html b/docs/index.html
index 4303154a7..3ae8fe5e4 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -3262,7 +3262,7 @@ Ms Pac-Man (Stella extended codes):
| AR | Supercharger |
| BF | CPUWIZ 256K |
| BFSC | CPUWIZ 256K + ram |
- | BUS | Bus Stuffing |
+ | BUS | Experimental |
| CDF | Chris, Darrell, Fred |
| CM ¹ | Spectravideo CompuMate |
| CTY ¹² | CDW - Chetiry |
diff --git a/src/debugger/gui/CartBUSWidget.cxx b/src/debugger/gui/CartBUSWidget.cxx
index 387536e97..d92f27497 100644
--- a/src/debugger/gui/CartBUSWidget.cxx
+++ b/src/debugger/gui/CartBUSWidget.cxx
@@ -30,7 +30,7 @@ CartridgeBUSWidget::CartridgeBUSWidget(
uInt16 size = 8 * 4096;
ostringstream info;
- info << "BUS Stuffing cartridge\n"
+ info << "BUS Stuffing cartridge (EXPERIMENTAL)\n"
<< "32K ROM, seven 4K banks are accessible to 2600\n"
<< "8K BUS RAM\n"
<< "BUS registers accessible @ $FFEE - $FFF3\n"
diff --git a/src/emucore/BSType.hxx b/src/emucore/BSType.hxx
index b689059d6..88b780621 100644
--- a/src/emucore/BSType.hxx
+++ b/src/emucore/BSType.hxx
@@ -22,13 +22,13 @@
// Currently supported bankswitch schemes
enum class BSType {
- _AUTO, _0840, _2IN1, _4IN1, _8IN1, _16IN1, _32IN1,
- _64IN1, _128IN1, _2K, _3E, _3EPlus, _3F, _4A50,
- _4K, _4KSC, _AR, _BF, _BFSC, _BUS, _CDF,
- _CM, _CTY, _CV, _CVPlus, _DASH, _DF, _DFSC,
- _DPC, _DPCPlus, _E0, _E7, _EF, _EFSC, _F0,
- _F4, _F4SC, _F6, _F6SC, _F8, _F8SC, _FA,
- _FA2, _FE, _MC, _MDM, _SB, _UA, _WD,
+ _AUTO, _0840, _2IN1, _4IN1, _8IN1, _16IN1, _32IN1,
+ _64IN1, _128IN1, _2K, _3E, _3EP, _3F, _4A50,
+ _4K, _4KSC, _AR, _BF, _BFSC, _BUS, _CDF,
+ _CM, _CTY, _CV, _CVP, _DASH, _DF, _DFSC,
+ _DPC, _DPCP, _E0, _E7, _EF, _EFSC, _F0,
+ _F4, _F4SC, _F6, _F6SC, _F8, _F8SC, _FA,
+ _FA2, _FE, _MC, _MDM, _SB, _UA, _WD,
_X07,
NumSchemes
};
@@ -60,7 +60,7 @@ static BSDescription BSList[int(BSType::NumSchemes)] = {
{ "AR", "AR (Supercharger)" },
{ "BF", "BF (CPUWIZ 256K)" },
{ "BFSC", "BFSC (CPUWIZ 256K + ram)" },
- { "BUS", "BUS (Bus Stuffing)" },
+ { "BUS", "BUS (Experimental)" },
{ "CDF", "CDF (Chris, Darrell, Fred)" },
{ "CM", "CM (SpectraVideo CompuMate)" },
{ "CTY", "CTY (CDW - Chetiry)" },
diff --git a/src/emucore/CartBUS.hxx b/src/emucore/CartBUS.hxx
index cba461845..9a676b16d 100644
--- a/src/emucore/CartBUS.hxx
+++ b/src/emucore/CartBUS.hxx
@@ -32,8 +32,8 @@ class System;
/**
Cartridge class used for BUS.
- THIS NEEDS TO BE UPDATED
-
+ THIS BANKSWITCHING SCHEME IS EXPERIMENTAL, AND MAY BE REMOVED
+ IN A FUTURE RELEASE.
There are seven 4K program banks, a 4K Display Data RAM,
1K C Varaible and Stack, and the BUS chip.
diff --git a/src/emucore/CartDetector.cxx b/src/emucore/CartDetector.cxx
index 24b2d02a8..2c90bd035 100644
--- a/src/emucore/CartDetector.cxx
+++ b/src/emucore/CartDetector.cxx
@@ -244,7 +244,7 @@ CartDetector::createFromImage(const BytePtr& image, uInt32 size, BSType type,
return make_ptr(image, size, osystem.settings());
case BSType::_3E:
return make_ptr(image, size, osystem.settings());
- case BSType::_3EPlus:
+ case BSType::_3EP:
return make_ptr(image, size, osystem.settings());
case BSType::_3F:
return make_ptr(image, size, osystem.settings());
@@ -266,13 +266,13 @@ CartDetector::createFromImage(const BytePtr& image, uInt32 size, BSType type,
return make_ptr(image, size, osystem);
case BSType::_CV:
return make_ptr(image, size, osystem.settings());
- case BSType::_CVPlus:
+ case BSType::_CVP:
return make_ptr(image, size, osystem.settings());
case BSType::_DASH:
return make_ptr(image, size, osystem.settings());
case BSType::_DPC:
return make_ptr(image, size, osystem.settings());
- case BSType::_DPCPlus:
+ case BSType::_DPCP:
return make_ptr(image, size, osystem.settings());
case BSType::_E0:
return make_ptr(image, size, osystem.settings());
@@ -335,7 +335,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyCVPlus(image,size))
{
- type = BSType::_CVPlus;
+ type = BSType::_CVP;
}
else if((size % 8448) == 0 || size == 6144)
{
@@ -420,7 +420,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyARM(image, size))
type = BSType::_FA2;
else /*if(isProbablyDPCplus(image, size))*/
- type = BSType::_DPCPlus;
+ type = BSType::_DPCP;
}
else if(size == 32*1024) // 32K
{
@@ -435,7 +435,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
else if (isProbablyCDF(image, size))
type = BSType::_CDF;
else if(isProbablyDPCplus(image, size))
- type = BSType::_DPCPlus;
+ type = BSType::_DPCP;
else if(isProbablyCTY(image, size))
type = BSType::_CTY;
else if(isProbablyFA2(image, size))
@@ -498,7 +498,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyDASH(image, size))
type = BSType::_DASH;
else if(isProbably3EPlus(image, size))
- type = BSType::_3EPlus;
+ type = BSType::_3EP;
else if(isProbablyMDM(image, size))
type = BSType::_MDM;