195c195
< def changeToAtomic(system):
---
> def changeMemoryMode(system, mode):
199c199
< if system.getMemoryMode() != objects.params.atomic:
---
> if system.getMemoryMode() != mode:
201,202c201,203
< print "Changing memory mode to atomic"
< system.setMemoryMode(objects.params.atomic)
---
> system.setMemoryMode(mode)
> else:
> print "System already in target mode. Memory mode unchanged."
204,207c205,207
< def changeToTiming(system):
< if not isinstance(system, (objects.Root, objects.System)):
< raise TypeError, "Parameter of type '%s'. Must be type %s or %s." % \
< (type(system), objects.Root, objects.System)
---
> def changeToAtomic(system, **kwargs):
> print "Changing memory mode to atomic"
> changeMemoryMode(system, objects.params.atomic, **kwargs)
209,212c209,211
< if system.getMemoryMode() != objects.params.timing:
< doDrain(system)
< print "Changing memory mode to timing"
< system.setMemoryMode(objects.params.timing)
---
> def changeToTiming(system, **kwargs):
> print "Changing memory mode to timing"
> changeMemoryMode(system, objects.params.timing, **kwargs)