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

lte: Pass complete PDCP SDU params from LtePdcpSapProvider to LtePdcp

Browse Source 
See merge request !268
This commit is contained in:
ZorazeAli
2021-05-27 11:26:25 +02:00
parent 77d6088608
commit ebfec2d7a7
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lte/model/lte-pdcp-sap.h
View File

@@ -48,9 +48,10 @@ public:
};
/**
* Send a RRC PDU to the RDCP for transmission
* This method is to be called
* when upper RRC entity has a RRC PDU ready to send
* Send RRC PDU parameters to the PDCP for transmission
*
* This method is to be called when upper RRC entity has a
* RRC PDU ready to send
*
* \param params
*/
@@ -123,7 +124,7 @@ LtePdcpSpecificLtePdcpSapProvider<C>::LtePdcpSpecificLtePdcpSapProvider ()
template <class C>
void LtePdcpSpecificLtePdcpSapProvider<C>::TransmitPdcpSdu (TransmitPdcpSduParameters params)
{
m_pdcp->DoTransmitPdcpSdu (params.pdcpSdu);
m_pdcp->DoTransmitPdcpSdu (params);
}

15
src/lte/model/lte-pdcp.cc
View File

@@ -174,9 +174,10 @@ LtePdcp::SetStatus (Status s)
////////////////////////////////////////
void
LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p)
LtePdcp::DoTransmitPdcpSdu (LtePdcpSapProvider::TransmitPdcpSduParameters params)
{
NS_LOG_FUNCTION (this << m_rnti << (uint32_t) m_lcid << p->GetSize ());
NS_LOG_FUNCTION (this << m_rnti << static_cast <uint16_t> (m_lcid) << params.pdcpSdu->GetSize ());
Ptr<Packet> p = params.pdcpSdu;
// Sender timestamp
PdcpTag pdcpTag (Simulator::Now ());
@@ -198,12 +199,12 @@ LtePdcp::DoTransmitPdcpSdu (Ptr<Packet> p)
m_txPdu (m_rnti, m_lcid, p->GetSize ());
LteRlcSapProvider::TransmitPdcpPduParameters params;
params.rnti = m_rnti;
params.lcid = m_lcid;
params.pdcpPdu = p;
LteRlcSapProvider::TransmitPdcpPduParameters txParams;
txParams.rnti = m_rnti;
txParams.lcid = m_lcid;
txParams.pdcpPdu = p;
m_rlcSapProvider->TransmitPdcpPdu (params);
m_rlcSapProvider->TransmitPdcpPdu (txParams);
}
void

4
src/lte/model/lte-pdcp.h
View File

@@ -145,9 +145,9 @@ protected:
/**
* Interface provided to upper RRC entity
*
* \param p packet
* \param params the TransmitPdcpSduParameters
*/
virtual void DoTransmitPdcpSdu (Ptr<Packet> p);
virtual void DoTransmitPdcpSdu (LtePdcpSapProvider::TransmitPdcpSduParameters params);
LtePdcpSapUser* m_pdcpSapUser; ///< PDCP SAP user
LtePdcpSapProvider* m_pdcpSapProvider; ///< PDCP SAP provider