diff options
author | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 02:16:11 -0700 |
---|---|---|
committer | Gabe Black <gblack@eecs.umich.edu> | 2008-10-11 02:16:11 -0700 |
commit | bc2217eefc8db831b72dfdcae7ecc9bd95a31c3c (patch) | |
tree | c4ef2e5783840b9dd8b2e76c19daaf77a2b90a8a /src/dev/x86/pc.cc | |
parent | a6600fdd8885f9765c859935a5c97d9017653745 (diff) | |
download | gem5-bc2217eefc8db831b72dfdcae7ecc9bd95a31c3c.tar.xz |
X86: Change I8254 and PCSpeaker devices from subdevices to SimObjects and eliminate subdevices.
--HG--
rename : src/dev/x86/south_bridge/i8254.cc => src/dev/x86/i8254.cc
rename : src/dev/x86/south_bridge/i8254.hh => src/dev/x86/i8254.hh
rename : src/dev/x86/south_bridge/speaker.cc => src/dev/x86/speaker.cc
rename : src/dev/x86/south_bridge/speaker.hh => src/dev/x86/speaker.hh
Diffstat (limited to 'src/dev/x86/pc.cc')
-rw-r--r-- | src/dev/x86/pc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/dev/x86/pc.cc b/src/dev/x86/pc.cc index 3de28bce5..0cfd2b0f9 100644 --- a/src/dev/x86/pc.cc +++ b/src/dev/x86/pc.cc @@ -37,10 +37,11 @@ #include <vector> #include "arch/x86/x86_traits.hh" -#include "dev/intel_8254_timer.hh" #include "cpu/intr_control.hh" #include "dev/terminal.hh" +#include "dev/x86/i8254.hh" #include "dev/x86/pc.hh" +#include "dev/x86/south_bridge/south_bridge.hh" #include "sim/system.hh" using namespace std; @@ -58,7 +59,7 @@ void PC::init() { assert(southBridge); - Intel8254Timer & timer = southBridge->pit.pit; + I8254 & timer = *southBridge->pit; //Timer 0, mode 2, no bcd, 16 bit count timer.writeControl(0x34); //Timer 0, latch command |