F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug-fix LteHarqPhy::UpdateHarqProcessInfo sizes in bits instead of bytes

Browse Source
This commit is contained in:
Marco Miozzo
2012-10-30 16:59:23 +01:00
parent cd3c9b9b98
commit 9c48c4df9d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/lte/model/lte-harq-phy.cc
View File

@@ -127,7 +127,7 @@ LteHarqPhy::GetHarqProcessInfoUl (uint16_t rnti, uint8_t harqProcId)
void
LteHarqPhy::UpdateDlHarqProcessStatus (uint8_t id, uint8_t layer, double mi, uint16_t infoBits, uint16_t codeBits)
LteHarqPhy::UpdateDlHarqProcessStatus (uint8_t id, uint8_t layer, double mi, uint16_t infoBytes, uint16_t codeBytes)
{
NS_LOG_FUNCTION (this << (uint16_t) id << mi);
if (m_miDlHarqProcessesInfoMap.at (layer).at (id).size () == 3) // MAX HARQ RETX
@@ -137,8 +137,8 @@ LteHarqPhy::UpdateDlHarqProcessStatus (uint8_t id, uint8_t layer, double mi, uin
}
HarqProcessInfoElement_t el;
el.m_mi = mi;
el.m_infoBits = infoBits;
el.m_codeBits = codeBits;
el.m_infoBits = infoBytes * 8;
el.m_codeBits = codeBytes * 8;
m_miDlHarqProcessesInfoMap.at (layer).at (id).push_back (el);
}
@@ -156,7 +156,7 @@ LteHarqPhy::ResetDlHarqProcessStatus (uint8_t id)
void
LteHarqPhy::UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBits, uint16_t codeBits)
LteHarqPhy::UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBytes, uint16_t codeBytes)
{
NS_LOG_FUNCTION (this << rnti << mi);
std::map <uint16_t, std::vector <HarqProcessInfoList_t> >::iterator it;
@@ -168,8 +168,8 @@ LteHarqPhy::UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBi
harqList.resize (8);
HarqProcessInfoElement_t el;
el.m_mi = mi;
el.m_infoBits = infoBits;
el.m_codeBits = codeBits;
el.m_infoBits = infoBytes * 8;
el.m_codeBits = codeBytes * 8;
harqList.at (7).push_back (el);
m_miUlHarqProcessesInfoMap.insert (std::pair <uint16_t, std::vector <HarqProcessInfoList_t> > (rnti, harqList));
}
@@ -182,8 +182,8 @@ LteHarqPhy::UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBi
}
HarqProcessInfoElement_t el;
el.m_mi = mi;
el.m_infoBits = infoBits;
el.m_codeBits = codeBits;
el.m_infoBits = infoBytes * 8;
el.m_codeBits = codeBytes * 8;
(*it).second.at (7).push_back (el);
}
}

8
src/lte/model/lte-harq-phy.h
View File

@@ -100,8 +100,10 @@ public:
* \param id the HARQ proc id
* \param layer layer no. (for MIMO spatail multiplexing)
* \param mi the new MI
* \param infoBytes the no. of bytes of info
* \param mi the total no. of bytes txed
*/
void UpdateDlHarqProcessStatus (uint8_t id, uint8_t layer, double mi, uint16_t infoBits, uint16_t codeBits);
void UpdateDlHarqProcessStatus (uint8_t id, uint8_t layer, double mi, uint16_t infoBytes, uint16_t codeBytes);
/**
* \brief Reset the info associated to the decodification of an HARQ process
@@ -115,8 +117,10 @@ public:
* for DL (asynchronous)
* \param rnti the RNTI of the transmitter
* \param mi the new MI
* \param infoBytes the no. of bytes of info
* \param mi the total no. of bytes txed
*/
void UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBits, uint16_t codeBits);
void UpdateUlHarqProcessStatus (uint16_t rnti, double mi, uint16_t infoBytes, uint16_t codeBytes);
/**
* \brief Reset the info associated to the decodification of an HARQ process