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

minor merge update

This commit is contained in:
thrust26 2017-11-30 09:12:35 +01:00
parent f7f9a8a3df
commit 3fddc7fcc3
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/CartE7.cxx
View File

@ -47,7 +47,7 @@ uInt16 CartridgeE7::bankCount() const
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 CartridgeE7::romSize()
uInt32 CartridgeE7::romSize() const
{
return bankCount() * BANK_SIZE;
}

2
src/emucore/CartE7.hxx
View File

@ -74,7 +74,7 @@ class CartridgeE7 : public CartridgeMNetwork
/**
Query the size of the BS type.
*/
uInt32 romSize() override;
uInt32 romSize() const override;
/**
Check hotspots and switch bank if triggered.

2
src/emucore/CartE78K.cxx
View File

@ -47,7 +47,7 @@ uInt16 CartridgeE78K::bankCount() const
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 CartridgeE78K::romSize()
uInt32 CartridgeE78K::romSize() const
{
return bankCount() * BANK_SIZE;
}

3
src/emucore/CartE78K.hxx
View File

@ -72,7 +72,8 @@ class CartridgeE78K : public CartridgeMNetwork
/**
Query the size of the BS type.
*/
uInt32 romSize() override;
uInt32 romSize() const override;
/**
Check hotspots and switch bank if triggered.
*/

2
src/emucore/CartMNetwork.cxx
View File

@ -86,6 +86,8 @@ void CartridgeMNetwork::install(System& system)
access.codeAccessBase = &myCodeAccessBase[0x1fc0];
mySystem->setPageAccess(addr, access);
}
/*setAccess(0x1FE0 & ~System::PAGE_MASK, System::PAGE_SIZE,
0, nullptr, 0x1fc0, System::PA_NONE, 0x1fc0);*/
// Setup the second segment to always point to the last ROM slice
setAccess(0x1A00, 0x1FE0U & ~System::PAGE_MASK - 0x1A00,

2
src/emucore/CartMNetwork.hxx
View File

@ -176,7 +176,7 @@ class CartridgeMNetwork : public Cartridge
/**
Query the size of the BS type.
*/
virtual uInt32 romSize() = 0;
virtual uInt32 romSize() const = 0;
/**
Check hotspots and switch bank if triggered.