ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Marked BUS scheme as experimental per authors request.

This commit is contained in:
Stephen Anthony 2017-07-12 18:07:40 -02:30
parent 87c1d12d1d
commit d9f52599dc
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes.txt
View File

@ -37,8 +37,8 @@
finding documentation that finally describes in more detail how the finding documentation that finally describes in more detail how the
M6532 chip actually works. M6532 chip actually works.
* Added BUS and CDF bankswitching schemes, and also ARM Timer 1 * Added BUS (experimental) and CDF bankswitching schemes, and also
support; special thanks to SpiceWare for the code. ARM Timer 1 support; special thanks to SpiceWare for the code.
* Fixed bug with SaveKey and AtariVox not properly closing their memory * Fixed bug with SaveKey and AtariVox not properly closing their memory
files before starting another instance of the same ROM, when the ROM files before starting another instance of the same ROM, when the ROM

2
docs/index.html
View File

@ -3262,7 +3262,7 @@ Ms Pac-Man (Stella extended codes):
<tr><td>AR </td><td>Supercharger </td></tr> <tr><td>AR </td><td>Supercharger </td></tr>
<tr><td>BF </td><td>CPUWIZ 256K </td></tr> <tr><td>BF </td><td>CPUWIZ 256K </td></tr>
<tr><td>BFSC </td><td>CPUWIZ 256K + ram</td></tr> <tr><td>BFSC </td><td>CPUWIZ 256K + ram</td></tr>
<tr><td>BUS </td><td>Bus Stuffing</td></tr> <tr><td>BUS </td><td>Experimental</td></tr>
<tr><td>CDF </td><td>Chris, Darrell, Fred</td></tr> <tr><td>CDF </td><td>Chris, Darrell, Fred</td></tr>
<tr><td>CM &#185;</td><td>Spectravideo CompuMate </td></tr> <tr><td>CM &#185;</td><td>Spectravideo CompuMate </td></tr>
<tr><td>CTY &#185;&#178;</td><td>CDW - Chetiry </td></tr> <tr><td>CTY &#185;&#178;</td><td>CDW - Chetiry </td></tr>

2
src/debugger/gui/CartBUSWidget.cxx
View File

@ -30,7 +30,7 @@ CartridgeBUSWidget::CartridgeBUSWidget(
uInt16 size = 8 * 4096; uInt16 size = 8 * 4096;
ostringstream info; ostringstream info;
info << "BUS Stuffing cartridge\n" info << "BUS Stuffing cartridge (EXPERIMENTAL)\n"
<< "32K ROM, seven 4K banks are accessible to 2600\n" << "32K ROM, seven 4K banks are accessible to 2600\n"
<< "8K BUS RAM\n" << "8K BUS RAM\n"
<< "BUS registers accessible @ $FFEE - $FFF3\n" << "BUS registers accessible @ $FFEE - $FFF3\n"

8
src/emucore/BSType.hxx
View File

@ -23,10 +23,10 @@
// Currently supported bankswitch schemes // Currently supported bankswitch schemes
enum class BSType { enum class BSType {
_AUTO, _0840, _2IN1, _4IN1, _8IN1, _16IN1, _32IN1, _AUTO, _0840, _2IN1, _4IN1, _8IN1, _16IN1, _32IN1,
_64IN1, _128IN1, _2K, _3E, _3EPlus, _3F, _4A50, _64IN1, _128IN1, _2K, _3E, _3EP, _3F, _4A50,
_4K, _4KSC, _AR, _BF, _BFSC, _BUS, _CDF, _4K, _4KSC, _AR, _BF, _BFSC, _BUS, _CDF,
_CM, _CTY, _CV, _CVPlus, _DASH, _DF, _DFSC, _CM, _CTY, _CV, _CVP, _DASH, _DF, _DFSC,
_DPC, _DPCPlus, _E0, _E7, _EF, _EFSC, _F0, _DPC, _DPCP, _E0, _E7, _EF, _EFSC, _F0,
_F4, _F4SC, _F6, _F6SC, _F8, _F8SC, _FA, _F4, _F4SC, _F6, _F6SC, _F8, _F8SC, _FA,
_FA2, _FE, _MC, _MDM, _SB, _UA, _WD, _FA2, _FE, _MC, _MDM, _SB, _UA, _WD,
_X07, _X07,
@ -60,7 +60,7 @@ static BSDescription BSList[int(BSType::NumSchemes)] = {
{ "AR", "AR (Supercharger)" }, { "AR", "AR (Supercharger)" },
{ "BF", "BF (CPUWIZ 256K)" }, { "BF", "BF (CPUWIZ 256K)" },
{ "BFSC", "BFSC (CPUWIZ 256K + ram)" }, { "BFSC", "BFSC (CPUWIZ 256K + ram)" },
{ "BUS", "BUS (Bus Stuffing)" }, { "BUS", "BUS (Experimental)" },
{ "CDF", "CDF (Chris, Darrell, Fred)" }, { "CDF", "CDF (Chris, Darrell, Fred)" },
{ "CM", "CM (SpectraVideo CompuMate)" }, { "CM", "CM (SpectraVideo CompuMate)" },
{ "CTY", "CTY (CDW - Chetiry)" }, { "CTY", "CTY (CDW - Chetiry)" },

4
src/emucore/CartBUS.hxx
View File

@ -32,8 +32,8 @@ class System;
/** /**
Cartridge class used for BUS. 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, There are seven 4K program banks, a 4K Display Data RAM,
1K C Varaible and Stack, and the BUS chip. 1K C Varaible and Stack, and the BUS chip.

14
src/emucore/CartDetector.cxx
View File

@ -244,7 +244,7 @@ CartDetector::createFromImage(const BytePtr& image, uInt32 size, BSType type,
return make_ptr<Cartridge2K>(image, size, osystem.settings()); return make_ptr<Cartridge2K>(image, size, osystem.settings());
case BSType::_3E: case BSType::_3E:
return make_ptr<Cartridge3E>(image, size, osystem.settings()); return make_ptr<Cartridge3E>(image, size, osystem.settings());
case BSType::_3EPlus: case BSType::_3EP:
return make_ptr<Cartridge3EPlus>(image, size, osystem.settings()); return make_ptr<Cartridge3EPlus>(image, size, osystem.settings());
case BSType::_3F: case BSType::_3F:
return make_ptr<Cartridge3F>(image, size, osystem.settings()); return make_ptr<Cartridge3F>(image, size, osystem.settings());
@ -266,13 +266,13 @@ CartDetector::createFromImage(const BytePtr& image, uInt32 size, BSType type,
return make_ptr<CartridgeCTY>(image, size, osystem); return make_ptr<CartridgeCTY>(image, size, osystem);
case BSType::_CV: case BSType::_CV:
return make_ptr<CartridgeCV>(image, size, osystem.settings()); return make_ptr<CartridgeCV>(image, size, osystem.settings());
case BSType::_CVPlus: case BSType::_CVP:
return make_ptr<CartridgeCVPlus>(image, size, osystem.settings()); return make_ptr<CartridgeCVPlus>(image, size, osystem.settings());
case BSType::_DASH: case BSType::_DASH:
return make_ptr<CartridgeDASH>(image, size, osystem.settings()); return make_ptr<CartridgeDASH>(image, size, osystem.settings());
case BSType::_DPC: case BSType::_DPC:
return make_ptr<CartridgeDPC>(image, size, osystem.settings()); return make_ptr<CartridgeDPC>(image, size, osystem.settings());
case BSType::_DPCPlus: case BSType::_DPCP:
return make_ptr<CartridgeDPCPlus>(image, size, osystem.settings()); return make_ptr<CartridgeDPCPlus>(image, size, osystem.settings());
case BSType::_E0: case BSType::_E0:
return make_ptr<CartridgeE0>(image, size, osystem.settings()); return make_ptr<CartridgeE0>(image, size, osystem.settings());
@ -335,7 +335,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyCVPlus(image,size)) if(isProbablyCVPlus(image,size))
{ {
type = BSType::_CVPlus; type = BSType::_CVP;
} }
else if((size % 8448) == 0 || size == 6144) else if((size % 8448) == 0 || size == 6144)
{ {
@ -420,7 +420,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyARM(image, size)) if(isProbablyARM(image, size))
type = BSType::_FA2; type = BSType::_FA2;
else /*if(isProbablyDPCplus(image, size))*/ else /*if(isProbablyDPCplus(image, size))*/
type = BSType::_DPCPlus; type = BSType::_DPCP;
} }
else if(size == 32*1024) // 32K else if(size == 32*1024) // 32K
{ {
@ -435,7 +435,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
else if (isProbablyCDF(image, size)) else if (isProbablyCDF(image, size))
type = BSType::_CDF; type = BSType::_CDF;
else if(isProbablyDPCplus(image, size)) else if(isProbablyDPCplus(image, size))
type = BSType::_DPCPlus; type = BSType::_DPCP;
else if(isProbablyCTY(image, size)) else if(isProbablyCTY(image, size))
type = BSType::_CTY; type = BSType::_CTY;
else if(isProbablyFA2(image, size)) else if(isProbablyFA2(image, size))
@ -498,7 +498,7 @@ BSType CartDetector::autodetectType(const BytePtr& image, uInt32 size)
if(isProbablyDASH(image, size)) if(isProbablyDASH(image, size))
type = BSType::_DASH; type = BSType::_DASH;
else if(isProbably3EPlus(image, size)) else if(isProbably3EPlus(image, size))
type = BSType::_3EPlus; type = BSType::_3EP;
else if(isProbablyMDM(image, size)) else if(isProbablyMDM(image, size))
type = BSType::_MDM; type = BSType::_MDM;