mirror of https://github.com/pvnis/srsRAN_4G.git
Merge branch 'rlc_refactor' into next
Andre Puschmann
7 years ago
commit
74e38ee0a2
@ -1,87 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
* \section COPYRIGHT
|
|
||||||
*
|
|
||||||
* Copyright 2013-2015 Software Radio Systems Limited
|
|
||||||
*
|
|
||||||
* \section LICENSE
|
|
||||||
*
|
|
||||||
* This file is part of the srsUE library.
|
|
||||||
*
|
|
||||||
* srsUE is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of
|
|
||||||
* the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* srsUE is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* A copy of the GNU Affero General Public License can be found in
|
|
||||||
* the LICENSE file in the top-level directory of this distribution
|
|
||||||
* and at http://www.gnu.org/licenses/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef SRSLTE_RLC_ENTITY_H
|
|
||||||
#define SRSLTE_RLC_ENTITY_H
|
|
||||||
|
|
||||||
#include "srslte/common/log.h"
|
|
||||||
#include "srslte/common/common.h"
|
|
||||||
#include "srslte/interfaces/ue_interfaces.h"
|
|
||||||
#include "srslte/upper/rlc_common.h"
|
|
||||||
#include "srslte/upper/rlc_tm.h"
|
|
||||||
#include "srslte/upper/rlc_um.h"
|
|
||||||
#include "srslte/upper/rlc_am.h"
|
|
||||||
|
|
||||||
namespace srslte {
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************
|
|
||||||
* RLC Entity
|
|
||||||
* Common container for all RLC entities
|
|
||||||
***************************************************************************/
|
|
||||||
class rlc_entity
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
rlc_entity();
|
|
||||||
void init(rlc_mode_t mode,
|
|
||||||
log *rlc_entity_log_,
|
|
||||||
uint32_t lcid_,
|
|
||||||
srsue::pdcp_interface_rlc *pdcp_,
|
|
||||||
srsue::rrc_interface_rlc *rrc_,
|
|
||||||
mac_interface_timers *mac_timers_,
|
|
||||||
int buffer_size = -1); // use -1 for default buffer sizes
|
|
||||||
|
|
||||||
void configure(srslte_rlc_config_t cnfg);
|
|
||||||
void reestablish();
|
|
||||||
void stop();
|
|
||||||
void empty_queue();
|
|
||||||
bool active();
|
|
||||||
|
|
||||||
rlc_mode_t get_mode();
|
|
||||||
uint32_t get_bearer();
|
|
||||||
|
|
||||||
// PDCP interface
|
|
||||||
void write_sdu(byte_buffer_t *sdu);
|
|
||||||
void write_sdu_nb(byte_buffer_t *sdu);
|
|
||||||
|
|
||||||
// MAC interface
|
|
||||||
uint32_t get_buffer_state();
|
|
||||||
uint32_t get_total_buffer_state();
|
|
||||||
int read_pdu(uint8_t *payload, uint32_t nof_bytes);
|
|
||||||
void write_pdu(uint8_t *payload, uint32_t nof_bytes);
|
|
||||||
|
|
||||||
|
|
||||||
private:
|
|
||||||
rlc_mode_t mode;
|
|
||||||
uint32_t lcid;
|
|
||||||
rlc_common *rlc;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace srslte
|
|
||||||
|
|
||||||
|
|
||||||
#endif // SRSLTE_RLC_ENTITY_H
|
|
||||||
@ -1,170 +0,0 @@
|
|||||||
/**
|
|
||||||
*
|
|
||||||
* \section COPYRIGHT
|
|
||||||
*
|
|
||||||
* Copyright 2013-2015 Software Radio Systems Limited
|
|
||||||
*
|
|
||||||
* \section LICENSE
|
|
||||||
*
|
|
||||||
* This file is part of the srsUE library.
|
|
||||||
*
|
|
||||||
* srsUE is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of
|
|
||||||
* the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* srsUE is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* A copy of the GNU Affero General Public License can be found in
|
|
||||||
* the LICENSE file in the top-level directory of this distribution
|
|
||||||
* and at http://www.gnu.org/licenses/.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "srslte/upper/rlc_entity.h"
|
|
||||||
|
|
||||||
namespace srslte {
|
|
||||||
|
|
||||||
rlc_entity::rlc_entity()
|
|
||||||
:rlc(NULL)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void rlc_entity::init(rlc_mode_t mode_,
|
|
||||||
log *rlc_entity_log_,
|
|
||||||
uint32_t lcid_,
|
|
||||||
srsue::pdcp_interface_rlc *pdcp_,
|
|
||||||
srsue::rrc_interface_rlc *rrc_,
|
|
||||||
mac_interface_timers *mac_timers_,
|
|
||||||
int buffer_size)
|
|
||||||
{
|
|
||||||
|
|
||||||
if (buffer_size <= 0) {
|
|
||||||
buffer_size = rlc_common::RLC_BUFFER_NOF_PDU;
|
|
||||||
}
|
|
||||||
// Create the RLC instance the first time init() is called.
|
|
||||||
// If called to reestablished, the entity is stopped but not destroyed
|
|
||||||
// Next call to init() must use same mode
|
|
||||||
if (rlc == NULL) {
|
|
||||||
switch(mode_)
|
|
||||||
{
|
|
||||||
case RLC_MODE_TM:
|
|
||||||
rlc = new rlc_tm((uint32_t) buffer_size);
|
|
||||||
break;
|
|
||||||
case RLC_MODE_UM:
|
|
||||||
rlc = new rlc_um((uint32_t) buffer_size);
|
|
||||||
break;
|
|
||||||
case RLC_MODE_AM:
|
|
||||||
rlc = new rlc_am((uint32_t) buffer_size);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
rlc_entity_log_->error("Invalid RLC mode - defaulting to TM\n");
|
|
||||||
rlc = new rlc_tm((uint32_t) buffer_size);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
lcid = lcid_;
|
|
||||||
mode = mode_;
|
|
||||||
} else {
|
|
||||||
if (lcid != lcid_) {
|
|
||||||
rlc_entity_log_->warning("Reestablishing RLC instance. LCID changed from %d to %d\n", lcid, lcid_);
|
|
||||||
lcid = lcid_;
|
|
||||||
}
|
|
||||||
if (mode != mode_) {
|
|
||||||
rlc_entity_log_->console("Error reestablishing RLC instance. Mode changed from %d to %d. \n", mode, mode_);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rlc->init(rlc_entity_log_, lcid_, pdcp_, rrc_, mac_timers_);
|
|
||||||
}
|
|
||||||
|
|
||||||
void rlc_entity::configure(srslte_rlc_config_t cnfg)
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
rlc->configure(cnfg);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reestablishment stops the entity but does not destroy it. Mode will not change
|
|
||||||
void rlc_entity::reestablish() {
|
|
||||||
rlc->reestablish();
|
|
||||||
}
|
|
||||||
|
|
||||||
// A call to stop() stops the entity and clears deletes the instance. Next time this entity can be used for other mode.
|
|
||||||
void rlc_entity::stop()
|
|
||||||
{
|
|
||||||
rlc->stop();
|
|
||||||
delete rlc;
|
|
||||||
rlc = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void rlc_entity::empty_queue()
|
|
||||||
{
|
|
||||||
rlc->empty_queue();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool rlc_entity::active()
|
|
||||||
{
|
|
||||||
return (rlc != NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
rlc_mode_t rlc_entity::get_mode()
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
return rlc->get_mode();
|
|
||||||
else
|
|
||||||
return RLC_MODE_TM;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t rlc_entity::get_bearer()
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
return rlc->get_bearer();
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// PDCP interface
|
|
||||||
void rlc_entity::write_sdu(byte_buffer_t *sdu)
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
rlc->write_sdu(sdu);
|
|
||||||
}
|
|
||||||
|
|
||||||
void rlc_entity::write_sdu_nb(byte_buffer_t *sdu)
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
rlc->write_sdu_nb(sdu);
|
|
||||||
}
|
|
||||||
|
|
||||||
// MAC interface
|
|
||||||
uint32_t rlc_entity::get_buffer_state()
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
return rlc->get_buffer_state();
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t rlc_entity::get_total_buffer_state()
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
return rlc->get_total_buffer_state();
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int rlc_entity::read_pdu(uint8_t *payload, uint32_t nof_bytes)
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
return rlc->read_pdu(payload, nof_bytes);
|
|
||||||
else
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
void rlc_entity::write_pdu(uint8_t *payload, uint32_t nof_bytes)
|
|
||||||
{
|
|
||||||
if(rlc)
|
|
||||||
rlc->write_pdu(payload, nof_bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace srsue
|
|
||||||
Loading…
Reference in New Issue