diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/ide_disk.hh | 2 | ||||
| -rw-r--r-- | dev/pcidev.hh | 2 | ||||
| -rw-r--r-- | dev/platform.hh | 2 | ||||
| -rw-r--r-- | dev/simple_disk.hh | 2 | ||||
| -rw-r--r-- | dev/sinicreg.hh | 4 | ||||
| -rw-r--r-- | dev/tsunami.hh | 2 |
6 files changed, 2 insertions, 12 deletions
diff --git a/dev/ide_disk.hh b/dev/ide_disk.hh index 32888c81c..a656ca464 100644 --- a/dev/ide_disk.hh +++ b/dev/ide_disk.hh @@ -188,8 +188,6 @@ class IdeController; class IdeDisk : public SimObject { protected: - typedef TheISA::Addr Addr; - protected: /** The IDE controller for this disk. */ IdeController *ctrl; /** The DMA interface to use for transfers */ diff --git a/dev/pcidev.hh b/dev/pcidev.hh index a100bf746..c8d9685c1 100644 --- a/dev/pcidev.hh +++ b/dev/pcidev.hh @@ -53,8 +53,6 @@ class MemoryController; */ class PciConfigData : public SimObject { - protected: - typedef TheISA::Addr Addr; public: /** * Constructor to initialize the devices config space to 0. diff --git a/dev/platform.hh b/dev/platform.hh index 87810250a..1ee645454 100644 --- a/dev/platform.hh +++ b/dev/platform.hh @@ -44,8 +44,6 @@ class Uart; class Platform : public SimObject { - protected: - typedef TheISA::Addr Addr; public: /** Pointer to the interrupt controller */ IntrControl *intrctrl; diff --git a/dev/simple_disk.hh b/dev/simple_disk.hh index f68d5bfff..57f81c5a9 100644 --- a/dev/simple_disk.hh +++ b/dev/simple_disk.hh @@ -44,8 +44,6 @@ class PhysicalMemory; */ class SimpleDisk : public SimObject { - protected: - typedef TheISA::Addr Addr; public: typedef uint64_t baddr_t; diff --git a/dev/sinicreg.hh b/dev/sinicreg.hh index 1378e079d..fc1f4c06b 100644 --- a/dev/sinicreg.hh +++ b/dev/sinicreg.hh @@ -163,7 +163,7 @@ struct Info /* namespace Regs */ } inline const Regs::Info& -regInfo(TheISA::Addr daddr) +regInfo(Addr daddr) { static Regs::Info invalid = { 0, false, false, "invalid" }; static Regs::Info info [] = { @@ -199,7 +199,7 @@ regInfo(TheISA::Addr daddr) } inline bool -regValid(TheISA::Addr daddr) +regValid(Addr daddr) { if (daddr > Regs::Size) return false; diff --git a/dev/tsunami.hh b/dev/tsunami.hh index 79b561ed7..7fd91d5b2 100644 --- a/dev/tsunami.hh +++ b/dev/tsunami.hh @@ -55,8 +55,6 @@ class System; class Tsunami : public Platform { - protected: - typedef TheISA::Addr Addr; public: /** Max number of CPUs in a Tsunami */ static const int Max_CPUs = 64; |