derek/DRAMSys
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.rhrk.uni-kl.de:EIT-Wehn/dram.vp.system

Browse Source
This commit is contained in:
Matthias Jung
2014-07-29 15:18:30 +02:00
parent f74386a38e 8af2f3b898
commit 6ebafb9ece
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dram/src/simulation/Arbiter.h
View File

@@ -56,7 +56,7 @@ private:
return TLM_ACCEPTED;
}
// Initiated by .stl players
// Initiated by senders
tlm_sync_enum nb_transport_fw(int socketId, tlm_generic_payload& payload, tlm_phase& phase,
sc_time& fwDelay)
{
@@ -74,7 +74,7 @@ private:
void peqCallback(tlm_generic_payload& payload, const tlm_phase& phase)
{
//Phases initiated by .stl players
//Phases initiated by intiator side
if (phase == BEGIN_REQ)
{
if(channelIsFree)
@@ -93,11 +93,11 @@ private:
sendToChannel(payload, phase, SC_ZERO_TIME );
}
//Phases initiated by dram backend
//Phases initiated by dram side
else if (phase == END_REQ)
{
channelIsFree = true;
sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
if(!backpressure.empty())
{
@@ -109,7 +109,7 @@ private:
}
else if (phase == BEGIN_RESP)
{
sendToTraceplayer(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
sendToInitiator(DramExtension::getExtension(payload).getThread().ID()-1, payload, phase, SC_ZERO_TIME);
}
else
@@ -125,7 +125,7 @@ private:
iSocket->nb_transport_fw(payload, TPhase, TDelay);
}
void sendToTraceplayer(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
void sendToInitiator(unsigned int id, tlm_generic_payload& payload, const tlm_phase& phase, const sc_time& delay)
{
tlm_phase TPhase = phase;
sc_time TDelay = delay;