Merge branch 'master' of https://github.com/stella-emu/stella

src/emucore/Cart.hxx

@@ -169,8 +169,13 @@ class Cartridge : public Device
       scheme defines banks in a standard format (ie, 0 for first bank,
       1 for second, etc).  Carts which will handle their own bankswitching
       completely or non-bankswitched carts can ignore this method.
+
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    virtual bool bank(uInt16) { return false; }
+    virtual bool bank(uInt16 bank, uInt16 segment = 0) { return false; }
 
     /**
       Get the current bank for the provided address. Carts which have only
@@ -197,7 +202,6 @@ class Cartridge : public Device
     */
     virtual uInt16 romBankCount() const { return 1; }
 
-
     /**
       Query the number of RAM 'banks' supported by the cartridge.  Note that
       this information is cart-specific, where each cart basically defines

src/emucore/CartAR.cxx

@@ -392,7 +392,7 @@ void CartridgeAR::loadIntoRAM(uInt8 load)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeAR::bank(uInt16 bank)
+bool CartridgeAR::bank(uInt16 bank, uInt16)
 {
   if(!bankLocked())
     return bankConfiguration(uInt8(bank));

src/emucore/CartAR.hxx

@@ -73,9 +73,12 @@ class CartridgeAR : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartBUS.cxx

@@ -429,7 +429,7 @@ bool CartridgeBUS::poke(uInt16 address, uInt8 value)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeBUS::bank(uInt16 bank)
+bool CartridgeBUS::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartBUS.hxx

@@ -84,9 +84,12 @@ class CartridgeBUS : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartCDF.cxx

@@ -402,7 +402,7 @@ bool CartridgeCDF::poke(uInt16 address, uInt8 value)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeCDF::bank(uInt16 bank)
+bool CartridgeCDF::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartCDF.hxx

@@ -90,9 +90,12 @@ class CartridgeCDF : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-     @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartCM.cxx

@@ -98,7 +98,7 @@ uInt8 CartridgeCM::column() const
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeCM::bank(uInt16 bank)
+bool CartridgeCM::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartCM.hxx

@@ -141,9 +141,12 @@ class CartridgeCM : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartCTY.cxx

@@ -229,7 +229,7 @@ bool CartridgeCTY::poke(uInt16 address, uInt8 value)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeCTY::bank(uInt16 bank)
+bool CartridgeCTY::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartCTY.hxx

@@ -139,9 +139,12 @@ class CartridgeCTY : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartDPCPlus.cxx

@@ -591,7 +591,7 @@ bool CartridgeDPCPlus::poke(uInt16 address, uInt8 value)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeDPCPlus::bank(uInt16 bank)
+bool CartridgeDPCPlus::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartDPCPlus.hxx

@@ -86,9 +86,12 @@ class CartridgeDPCPlus : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartEnhanced.hxx

@@ -70,16 +70,7 @@ class CartridgeEnhanced : public Cartridge
 
       @return  true, if bank has changed
     */
-    virtual bool bank(uInt16 bank, uInt16 segment);
-
-    /**
-      Install pages for the specified bank in the system.
-
-      @param bank  The bank that should be installed in the system
-
-      @return  true, if bank has changed
-    */
-    bool bank(uInt16 bank) override { return this->bank(bank, 0); }
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/CartMDM.cxx

@@ -88,7 +88,7 @@ bool CartridgeMDM::poke(uInt16 address, uInt8 value)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeMDM::bank(uInt16 bank)
+bool CartridgeMDM::bank(uInt16 bank, uInt16)
 {
   if(bankLocked() || myBankingDisabled) return false;
 

src/emucore/CartMDM.hxx

@@ -73,9 +73,12 @@ class CartridgeMDM : public CartridgeEnhanced
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Save the current state of this cart to the given Serializer.

src/emucore/CartMNetwork.cxx

@@ -201,7 +201,7 @@ void CartridgeMNetwork::bankRAM(uInt16 bank)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-bool CartridgeMNetwork::bank(uInt16 bank)
+bool CartridgeMNetwork::bank(uInt16 bank, uInt16)
 {
   if(bankLocked()) return false;
 

src/emucore/CartMNetwork.hxx

@@ -94,9 +94,12 @@ class CartridgeMNetwork : public Cartridge
     /**
       Install pages for the specified bank in the system.
 
-      @param bank The bank that should be installed in the system
+      @param bank     The bank that should be installed in the system
+      @param segment  The segment the bank should be using
+
+      @return  true, if bank has changed
     */
-    bool bank(uInt16 bank) override;
+    bool bank(uInt16 bank, uInt16 segment = 0) override;
 
     /**
       Get the current bank.

src/emucore/OSystem.cxx

@@ -414,7 +414,7 @@ string OSystem::createConsole(const FilesystemNode& rom, const string& md5sum,
   }
   catch(const runtime_error& e)
   {
-    buf << "ERROR: Couldn't create console (" << e.what() << ")";
+    buf << "ERROR: " << e.what();
     Logger::error(buf.str());
     return buf.str();
   }