From 3ee2ea1871fe01628b409f3b0f50a882f9c64536 Mon Sep 17 00:00:00 2001
From: joevt <joevt@shaw.ca>
Date: Mon, 22 Aug 2022 03:16:31 -0700
Subject: [PATCH] Fix read/write argument names

base class uses reg_start so derived classes should do the same.
Some derived class already uses reg_start for read method.
---
 devices/common/machineid.h      |  8 ++++----
 devices/common/mmiodevice.h     |  4 ++--
 devices/common/pci/bandit.cpp   |  8 ++++----
 devices/common/pci/bandit.h     |  8 ++++----
 devices/ioctrl/amic.cpp         |  4 ++--
 devices/ioctrl/amic.h           |  4 ++--
 devices/ioctrl/grandcentral.cpp |  4 ++--
 devices/ioctrl/heathrow.cpp     |  4 ++--
 devices/ioctrl/macio.h          |  8 ++++----
 devices/memctrl/hammerhead.cpp  |  2 +-
 devices/memctrl/hammerhead.h    |  2 +-
 devices/memctrl/hmc.cpp         |  4 ++--
 devices/memctrl/hmc.h           |  4 ++--
 devices/memctrl/mpc106.cpp      |  8 ++++----
 devices/memctrl/mpc106.h        |  4 ++--
 devices/memctrl/platinum.cpp    |  2 +-
 devices/memctrl/platinum.h      |  2 +-
 devices/video/atirage.cpp       | 12 ++++++------
 devices/video/atirage.h         |  4 ++--
 devices/video/control.cpp       | 12 ++++++------
 devices/video/control.h         |  4 ++--
 21 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/devices/common/machineid.h b/devices/common/machineid.h
index 5000a57..d483418 100644
--- a/devices/common/machineid.h
+++ b/devices/common/machineid.h
@@ -55,12 +55,12 @@ public:
     };
     ~NubusMacID() = default;
 
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size) {
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size) {
         return (offset < 4 ? this->id[offset] : 0);
     };
 
     /* not writable */
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size) {};
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) {};
 
 private:
     uint8_t id[4];
@@ -80,12 +80,12 @@ public:
     };
     ~GossamerID() = default;
 
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size) {
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size) {
         return ((!offset && size == 2) ? this->id : 0);
     };
 
     /* not writable */
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size) {};
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) {};
 
 private:
     uint16_t id;
diff --git a/devices/common/mmiodevice.h b/devices/common/mmiodevice.h
index 3b1d692..41b86a0 100644
--- a/devices/common/mmiodevice.h
+++ b/devices/common/mmiodevice.h
@@ -31,8 +31,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 class MMIODevice : public HWComponent {
 public:
     MMIODevice()                                                                      = default;
-    virtual uint32_t read(uint32_t reg_start, uint32_t offset, int size)              = 0;
-    virtual void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size) = 0;
+    virtual uint32_t read(uint32_t rgn_start, uint32_t offset, int size)              = 0;
+    virtual void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) = 0;
     virtual ~MMIODevice()                                                             = default;
 };
 
diff --git a/devices/common/pci/bandit.cpp b/devices/common/pci/bandit.cpp
index 1255dd4..98dce60 100644
--- a/devices/common/pci/bandit.cpp
+++ b/devices/common/pci/bandit.cpp
@@ -111,7 +111,7 @@ void Bandit::pci_cfg_write(uint32_t reg_offs, uint32_t value, uint32_t size)
     }
 }
 
-uint32_t Bandit::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t Bandit::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     int      bus_num, dev_num, fun_num;
     uint8_t  reg_offs;
@@ -178,7 +178,7 @@ uint32_t Bandit::read(uint32_t reg_start, uint32_t offset, int size)
     return result;
 }
 
-void Bandit::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void Bandit::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
     int      bus_num, dev_num, fun_num;
     uint8_t  reg_offs;
@@ -284,7 +284,7 @@ Chaos::Chaos(std::string name) : PCIHost()
     this->name = name;
 }
 
-uint32_t Chaos::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t Chaos::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     int      bus_num, dev_num, fun_num;
     uint8_t  reg_offs;
@@ -340,7 +340,7 @@ uint32_t Chaos::read(uint32_t reg_start, uint32_t offset, int size)
     return result;
 }
 
-void Chaos::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void Chaos::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
     int      bus_num, dev_num, fun_num;
     uint8_t  reg_offs;
diff --git a/devices/common/pci/bandit.h b/devices/common/pci/bandit.h
index f472eda..83d9fce 100644
--- a/devices/common/pci/bandit.h
+++ b/devices/common/pci/bandit.h
@@ -63,8 +63,8 @@ public:
     void pci_cfg_write(uint32_t reg_offs, uint32_t value, uint32_t size);
 
     // MMIODevice methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
 protected:
     void verbose_address_space();
@@ -90,8 +90,8 @@ public:
     };
 
     // MMIODevice methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
 private:
     std::string name;
diff --git a/devices/ioctrl/amic.cpp b/devices/ioctrl/amic.cpp
index 6381d0f..4e13bea 100644
--- a/devices/ioctrl/amic.cpp
+++ b/devices/ioctrl/amic.cpp
@@ -101,7 +101,7 @@ int AMIC::device_postinit()
     return 0;
 }
 
-uint32_t AMIC::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t AMIC::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     uint32_t  phase_val;
 
@@ -180,7 +180,7 @@ uint32_t AMIC::read(uint32_t reg_start, uint32_t offset, int size)
     return 0;
 }
 
-void AMIC::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void AMIC::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
     uint32_t mask;
 
diff --git a/devices/ioctrl/amic.h b/devices/ioctrl/amic.h
index 0880207..652a675 100644
--- a/devices/ioctrl/amic.h
+++ b/devices/ioctrl/amic.h
@@ -192,8 +192,8 @@ public:
     int device_postinit();
 
     /* MMIODevice methods */
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     // InterruptCtrl methods
     uint32_t register_dev_int(IntSrc src_id);
diff --git a/devices/ioctrl/grandcentral.cpp b/devices/ioctrl/grandcentral.cpp
index 203db32..44e00db 100644
--- a/devices/ioctrl/grandcentral.cpp
+++ b/devices/ioctrl/grandcentral.cpp
@@ -94,7 +94,7 @@ void GrandCentral::notify_bar_change(int bar_num)
     }
 }
 
-uint32_t GrandCentral::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t GrandCentral::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     if (offset & 0x10000) { // Device register space
         unsigned subdev_num = (offset >> 12) & 0xF;
@@ -160,7 +160,7 @@ uint32_t GrandCentral::read(uint32_t reg_start, uint32_t offset, int size)
     return 0;
 }
 
-void GrandCentral::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void GrandCentral::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
     if (offset & 0x10000) { // Device register space
         unsigned subdev_num = (offset >> 12) & 0xF;
diff --git a/devices/ioctrl/heathrow.cpp b/devices/ioctrl/heathrow.cpp
index ea98d80..186b17e 100644
--- a/devices/ioctrl/heathrow.cpp
+++ b/devices/ioctrl/heathrow.cpp
@@ -128,7 +128,7 @@ void HeathrowIC::dma_write(uint32_t offset, uint32_t value, int size) {
 }
 
 
-uint32_t HeathrowIC::read(uint32_t reg_start, uint32_t offset, int size) {
+uint32_t HeathrowIC::read(uint32_t rgn_start, uint32_t offset, int size) {
     uint32_t res = 0;
 
     LOG_F(9, "%s: reading from offset %x", this->name.c_str(), offset);
@@ -172,7 +172,7 @@ uint32_t HeathrowIC::read(uint32_t reg_start, uint32_t offset, int size) {
     return res;
 }
 
-void HeathrowIC::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size) {
+void HeathrowIC::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) {
     LOG_F(9, "%s: writing to offset %x", this->name.c_str(), offset);
 
     unsigned sub_addr = (offset >> 12) & 0x7F;
diff --git a/devices/ioctrl/macio.h b/devices/ioctrl/macio.h
index 3f7f79b..7c561fa 100644
--- a/devices/ioctrl/macio.h
+++ b/devices/ioctrl/macio.h
@@ -100,8 +100,8 @@ public:
     }
 
     // MMIO device methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     // InterruptCtrl methods
     uint32_t register_dev_int(IntSrc src_id);
@@ -182,8 +182,8 @@ public:
     }
 
     // MMIO device methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     // InterruptCtrl methods
     uint32_t register_dev_int(IntSrc src_id);
diff --git a/devices/memctrl/hammerhead.cpp b/devices/memctrl/hammerhead.cpp
index f17f1fa..847f6bb 100644
--- a/devices/memctrl/hammerhead.cpp
+++ b/devices/memctrl/hammerhead.cpp
@@ -40,7 +40,7 @@ HammerheadCtrl::HammerheadCtrl() : MemCtrlBase()
     add_mmio_region(0xF8000000, 0x500, this);
 }
 
-uint32_t HammerheadCtrl::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t HammerheadCtrl::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     uint32_t result;
 
diff --git a/devices/memctrl/hammerhead.h b/devices/memctrl/hammerhead.h
index fae0fbd..1643a8a 100644
--- a/devices/memctrl/hammerhead.h
+++ b/devices/memctrl/hammerhead.h
@@ -97,7 +97,7 @@ public:
     }
 
     // MMIODevice methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
     void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     void insert_ram_dimm(int slot_num, uint32_t capacity);
diff --git a/devices/memctrl/hmc.cpp b/devices/memctrl/hmc.cpp
index 48736cd..c9e9c1e 100644
--- a/devices/memctrl/hmc.cpp
+++ b/devices/memctrl/hmc.cpp
@@ -41,7 +41,7 @@ HMC::HMC() : MemCtrlBase()
     this->bit_pos = 0;
 }
 
-uint32_t HMC::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t HMC::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     if (!offset)
         return !!(this->ctrl_reg & (1ULL << this->bit_pos++));
@@ -49,7 +49,7 @@ uint32_t HMC::read(uint32_t reg_start, uint32_t offset, int size)
         return 0; /* FIXME: what should be returned for invalid offsets? */
 }
 
-void HMC::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void HMC::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
     uint64_t bit;
 
diff --git a/devices/memctrl/hmc.h b/devices/memctrl/hmc.h
index 5c6880b..a7a2493 100644
--- a/devices/memctrl/hmc.h
+++ b/devices/memctrl/hmc.h
@@ -51,8 +51,8 @@ public:
     }
 
     /* MMIODevice methods */
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     uint64_t get_control_reg(void) {
         return this->ctrl_reg;
diff --git a/devices/memctrl/mpc106.cpp b/devices/memctrl/mpc106.cpp
index 407af00..b6312f5 100644
--- a/devices/memctrl/mpc106.cpp
+++ b/devices/memctrl/mpc106.cpp
@@ -74,10 +74,10 @@ int MPC106::device_postinit()
     return 0;
 }
 
-uint32_t MPC106::read(uint32_t reg_start, uint32_t offset, int size) {
+uint32_t MPC106::read(uint32_t rgn_start, uint32_t offset, int size) {
     uint32_t result;
 
-    if (reg_start == 0xFE000000) {
+    if (rgn_start == 0xFE000000) {
         // broadcast I/O request to devices that support I/O space
         // until a device returns true that means "request accepted"
         for (auto& dev : this->io_space_devs) {
@@ -98,8 +98,8 @@ uint32_t MPC106::read(uint32_t reg_start, uint32_t offset, int size) {
     return 0;
 }
 
-void MPC106::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size) {
-    if (reg_start == 0xFE000000) {
+void MPC106::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size) {
+    if (rgn_start == 0xFE000000) {
         // broadcast I/O request to devices that support I/O space
         // until a device returns true that means "request accepted"
         for (auto& dev : this->io_space_devs) {
diff --git a/devices/memctrl/mpc106.h b/devices/memctrl/mpc106.h
index 0b818d1..5d62df2 100644
--- a/devices/memctrl/mpc106.h
+++ b/devices/memctrl/mpc106.h
@@ -52,8 +52,8 @@ public:
         return std::unique_ptr<MPC106>(new MPC106());
     }
 
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     int device_postinit();
 
diff --git a/devices/memctrl/platinum.cpp b/devices/memctrl/platinum.cpp
index 5dfe0af..98c0d9f 100644
--- a/devices/memctrl/platinum.cpp
+++ b/devices/memctrl/platinum.cpp
@@ -53,7 +53,7 @@ PlatinumCtrl::PlatinumCtrl() : MemCtrlBase()
     this->display_id = std::unique_ptr<DisplayID> (new DisplayID());
 }
 
-uint32_t PlatinumCtrl::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t PlatinumCtrl::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     if (size != 4) {
         LOG_F(WARNING, "Platinum: unsupported register access size %d!", size);
diff --git a/devices/memctrl/platinum.h b/devices/memctrl/platinum.h
index 651edc8..f47a242 100644
--- a/devices/memctrl/platinum.h
+++ b/devices/memctrl/platinum.h
@@ -155,7 +155,7 @@ public:
     }
 
     /* MMIODevice methods */
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
     void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     void insert_ram_dimm(int slot_num, uint32_t capacity);
diff --git a/devices/video/atirage.cpp b/devices/video/atirage.cpp
index 2d81fe4..5efb89b 100644
--- a/devices/video/atirage.cpp
+++ b/devices/video/atirage.cpp
@@ -378,11 +378,11 @@ bool ATIRage::pci_io_write(uint32_t offset, uint32_t value, uint32_t size) {
 }
 
 
-uint32_t ATIRage::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t ATIRage::read(uint32_t rgn_start, uint32_t offset, int size)
 {
-    LOG_F(8, "Reading ATI Rage PCI memory: region=%X, offset=%X, size %d", reg_start, offset, size);
+    LOG_F(8, "Reading ATI Rage PCI memory: region=%X, offset=%X, size %d", rgn_start, offset, size);
 
-    if (reg_start < this->aperture_base || offset > APERTURE_SIZE) {
+    if (rgn_start < this->aperture_base || offset > APERTURE_SIZE) {
         LOG_F(WARNING, "ATI Rage: attempt to read outside the aperture!");
         return 0;
     }
@@ -410,11 +410,11 @@ uint32_t ATIRage::read(uint32_t reg_start, uint32_t offset, int size)
     return 0;
 }
 
-void ATIRage::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void ATIRage::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
-    LOG_F(8, "Writing reg=%X, offset=%X, value=%X, size %d", reg_start, offset, value, size);
+    LOG_F(8, "Writing reg=%X, offset=%X, value=%X, size %d", rgn_start, offset, value, size);
 
-    if (reg_start < this->aperture_base || offset > APERTURE_SIZE) {
+    if (rgn_start < this->aperture_base || offset > APERTURE_SIZE) {
         LOG_F(WARNING, "ATI Rage: attempt to write outside the aperture!");
         return;
     }
diff --git a/devices/video/atirage.h b/devices/video/atirage.h
index a6825cf..30c3eb6 100644
--- a/devices/video/atirage.h
+++ b/devices/video/atirage.h
@@ -56,8 +56,8 @@ public:
     }
 
     /* MMIODevice methods */
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
     /* PCI device methods */
     bool supports_io_space(void) {
diff --git a/devices/video/control.cpp b/devices/video/control.cpp
index 729d263..b15b4c2 100644
--- a/devices/video/control.cpp
+++ b/devices/video/control.cpp
@@ -103,11 +103,11 @@ void ControlVideo::notify_bar_change(int bar_num)
     }
 }
 
-uint32_t ControlVideo::read(uint32_t reg_start, uint32_t offset, int size)
+uint32_t ControlVideo::read(uint32_t rgn_start, uint32_t offset, int size)
 {
     uint32_t result = 0;
 
-    if (reg_start == this->vram_base) {
+    if (rgn_start == this->vram_base) {
         if (offset >= 0x800000) {
             return read_mem_rev(&this->vram_ptr[offset - 0x800000], size);
         } else {
@@ -124,15 +124,15 @@ uint32_t ControlVideo::read(uint32_t reg_start, uint32_t offset, int size)
         result = this->cur_mon_id << 6;
         break;
     default:
-        LOG_F(INFO, "read from 0x%08X:0x%08X", reg_start, offset);
+        LOG_F(INFO, "read from 0x%08X:0x%08X", rgn_start, offset);
     }
 
     return BYTESWAP_32(result);
 }
 
-void ControlVideo::write(uint32_t reg_start, uint32_t offset, uint32_t value, int size)
+void ControlVideo::write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size)
 {
-    if (reg_start == this->vram_base) {
+    if (rgn_start == this->vram_base) {
         if (offset >= 0x800000) {
             write_mem_rev(&this->vram_ptr[offset - 0x800000], value, size);
         } else {
@@ -209,7 +209,7 @@ void ControlVideo::write(uint32_t reg_start, uint32_t offset, uint32_t value, in
         this->int_enable = value;
         break;
     default:
-        LOG_F(INFO, "write 0x%08X to 0x%08X:0x%08X", value, reg_start, offset);
+        LOG_F(INFO, "write 0x%08X to 0x%08X:0x%08X", value, rgn_start, offset);
     }
 }
 
diff --git a/devices/video/control.h b/devices/video/control.h
index dcff4f9..323d695 100644
--- a/devices/video/control.h
+++ b/devices/video/control.h
@@ -97,8 +97,8 @@ public:
     }
 
     // MMIODevice methods
-    uint32_t read(uint32_t reg_start, uint32_t offset, int size);
-    void write(uint32_t reg_start, uint32_t offset, uint32_t value, int size);
+    uint32_t read(uint32_t rgn_start, uint32_t offset, int size);
+    void write(uint32_t rgn_start, uint32_t offset, uint32_t value, int size);
 
 protected:
     void notify_bar_change(int bar_num);