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

Added recent class additions to Xcode project. 

Fixed some minor issues in VS project.
Minor formatting fixes.
This commit is contained in:
Stephen Anthony 2022-04-09 12:19:18 -02:30
parent 63387c693a
commit 6b73ea60c3
6 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/debugger/gui/Cart0FA0Widget.hxx
View File

@ -24,27 +24,27 @@ class Cartridge0FA0;
class Cartridge0FA0Widget : public CartridgeEnhancedWidget class Cartridge0FA0Widget : public CartridgeEnhancedWidget
{ {
public: public:
Cartridge0FA0Widget(GuiObject* boss, const GUI::Font& lfont, Cartridge0FA0Widget(GuiObject* boss, const GUI::Font& lfont,
const GUI::Font& nfont, const GUI::Font& nfont,
int x, int y, int w, int h, int x, int y, int w, int h,
Cartridge0FA0& cart); Cartridge0FA0& cart);
~Cartridge0FA0Widget() override = default; ~Cartridge0FA0Widget() override = default;
private: private:
string manufacturer() override { return "Mania"; } string manufacturer() override { return "Mania"; }
string description() override; string description() override;
string hotspotStr(int bank, int seg, bool prefix = false) override; string hotspotStr(int bank, int seg, bool prefix = false) override;
private: private:
// Following constructors and assignment operators not supported // Following constructors and assignment operators not supported
Cartridge0FA0Widget() = delete; Cartridge0FA0Widget() = delete;
Cartridge0FA0Widget(const Cartridge0FA0Widget&) = delete; Cartridge0FA0Widget(const Cartridge0FA0Widget&) = delete;
Cartridge0FA0Widget(Cartridge0FA0Widget&&) = delete; Cartridge0FA0Widget(Cartridge0FA0Widget&&) = delete;
Cartridge0FA0Widget& operator=(const Cartridge0FA0Widget&) = delete; Cartridge0FA0Widget& operator=(const Cartridge0FA0Widget&) = delete;
Cartridge0FA0Widget& operator=(Cartridge0FA0Widget&&) = delete; Cartridge0FA0Widget& operator=(Cartridge0FA0Widget&&) = delete;
}; };
#endif #endif

16
src/emucore/Cart0FA0.cxx
View File

@ -41,13 +41,15 @@ void Cartridge0FA0::install(System& system)
// - A10, A9 and A7 are the fixed part of the hotspot address // - A10, A9 and A7 are the fixed part of the hotspot address
// - A6 and A5 determine bank // - A6 and A5 determine bank
for(uInt16 a11 = 0; a11 <= 1; ++a11) for(uInt16 a11 = 0; a11 <= 1; ++a11)
for(uInt16 a8 = 0; a8 <= 1; ++a8) {
{ for(uInt16 a8 = 0; a8 <= 1; ++a8)
const uInt16 addr = (a11 << 11) + (a8 << 8); {
const uInt16 addr = (a11 << 11) + (a8 << 8);
mySystem->setPageAccess(0x06a0 | addr, access); mySystem->setPageAccess(0x06a0 | addr, access);
mySystem->setPageAccess(0x06c0 | addr, access); mySystem->setPageAccess(0x06c0 | addr, access);
} }
}
// Install pages for the startup bank // Install pages for the startup bank
bank(startBank()); bank(startBank());
} }
@ -74,7 +76,7 @@ bool Cartridge0FA0::checkSwitchBank(uInt16 address, uInt8)
return false; return false;
} }
//// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt8 Cartridge0FA0::peek(uInt16 address) uInt8 Cartridge0FA0::peek(uInt16 address)
{ {
address &= myBankMask; address &= myBankMask;

2
src/emucore/Cart0FA0.hxx
View File

@ -124,4 +124,4 @@ class Cartridge0FA0 : public CartridgeEnhanced
Cartridge0FA0& operator=(Cartridge0FA0&&) = delete; Cartridge0FA0& operator=(Cartridge0FA0&&) = delete;
}; };
#endif #endif

16
src/macos/stella.xcodeproj/project.pbxproj
View File

@ -209,6 +209,10 @@
DC0984860D3985160073C852 /* CartSB.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0984840D3985160073C852 /* CartSB.hxx */; }; DC0984860D3985160073C852 /* CartSB.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0984840D3985160073C852 /* CartSB.hxx */; };
DC0DF8690F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */; }; DC0DF8690F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */; };
DC0DF86A0F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */; }; DC0DF86A0F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */; };
DC0E98E02801CC8900097C68 /* Cart0FA0Widget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC0E98DE2801CC8900097C68 /* Cart0FA0Widget.cxx */; };
DC0E98E12801CC8900097C68 /* Cart0FA0Widget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0E98DF2801CC8900097C68 /* Cart0FA0Widget.hxx */; };
DC0E98E42801CD1600097C68 /* Cart0FA0.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC0E98E22801CD1500097C68 /* Cart0FA0.cxx */; };
DC0E98E52801CD1600097C68 /* Cart0FA0.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC0E98E32801CD1500097C68 /* Cart0FA0.hxx */; };
DC11F78D0DB36933003B505E /* MT24LC256.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC11F78B0DB36933003B505E /* MT24LC256.cxx */; }; DC11F78D0DB36933003B505E /* MT24LC256.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC11F78B0DB36933003B505E /* MT24LC256.cxx */; };
DC11F78E0DB36933003B505E /* MT24LC256.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC11F78C0DB36933003B505E /* MT24LC256.hxx */; }; DC11F78E0DB36933003B505E /* MT24LC256.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC11F78C0DB36933003B505E /* MT24LC256.hxx */; };
DC13B53F176FF2F500B8B4BB /* RomListSettings.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC13B53D176FF2F500B8B4BB /* RomListSettings.cxx */; }; DC13B53F176FF2F500B8B4BB /* RomListSettings.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC13B53D176FF2F500B8B4BB /* RomListSettings.cxx */; };
@ -1031,6 +1035,10 @@
DC0984840D3985160073C852 /* CartSB.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartSB.hxx; sourceTree = "<group>"; }; DC0984840D3985160073C852 /* CartSB.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = CartSB.hxx; sourceTree = "<group>"; };
DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlobalPropsDialog.cxx; sourceTree = "<group>"; }; DC0DF8670F0DAAF500B0F1F3 /* GlobalPropsDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GlobalPropsDialog.cxx; sourceTree = "<group>"; };
DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GlobalPropsDialog.hxx; sourceTree = "<group>"; }; DC0DF8680F0DAAF500B0F1F3 /* GlobalPropsDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = GlobalPropsDialog.hxx; sourceTree = "<group>"; };
DC0E98DE2801CC8900097C68 /* Cart0FA0Widget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cart0FA0Widget.cxx; sourceTree = "<group>"; };
DC0E98DF2801CC8900097C68 /* Cart0FA0Widget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cart0FA0Widget.hxx; sourceTree = "<group>"; };
DC0E98E22801CD1500097C68 /* Cart0FA0.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Cart0FA0.cxx; sourceTree = "<group>"; };
DC0E98E32801CD1500097C68 /* Cart0FA0.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Cart0FA0.hxx; sourceTree = "<group>"; };
DC11F78B0DB36933003B505E /* MT24LC256.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MT24LC256.cxx; sourceTree = "<group>"; }; DC11F78B0DB36933003B505E /* MT24LC256.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = MT24LC256.cxx; sourceTree = "<group>"; };
DC11F78C0DB36933003B505E /* MT24LC256.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = MT24LC256.hxx; sourceTree = "<group>"; }; DC11F78C0DB36933003B505E /* MT24LC256.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = MT24LC256.hxx; sourceTree = "<group>"; };
DC13B53D176FF2F500B8B4BB /* RomListSettings.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RomListSettings.cxx; sourceTree = "<group>"; }; DC13B53D176FF2F500B8B4BB /* RomListSettings.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RomListSettings.cxx; sourceTree = "<group>"; };
@ -1717,6 +1725,8 @@
2D2331900900B5EF00613B1F /* AudioWidget.hxx */, 2D2331900900B5EF00613B1F /* AudioWidget.hxx */,
DCCF4ACE14B7E6C300814FAB /* BoosterWidget.cxx */, DCCF4ACE14B7E6C300814FAB /* BoosterWidget.cxx */,
DCCF4ACF14B7E6C300814FAB /* BoosterWidget.hxx */, DCCF4ACF14B7E6C300814FAB /* BoosterWidget.hxx */,
DC0E98DE2801CC8900097C68 /* Cart0FA0Widget.cxx */,
DC0E98DF2801CC8900097C68 /* Cart0FA0Widget.hxx */,
DCAAE5B21715887B0080BB82 /* Cart2KWidget.cxx */, DCAAE5B21715887B0080BB82 /* Cart2KWidget.cxx */,
DCAAE5B31715887B0080BB82 /* Cart2KWidget.hxx */, DCAAE5B31715887B0080BB82 /* Cart2KWidget.hxx */,
DCBDDE981D6A5F0E009DF1E9 /* Cart3EPlusWidget.cxx */, DCBDDE981D6A5F0E009DF1E9 /* Cart3EPlusWidget.cxx */,
@ -1991,6 +2001,8 @@
2DE2DF110627AE07006BEC99 /* Booster.hxx */, 2DE2DF110627AE07006BEC99 /* Booster.hxx */,
2DE2DF120627AE07006BEC99 /* Cart.cxx */, 2DE2DF120627AE07006BEC99 /* Cart.cxx */,
2DE2DF130627AE07006BEC99 /* Cart.hxx */, 2DE2DF130627AE07006BEC99 /* Cart.hxx */,
DC0E98E22801CD1500097C68 /* Cart0FA0.cxx */,
DC0E98E32801CD1500097C68 /* Cart0FA0.hxx */,
2DE2DF140627AE07006BEC99 /* Cart2K.cxx */, 2DE2DF140627AE07006BEC99 /* Cart2K.cxx */,
2DE2DF150627AE07006BEC99 /* Cart2K.hxx */, 2DE2DF150627AE07006BEC99 /* Cart2K.hxx */,
2D9555D90880E78000466554 /* Cart3E.cxx */, 2D9555D90880E78000466554 /* Cart3E.cxx */,
@ -2755,6 +2767,7 @@
DC22F1352507D24E00AB43E9 /* QuadTariDialog.hxx in Headers */, DC22F1352507D24E00AB43E9 /* QuadTariDialog.hxx in Headers */,
2D91745309BA90380026E9FF /* CommandMenu.hxx in Headers */, 2D91745309BA90380026E9FF /* CommandMenu.hxx in Headers */,
E0306E111F93E916003DDD52 /* JitterEmulation.hxx in Headers */, E0306E111F93E916003DDD52 /* JitterEmulation.hxx in Headers */,
DC0E98E52801CD1600097C68 /* Cart0FA0.hxx in Headers */,
DC1E474F24D34F3B0047E61A /* WhatsNewDialog.hxx in Headers */, DC1E474F24D34F3B0047E61A /* WhatsNewDialog.hxx in Headers */,
2D91745509BA90380026E9FF /* CpuWidget.hxx in Headers */, 2D91745509BA90380026E9FF /* CpuWidget.hxx in Headers */,
2D91745609BA90380026E9FF /* DataGridOpsWidget.hxx in Headers */, 2D91745609BA90380026E9FF /* DataGridOpsWidget.hxx in Headers */,
@ -2767,6 +2780,7 @@
DC2C5EDB1F8F2403007D2A09 /* smartmod.hxx in Headers */, DC2C5EDB1F8F2403007D2A09 /* smartmod.hxx in Headers */,
DC2ABA69259D466C007E57D3 /* CompositeKeyValueRepositoryNoop.hxx in Headers */, DC2ABA69259D466C007E57D3 /* CompositeKeyValueRepositoryNoop.hxx in Headers */,
DCE5CDE41BA10024005CD08A /* RiotRamWidget.hxx in Headers */, DCE5CDE41BA10024005CD08A /* RiotRamWidget.hxx in Headers */,
DC0E98E12801CC8900097C68 /* Cart0FA0Widget.hxx in Headers */,
DCBD31E82299ADB400567357 /* KeyMap.hxx in Headers */, DCBD31E82299ADB400567357 /* KeyMap.hxx in Headers */,
DCF3A6E81DFC75E3008A8AF3 /* Background.hxx in Headers */, DCF3A6E81DFC75E3008A8AF3 /* Background.hxx in Headers */,
DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */, DC21E5C021CA903E007D0E1A /* OSystemMACOS.hxx in Headers */,
@ -3292,6 +3306,7 @@
DCE3BBF90C95CEDC00A671DF /* RomInfoWidget.cxx in Sources */, DCE3BBF90C95CEDC00A671DF /* RomInfoWidget.cxx in Sources */,
DC2ABA62259BD56F007E57D3 /* AbstractKeyValueRepositorySqlite.cxx in Sources */, DC2ABA62259BD56F007E57D3 /* AbstractKeyValueRepositorySqlite.cxx in Sources */,
DC0984850D3985160073C852 /* CartSB.cxx in Sources */, DC0984850D3985160073C852 /* CartSB.cxx in Sources */,
DC0E98E02801CC8900097C68 /* Cart0FA0Widget.cxx in Sources */,
DC3EE8651E2C0E6D00905161 /* inflate.c in Sources */, DC3EE8651E2C0E6D00905161 /* inflate.c in Sources */,
DC6D39871A3CE65000171E71 /* CartWDWidget.cxx in Sources */, DC6D39871A3CE65000171E71 /* CartWDWidget.cxx in Sources */,
DCA23AE90D75B22500F77B33 /* CartX07.cxx in Sources */, DCA23AE90D75B22500F77B33 /* CartX07.cxx in Sources */,
@ -3370,6 +3385,7 @@
DC1BC6662066B4390076F74A /* PKeyboardHandler.cxx in Sources */, DC1BC6662066B4390076F74A /* PKeyboardHandler.cxx in Sources */,
DC6C726213CDEA0A008A5975 /* LoggerDialog.cxx in Sources */, DC6C726213CDEA0A008A5975 /* LoggerDialog.cxx in Sources */,
DC8C1BAD14B25DE7006440EE /* CartCM.cxx in Sources */, DC8C1BAD14B25DE7006440EE /* CartCM.cxx in Sources */,
DC0E98E42801CD1600097C68 /* Cart0FA0.cxx in Sources */,
DCDDEAC61F5DBF0400C67366 /* StateManager.cxx in Sources */, DCDDEAC61F5DBF0400C67366 /* StateManager.cxx in Sources */,
DC8C1BAF14B25DE7006440EE /* CompuMate.cxx in Sources */, DC8C1BAF14B25DE7006440EE /* CompuMate.cxx in Sources */,
E09F4142201E9050004A3391 /* Audio.cxx in Sources */, E09F4142201E9050004A3391 /* Audio.cxx in Sources */,

1
src/windows/Stella.vcxproj
View File

@ -2068,7 +2068,6 @@
<ClInclude Include="..\emucore\CartFC.hxx" /> <ClInclude Include="..\emucore\CartFC.hxx" />
<ClInclude Include="..\emucore\CartMDM.hxx" /> <ClInclude Include="..\emucore\CartMDM.hxx" />
<ClInclude Include="..\emucore\CartMVC.hxx" /> <ClInclude Include="..\emucore\CartMVC.hxx" />
<ClInclude Include="..\emucore\Cart0FA0Widget.hxx" />
<ClInclude Include="..\emucore\CartTVBoy.hxx" /> <ClInclude Include="..\emucore\CartTVBoy.hxx" />
<ClInclude Include="..\emucore\CartWD.hxx" /> <ClInclude Include="..\emucore\CartWD.hxx" />
<ClInclude Include="..\emucore\CompuMate.hxx" /> <ClInclude Include="..\emucore\CompuMate.hxx" />

3
src/windows/Stella.vcxproj.filters
View File

@ -2351,9 +2351,6 @@
<ClInclude Include="..\emucore\Cart0FA0.hxx"> <ClInclude Include="..\emucore\Cart0FA0.hxx">
<Filter>Header Files\emucore</Filter> <Filter>Header Files\emucore</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\emucore\Cart0FA0Widget.hxx">
<Filter>Header Files\debugger</Filter>
</ClInclude>
<ClInclude Include="..\debugger\gui\Cart0FA0Widget.hxx"> <ClInclude Include="..\debugger\gui\Cart0FA0Widget.hxx">
<Filter>Header Files\debugger</Filter> <Filter>Header Files\debugger</Filter>
</ClInclude> </ClInclude>