Updated PR 1123 for style changes.

Author: sa666666

docs/index.html

@@ -5106,8 +5106,9 @@ <h3><a name="EmulationProps"><b>Emulation Properties</b></a></h3>
         <tr><td>E0 </td><td>8K Parker Bros </td><td>.E0 </td></tr>
         <tr><td>E7 </td><td>8-16K M Network </td><td>.E7 .E78, .E78K</td></tr>
         <tr><td>EF </td><td>64K Homestar Runner </td><td>.EF </td></tr>
+        <tr><td>EFF </td><td>64K+2Kee/Grizzards</td><td>.EFF </td></tr>
         <tr><td>EFSC </td><td>64K Homestar Runner + RAM</td><td>.EFS, .EFSC </td></tr>
-		<tr><td>ELF </td><td>Mattress Monkeys, ARM based</td><td>.ELF </td></tr>
+		    <tr><td>ELF </td><td>Mattress Monkeys, ARM based</td><td>.ELF </td></tr>
         <tr><td>F0 </td><td>Dynacom Megaboy </td><td>.F0 </td></tr>
         <tr><td>F4 </td><td>32K Atari </td><td>.F4 </td></tr>
         <tr><td>F4SC </td><td>32K Atari + RAM </td><td>.F4S, .F4SC </td></tr>
@@ -5119,8 +5120,8 @@ <h3><a name="EmulationProps"><b>Emulation Properties</b></a></h3>
         <tr><td>FA2 </td><td>CBS RAM Plus 24/28K </td><td>.FA2 </td></tr>
         <tr><td>FC </td><td>Amiga Power Play Aracde 16/32K </td><td>.FC </td></tr>
         <tr><td>FE </td><td>8K Activision (aka SCABS)</td><td>.FE </td></tr>
-		<tr><td>GL &#178;</td><td>4 or 6K GameLine Master Module</td><td>.GL </td></tr>
-		<tr><td>JANE </td><td>16K Coleco (Tarzan) </td><td>.JAN, .JANE </td></tr>
+		    <tr><td>GL &#178;</td><td>4 or 6K GameLine Master Module</td><td>.GL </td></tr>
+		    <tr><td>JANE </td><td>16K Coleco (Tarzan) </td><td>.JAN, .JANE </td></tr>
         <tr><td>MDM </td><td>Menu Driven Megacart </td><td>.MDM </td></tr>
         <tr><td>MVC </td><td>Movie Cart</td><td>.MVC </td></tr>
         <tr><td>SB </td><td>128-256K SUPERbanking </td><td>.SB </td></tr>

src/emucore/CartDetector.hxx

@@ -177,12 +177,12 @@ class CartDetector
     static bool isProbablyE7(const ByteBuffer& image, size_t size);
 
     /**
-    Returns true if the image is probably a E78K bankswitching cartridge
+      Returns true if the image is probably a E78K bankswitching cartridge
     */
     static bool isProbablyE78K(const ByteBuffer& image, size_t size);
 
     /**
-    Returns true (and sets “type”) if the image is probably an EF/EFSC bankswitching cartridge
+      Returns true (and sets “type”) if the image is probably an EF/EFSC bankswitching cartridge
     */
     static bool isProbablyEF(const ByteBuffer& image, size_t size, Bankswitch::Type& type);
 
@@ -191,7 +191,7 @@ class CartDetector
        bankswitching+eeprom cartridge
      */
     static bool isProbablyEFF(const ByteBuffer& image, size_t size, Bankswitch::Type& type);
-  
+
     /**
       Returns true if the image is probably an F6 bankswitching cartridge
     */

src/emucore/CartEFF.cxx

@@ -61,86 +61,97 @@ string CartridgeEFF::ramDescription()
   return info.str();
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt8 CartridgeEFF::peek(uInt16 address)
 {
   const uInt16 romAddress = address & ROM_MASK;
-  if ((address & 0x1000) && (romAddress >= 0x0FF0) && (romAddress <= 0x0FF4))
+  if((address & 0x1000) && (romAddress >= 0x0FF0) && (romAddress <= 0x0FF4))
+  {
+    switch(romAddress)
     {
-      switch (romAddress) {
-      case 0x0ff0:
+      case 0x0FF0:
         setI2CClock(false);
         break;
-      case 0x0ff1:
+      case 0x0FF1:
         setI2CClock(true);
         break;
-      case 0x0ff2:
+      case 0x0FF2:
         setI2CData(false);
         break;
-      case 0x0ff3:
+      case 0x0FF3:
         setI2CData(true);
         break;
-      case 0x0ff4:
+      case 0x0FF4:
         return readI2C();
-      };
-    }
+    };
+  }
   return CartridgeEF::peek(address);
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 bool CartridgeEFF::poke(uInt16 address, uInt8 value)
 {
   const uInt16 romAddress = address & ROM_MASK;
-  if ((address & 0x1000) && (romAddress >= 0x0FF0) && (romAddress <= 0x0FF3))
+  if((address & 0x1000) && (romAddress >= 0x0FF0) && (romAddress <= 0x0FF3))
+  {
+    switch(romAddress)
     {
-      switch (romAddress) {
-      case 0x0ff0:
+      case 0x0FF0:
         setI2CClock(false);
         setI2CClock(false);
         return false;
 
-      case 0x0ff1:
+      case 0x0FF1:
         setI2CClock(true);
         setI2CClock(true);
         return false;
 
-      case 0x0ff2:
+      case 0x0FF2:
         setI2CData(false);
         setI2CData(false);
         return false;
 
-      case 0x0ff3:
+      case 0x0FF3:
         setI2CData(true);
         setI2CData(true);
         return false;
-      };
-    }  
+    };
+  }
   return CartridgeEF::poke(address, value);
 }
 
-void CartridgeEFF::setI2CClock(bool value) {
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void CartridgeEFF::setI2CClock(bool value)
+{
   myI2CClock = value;
-  if (myEEPROM)
+  if(myEEPROM)
     myEEPROM->writeSCL(myI2CClock);
   else
     cerr << " (No EEPROM)\n";
 }
 
-void CartridgeEFF::setI2CData(bool value) {
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+void CartridgeEFF::setI2CData(bool value)
+{
   myI2CData = value;
-  if (myEEPROM)
+  if(myEEPROM)
     myEEPROM->writeSDA(myI2CData);
   else
     cerr << " (No EEPROM)\n";
 }
 
-uInt8 CartridgeEFF::readI2C() {
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+uInt8 CartridgeEFF::readI2C()
+{
   const bool sda = myEEPROM->readSDA();
   return myImage[0x0ff4 + (sda ? 1 : 0)];
 }
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 void CartridgeEFF::setNVRamFile(string_view pathname)
 {
   myEEPROMFile = std::string(pathname) + std::string("_eeprom.dat");
-  if (mySystem)
+  if(mySystem)
     myEEPROM = make_unique<MT24LC16B>(FSNode(myEEPROMFile), (const System&)mySystem, nullptr);
   else
     cerr << "ERROR asked to set up eeprom before cartridge installed in system\n";

src/emucore/CartEFF.hxx

@@ -36,77 +36,77 @@ class System;
 class CartridgeEFF : public CartridgeEF
 {
   friend class CartridgeEFFWidget;
-  
-public:
-  /**
-     Create a new cartridge using the specified image
-
-     @param image     Pointer to the ROM image
-     @param size      The size of the ROM image
-     @param md5       The md5sum of the ROM image
-     @param settings  A reference to the various settings (read-only)
-     @param bsSize    The size specified by the bankswitching scheme
-  */
-  CartridgeEFF(const ByteBuffer& image, size_t size, string_view md5,
-               const Settings& settings, size_t bsSize = 64_KB);
-  ~CartridgeEFF() override = default;
-
-public:
-  /**
-     Get a descriptor for the device name (used in error checking).
-
-     @return The name of the object
-  */
-  string name() const override { return "CartridgeEFF"; }
 
-#ifdef DEBUGGER_SUPPORT
-  /**
-     Get debugger widget responsible for accessing the inner workings
-     of the cart.
-  */
-  CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
-                               const GUI::Font& nfont, int x, int y, int w, int h) override
-  {
-    return new CartridgeEFFWidget(boss, lfont, nfont, x, y, w, h, *this);
-  }
-#endif
+  public:
+    /**
+       Create a new cartridge using the specified image
+
+       @param image     Pointer to the ROM image
+       @param size      The size of the ROM image
+       @param md5       The md5sum of the ROM image
+       @param settings  A reference to the various settings (read-only)
+       @param bsSize    The size specified by the bankswitching scheme
+    */
+    CartridgeEFF(const ByteBuffer& image, size_t size, string_view md5,
+                 const Settings& settings, size_t bsSize = 64_KB);
+    ~CartridgeEFF() override = default;
+
+  public:
+    /**
+       Get a descriptor for the device name (used in error checking).
+
+       @return The name of the object
+    */
+    string name() const override { return "CartridgeEFF"; }
+
+  #ifdef DEBUGGER_SUPPORT
+    /**
+       Get debugger widget responsible for accessing the inner workings
+       of the cart.
+    */
+    CartDebugWidget* debugWidget(GuiObject* boss, const GUI::Font& lfont,
+                                 const GUI::Font& nfont, int x, int y, int w, int h) override
+    {
+      return new CartridgeEFFWidget(boss, lfont, nfont, x, y, w, h, *this);
+    }
+  #endif
 
-  int descriptionLines();
+    int descriptionLines();
 
-  string ramDescription();
+    string ramDescription();
 
-  uInt8 peek(uInt16 address) override;
-  bool poke(uInt16 address, uInt8 value) override;
+    uInt8 peek(uInt16 address) override;
+    bool poke(uInt16 address, uInt8 value) override;
+    void setNVRamFile(string_view path) override;
 
-  void setNVRamFile(string_view path);
+  protected:
+    bool checkSwitchBank (uInt16 address, uInt8) override;
 
-protected:
-  bool checkSwitchBank (uInt16 address, uInt8) override;
+    uInt16 hotspot() const override { return 0x1FE0; }
 
-  uInt16 hotspot() const override { return 0x1FE0; }
+    uInt16 getStartBank() const override { return 1; }
 
-  uInt16 getStartBank() const override { return 1; }
+    // RAM size
+    static constexpr size_t RAM_SIZE = 0;
 
-  // RAM size
-  static constexpr size_t RAM_SIZE = 0;
+    void setI2CClock(bool value);
+    void setI2CData(bool value);
 
-  void setI2CClock(bool value);
-  void setI2CData(bool value);
-   
-  bool myI2CData = false;
-  bool myI2CClock = false;
+    bool myI2CData{false};
+    bool myI2CClock{false};
 
-  string myEEPROMFile;
-  unique_ptr<MT24LC16B> myEEPROM;
+    string myEEPROMFile;
+    unique_ptr<MT24LC16B> myEEPROM;
 
-  uInt8 readI2C();
+    uInt8 readI2C();
 
-  // Following constructors and assignment operators not supported
-  CartridgeEFF() = delete;
-  CartridgeEFF(const CartridgeEFF&) = delete;
-  CartridgeEFF(CartridgeEFF&&) = delete;
-  CartridgeEFF& operator=(const CartridgeEFF&) = delete;
-  CartridgeEFF& operator=(CartridgeEFF&&) = delete;
+  private:
+    // Following constructors and assignment operators not supported
+    CartridgeEFF() = delete;
+    CartridgeEFF(const CartridgeEFF&) = delete;
+    CartridgeEFF(CartridgeEFF&&) = delete;
+    CartridgeEFF& operator=(const CartridgeEFF&) = delete;
+    CartridgeEFF& operator=(CartridgeEFF&&) = delete;
 };
 
 #endif

src/emucore/MT24LC16B.cxx

@@ -21,14 +21,15 @@
 #include "MicroChip24LC.hxx"
 
 /**
-  Emulates  a   Microchip  Technology   Inc.  24LC16B,  a   2kiB  Serial
-  Electrically Erasable PROM accessed using  the I2C protocol. Thanks to
-  J. Payson (aka Supercat) for the bulk of the 24LC256 code; altered for
+  Emulates a Microchip Technology Inc. 24LC16B, a 2KiB Serial Electrically
+  Erasable PROM accessed using the I2C protocol. Thanks to J. Payson
+  (aka Supercat) for the bulk of the 24LC256 code; altered for
   24LC16B / EFF (Grizzards) cart type by Bruce-Robert Pocock.
 
   @author Stephen Anthon, J. Payson, and Bruce-Robert Pocock
 */
-class MT24LC16B : public MicroChip24LC<2_KB, 16> {
+class MT24LC16B : public MicroChip24LC<2_KB, 16>
+{
   using MicroChip24LC::MicroChip24LC;
 };
 

src/emucore/MT24LC16B.hxx

@@ -27,7 +27,8 @@
 
   @author Stephen Anthony & J. Payson
 */
-class MT24LC256 : public MicroChip24LC<32_KB, 64> {
+class MT24LC256 : public MicroChip24LC<32_KB, 64>
+{
   using MicroChip24LC::MicroChip24LC;
 };