diff options
Diffstat (limited to 'src/dev/x86')
-rw-r--r-- | src/dev/x86/Pc.py (renamed from src/dev/x86/PC.py) | 4 | ||||
-rw-r--r-- | src/dev/x86/SConscript | 2 | ||||
-rw-r--r-- | src/dev/x86/pc.cc | 24 | ||||
-rw-r--r-- | src/dev/x86/pc.hh | 8 | ||||
-rw-r--r-- | src/dev/x86/south_bridge.cc | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/src/dev/x86/PC.py b/src/dev/x86/Pc.py index 28a722be9..080844e4a 100644 --- a/src/dev/x86/PC.py +++ b/src/dev/x86/Pc.py @@ -40,8 +40,8 @@ def x86IOAddress(port): IO_address_space_base = 0x8000000000000000 return IO_address_space_base + port; -class PC(Platform): - type = 'PC' +class Pc(Platform): + type = 'Pc' system = Param.System(Parent.any, "system") pciconfig = PciConfigAll() diff --git a/src/dev/x86/SConscript b/src/dev/x86/SConscript index b71649fdd..ae270aa90 100644 --- a/src/dev/x86/SConscript +++ b/src/dev/x86/SConscript @@ -31,7 +31,7 @@ Import('*') if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'x86': - SimObject('PC.py') + SimObject('Pc.py') Source('pc.cc') SimObject('SouthBridge.py') diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc index 7c35aebf2..0dc8d6cd5 100644 --- a/src/dev/x86/pc.cc +++ b/src/dev/x86/pc.cc @@ -47,7 +47,7 @@ using namespace std; using namespace TheISA; -PC::PC(const Params *p) +Pc::Pc(const Params *p) : Platform(p), system(p->system) { southBridge = NULL; @@ -56,7 +56,7 @@ PC::PC(const Params *p) } void -PC::init() +Pc::init() { assert(southBridge); I8254 & timer = *southBridge->pit; @@ -70,40 +70,40 @@ PC::init() } Tick -PC::intrFrequency() +Pc::intrFrequency() { panic("Need implementation\n"); M5_DUMMY_RETURN } void -PC::postConsoleInt() +Pc::postConsoleInt() { warn_once("Don't know what interrupt to post for console.\n"); //panic("Need implementation\n"); } void -PC::clearConsoleInt() +Pc::clearConsoleInt() { warn_once("Don't know what interrupt to clear for console.\n"); //panic("Need implementation\n"); } void -PC::postPciInt(int line) +Pc::postPciInt(int line) { panic("Need implementation\n"); } void -PC::clearPciInt(int line) +Pc::clearPciInt(int line) { panic("Need implementation\n"); } Addr -PC::pciToDma(Addr pciAddr) const +Pc::pciToDma(Addr pciAddr) const { panic("Need implementation\n"); M5_DUMMY_RETURN @@ -111,7 +111,7 @@ PC::pciToDma(Addr pciAddr) const Addr -PC::calcConfigAddr(int bus, int dev, int func) +Pc::calcConfigAddr(int bus, int dev, int func) { assert(func < 8); assert(dev < 32); @@ -119,8 +119,8 @@ PC::calcConfigAddr(int bus, int dev, int func) return (PhysAddrPrefixPciConfig | (func << 8) | (dev << 11)); } -PC * -PCParams::create() +Pc * +PcParams::create() { - return new PC(this); + return new Pc(this); } diff --git a/src/dev/x86/pc.hh b/src/dev/x86/pc.hh index 418a2e830..21055a566 100644 --- a/src/dev/x86/pc.hh +++ b/src/dev/x86/pc.hh @@ -38,13 +38,13 @@ #define __DEV_PC_HH__ #include "dev/platform.hh" -#include "params/PC.hh" +#include "params/Pc.hh" class IdeController; class System; class SouthBridge; -class PC : public Platform +class Pc : public Platform { public: /** Pointer to the system */ @@ -52,14 +52,14 @@ class PC : public Platform SouthBridge *southBridge; public: - typedef PCParams Params; + typedef PcParams Params; /** * Do platform initialization stuff */ void init(); - PC(const Params *p); + Pc(const Params *p); /** * Return the interrupting frequency to AlphaAccess diff --git a/src/dev/x86/south_bridge.cc b/src/dev/x86/south_bridge.cc index 3f68fee18..d366de4ad 100644 --- a/src/dev/x86/south_bridge.cc +++ b/src/dev/x86/south_bridge.cc @@ -40,7 +40,7 @@ SouthBridge::SouthBridge(const Params *p) : SimObject(p), cmos(p->cmos), speaker(p->speaker) { // Let the platform know where we are - PC * pc = dynamic_cast<PC *>(platform); + Pc * pc = dynamic_cast<Pc *>(platform); assert(pc); pc->southBridge = this; } |