diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-09 13:44:19 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-03-09 13:44:19 -0500 |
| commit | ffaba200d1078f19a1d56af803420a79a96f7fe2 (patch) | |
| tree | a24789bceac0ce3718baee689068a68cc533b1d4 /objects | |
| parent | a99607863fd80a1a81c29aa3d24553ece2ab8d47 (diff) | |
| parent | 21946f071026d3b3c4122ef41d755f883e22e668 (diff) | |
| download | gem5-ffaba200d1078f19a1d56af803420a79a96f7fe2.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 0121d59e46f0961f753c2e1bd0fa1c63642d859e
Diffstat (limited to 'objects')
| -rw-r--r-- | objects/CoherenceProtocol.mpy | 2 | ||||
| -rw-r--r-- | objects/Ide.mpy | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/objects/CoherenceProtocol.mpy b/objects/CoherenceProtocol.mpy index ae041b638..f3b0026b7 100644 --- a/objects/CoherenceProtocol.mpy +++ b/objects/CoherenceProtocol.mpy @@ -1,4 +1,4 @@ -Coherence = Enum('uni', 'msi', 'mesi', 'mosi', 'moesi') +class Coherence(Enum): vals = ['uni', 'msi', 'mesi', 'mosi', 'moesi'] simobj CoherenceProtocol(SimObject): type = 'CoherenceProtocol' diff --git a/objects/Ide.mpy b/objects/Ide.mpy index c4aa2aca0..ce760ad96 100644 --- a/objects/Ide.mpy +++ b/objects/Ide.mpy @@ -1,6 +1,6 @@ from Pci import PciDevice -IdeID = Enum('master', 'slave') +class IdeID(Enum): vals = ['master', 'slave'] simobj IdeDisk(SimObject): type = 'IdeDisk' |