130,131c130,134
< l0_cntrl.bufferToL1 = l1_cntrl.bufferFromL0
< l0_cntrl.bufferFromL1 = l1_cntrl.bufferToL0
---
> l0_cntrl.mandatoryQueue = MessageBuffer()
> l0_cntrl.bufferToL1 = MessageBuffer(ordered = True)
> l1_cntrl.bufferFromL0 = l0_cntrl.bufferToL1
> l0_cntrl.bufferFromL1 = MessageBuffer(ordered = True)
> l1_cntrl.bufferToL0 = l0_cntrl.bufferFromL1
134,136c137,142
< l1_cntrl.requestToL2 = ruby_system.network.slave
< l1_cntrl.responseToL2 = ruby_system.network.slave
< l1_cntrl.unblockToL2 = ruby_system.network.slave
---
> l1_cntrl.requestToL2 = MessageBuffer()
> l1_cntrl.requestToL2.master = ruby_system.network.slave
> l1_cntrl.responseToL2 = MessageBuffer()
> l1_cntrl.responseToL2.master = ruby_system.network.slave
> l1_cntrl.unblockToL2 = MessageBuffer()
> l1_cntrl.unblockToL2.master = ruby_system.network.slave
138,139c144,147
< l1_cntrl.requestFromL2 = ruby_system.network.master
< l1_cntrl.responseFromL2 = ruby_system.network.master
---
> l1_cntrl.requestFromL2 = MessageBuffer()
> l1_cntrl.requestFromL2.slave = ruby_system.network.master
> l1_cntrl.responseFromL2 = MessageBuffer()
> l1_cntrl.responseFromL2.slave = ruby_system.network.master
158,160c166,171
< l2_cntrl.DirRequestFromL2Cache = ruby_system.network.slave
< l2_cntrl.L1RequestFromL2Cache = ruby_system.network.slave
< l2_cntrl.responseFromL2Cache = ruby_system.network.slave
---
> l2_cntrl.DirRequestFromL2Cache = MessageBuffer()
> l2_cntrl.DirRequestFromL2Cache.master = ruby_system.network.slave
> l2_cntrl.L1RequestFromL2Cache = MessageBuffer()
> l2_cntrl.L1RequestFromL2Cache.master = ruby_system.network.slave
> l2_cntrl.responseFromL2Cache = MessageBuffer()
> l2_cntrl.responseFromL2Cache.master = ruby_system.network.slave
162,164c173,178
< l2_cntrl.unblockToL2Cache = ruby_system.network.master
< l2_cntrl.L1RequestToL2Cache = ruby_system.network.master
< l2_cntrl.responseToL2Cache = ruby_system.network.master
---
> l2_cntrl.unblockToL2Cache = MessageBuffer()
> l2_cntrl.unblockToL2Cache.slave = ruby_system.network.master
> l2_cntrl.L1RequestToL2Cache = MessageBuffer()
> l2_cntrl.L1RequestToL2Cache.slave = ruby_system.network.master
> l2_cntrl.responseToL2Cache = MessageBuffer()
> l2_cntrl.responseToL2Cache.slave = ruby_system.network.master
194,196c208,214
< dir_cntrl.requestToDir = ruby_system.network.master
< dir_cntrl.responseToDir = ruby_system.network.master
< dir_cntrl.responseFromDir = ruby_system.network.slave
---
> dir_cntrl.requestToDir = MessageBuffer()
> dir_cntrl.requestToDir.slave = ruby_system.network.master
> dir_cntrl.responseToDir = MessageBuffer()
> dir_cntrl.responseToDir.slave = ruby_system.network.master
> dir_cntrl.responseFromDir = MessageBuffer()
> dir_cntrl.responseFromDir.master = ruby_system.network.slave
> dir_cntrl.responseFromMemory = MessageBuffer()
215,216c233,237
< dma_cntrl.responseFromDir = ruby_system.network.master
< dma_cntrl.requestToDir = ruby_system.network.slave
---
> dma_cntrl.mandatoryQueue = MessageBuffer()
> dma_cntrl.responseFromDir = MessageBuffer(ordered = True)
> dma_cntrl.responseFromDir.slave = ruby_system.network.master
> dma_cntrl.requestToDir = MessageBuffer()
> dma_cntrl.requestToDir.master = ruby_system.network.slave
234,235c255,259
< io_controller.responseFromDir = ruby_system.network.master
< io_controller.requestToDir = ruby_system.network.slave
---
> io_controller.mandatoryQueue = MessageBuffer()
> io_controller.responseFromDir = MessageBuffer(ordered = True)
> io_controller.responseFromDir.slave = ruby_system.network.master
> io_controller.requestToDir = MessageBuffer()
> io_controller.requestToDir.master = ruby_system.network.slave