Code clean-up part 2.

Author: joevt

devices/common/ata/atabasedevice.h

@@ -50,7 +50,7 @@ class AtaBaseDevice : public HWComponent, public AtaInterface
 
     virtual int perform_command() = 0;
 
-    int get_device_id() override { return this->my_dev_id; };
+    int get_device_id() override { return this->my_dev_id; }
 
     void pdiag_callback() override {
         this->r_error &= 0x7F;
@@ -62,7 +62,7 @@ class AtaBaseDevice : public HWComponent, public AtaInterface
     void update_intrq(uint8_t new_intrq_state);
     void signal_data_ready();
 
-    bool has_data() {
+    bool has_data() const {
         return data_ptr && xfer_cnt;
     }
 
@@ -73,7 +73,7 @@ class AtaBaseDevice : public HWComponent, public AtaInterface
 protected:
     bool is_selected() const {
         return ((this->r_dev_head >> 4) & 1) == this->my_dev_id;
-    };
+    }
 
     void prepare_xfer(int xfer_size, int block_size);
 

devices/common/ata/cmd646.h

@@ -32,7 +32,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 
 constexpr auto DEV_ID_CMD646 = 0x646;
-constexpr auto MY_DEV_CLASS  = 0x010180;    // mass storage | IDE controller | IDE master;
+constexpr auto MY_DEV_CLASS  = 0x010180;    // mass storage | IDE controller | IDE master
 constexpr auto MY_REV_ID     = 7;
 
 // Offset for converting addresses of the device control block registers

devices/common/pci/bandit.h

@@ -46,8 +46,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 #include <string>
 
-constexpr auto BANDIT_DEV      = (11);       // Bandit's own device number;
-constexpr auto BANDIT_CAR_TYPE = (1 << 0);    // Bandit config address type bit;
+constexpr auto BANDIT_DEV      = 11;      // Bandit's own device number
+constexpr auto BANDIT_CAR_TYPE = 1 << 0;  // Bandit config address type bit
 
 /* Convenient macros for parsing CONFIG_ADDR fields. */
 #define BUS_NUM()   ((this->config_addr >> 16) & 0xFFU)

devices/common/scsi/sc53c94.cpp

@@ -433,7 +433,7 @@ void Sc53C94::sequencer()
     case SeqState::BUS_FREE:
         if (this->bus_obj->current_phase() == ScsiPhase::BUS_FREE) {
             this->next_state = SeqState::ARB_BEGIN;
-            this->seq_defer_state(uint64_t(BUS_FREE_DELAY) + BUS_SETTLE_DELAY);
+            this->seq_defer_state(BUS_FREE_DELAY + BUS_SETTLE_DELAY);
         } else { // continue waiting
             this->next_state = SeqState::BUS_FREE;
             this->seq_defer_state(BUS_FREE_DELAY);
@@ -453,7 +453,7 @@ void Sc53C94::sequencer()
     case SeqState::ARB_END:
         if (this->bus_obj->end_arbitration(this->my_bus_id)) { // arbitration won
             this->next_state = this->cmd_steps->next_step;
-            this->seq_defer_state(uint64_t(BUS_CLEAR_DELAY) + BUS_SETTLE_DELAY);
+            this->seq_defer_state(BUS_CLEAR_DELAY + BUS_SETTLE_DELAY);
         } else { // arbitration lost
             LOG_F(INFO, "%s: arbitration lost!", this->name.c_str());
             this->bus_obj->release_ctrl_lines(this->my_bus_id);

devices/common/scsi/scsi.h

@@ -156,12 +156,12 @@ enum ScsiError : int {
 };
 
 /** Standard SCSI bus timing values measured in ns. */
-constexpr auto BUS_SETTLE_DELAY = 400;
-constexpr auto BUS_FREE_DELAY   = 800;
-constexpr auto BUS_CLEAR_DELAY  = 800;
-constexpr auto ARB_DELAY        = 2400;
-constexpr auto SEL_ABORT_TIME   = 200000;
-constexpr auto SEL_TIME_OUT     = 250000000;
+constexpr uint64_t BUS_SETTLE_DELAY = 400;
+constexpr uint64_t BUS_FREE_DELAY   = 800;
+constexpr uint64_t BUS_CLEAR_DELAY  = 800;
+constexpr uint64_t ARB_DELAY        = 2400;
+constexpr uint64_t SEL_ABORT_TIME   = 200000;
+constexpr uint64_t SEL_TIME_OUT     = 250000000;
 
 constexpr auto SCSI_MAX_DEVS    = 8;
 
@@ -249,15 +249,15 @@ class ScsiBus : public HWComponent {
 
     int current_phase() const {
         return this->cur_phase;
-    };
+    }
 
     int get_initiator_id() const {
         return this->initiator_id;
-    };
+    }
 
     int get_target_id() const {
         return this->target_id;
-    };
+    }
 
     // reading/writing control lines
     void        assert_ctrl_line(int id, uint16_t mask);

devices/ethernet/mace.h

@@ -31,8 +31,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <memory>
 
 /** Known MACE chip IDs. */
-constexpr auto MACE_ID_REV_B0 = 0x0940;    // Darwin-0.3 source;
-constexpr auto MACE_ID_REV_A2 = 0x0941;    // Darwin-0.3 source & Curio datasheet;
+constexpr auto MACE_ID_REV_B0 = 0x0940;    // Darwin-0.3 source
+constexpr auto MACE_ID_REV_A2 = 0x0941;    // Darwin-0.3 source & Curio datasheet
 
 /** MACE registers offsets. */
 // Refer to the Am79C940 datasheet for details

devices/floppy/floppyimg.h

@@ -27,7 +27,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <cinttypes>
 #include <string>
 
-constexpr auto BLOCK_SIZE = 512;      // size in bytes of a logical block;
+constexpr auto BLOCK_SIZE = 512;      // size in bytes of a logical block
 
 #define MFM_HD_SIZE (BLOCK_SIZE*2880) // maximal size of a high-density floppy
 
@@ -52,31 +52,31 @@ class FloppyImgConverter {
 
     int get_data_size() const {
         return this->data_size;
-    };
+    }
 
     int get_disk_rec_method() const {
         return this->rec_method;
-    };
+    }
 
     int get_number_of_tracks() const {
         return this->num_tracks;
-    };
+    }
 
     int get_number_of_sides() const {
         return this->num_sides;
-    };
+    }
 
     int get_sectors_per_side() const {
         return this->num_sectors;
-    };
+    }
 
     int get_rec_density() const {
         return this->density;
-    };
+    }
 
     uint8_t get_format_byte() const {
         return this->format_byte;
-    };
+    }
 
 protected:
     std::string img_path;

devices/memctrl/hammerhead.h

@@ -40,7 +40,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 namespace Hammerhead {
     constexpr auto RISC_MACHINE  = 0x3;
     constexpr auto MACH_TYPE_TNT = 0x1;
-    constexpr auto EXTENDED_ID   = 0x1;    // examine some other registers to get full ID;
+    constexpr auto EXTENDED_ID   = 0x1;    // examine some other registers to get full ID
     constexpr auto HH_CPU_ID_TNT = ((RISC_MACHINE << 4) | (EXTENDED_ID << 3) | MACH_TYPE_TNT);
 
     // constants for the MBID field of the MOTHERBOARD_ID register

devices/memctrl/hmc.h

@@ -1,6 +1,6 @@
 /*
 DingusPPC - The Experimental PowerPC Macintosh emulator
-Copyright (C) 2018-24 divingkatae and maximum
+Copyright (C) 2018-25 divingkatae and maximum
                       (theweirdo)     spatium
 
 (Contact divingkatae#1017 or powermax#2286 on Discord for more info)
@@ -77,7 +77,7 @@ class HMC : public MemCtrlBase, public MMIODevice {
 
     uint64_t get_control_reg(void) const {
         return this->ctrl_reg;
-    };
+    }
 
 protected:
     void remap_ram_regions();

devices/video/appleramdac.h

@@ -53,7 +53,7 @@ enum DacFlavour {
     DACULA,
 };
 
-constexpr auto DACULA_VENDOR_SIERRA = 0x3C;    // 14.3 MHz;
+constexpr auto DACULA_VENDOR_SIERRA = 0x3C;    // 14.3 MHz
 constexpr auto DACULA_VENDOR_ATT    = 0x84;    // 15 MHz
 
 constexpr auto VIDEO_XTAL = 14318180.0f; // external crystal oscillator frequency