Skip to content

Commit 9211ad7

Browse files
committed
Merge branch 'next' into agpl_next
2 parents dd59dfa + ec4914b commit 9211ad7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+247
-155
lines changed

.github/workflows/ccpp.yml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,6 @@ jobs:
1414
sudo apt update
1515
sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
1616
mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
17-
x86_ubuntu16_build:
18-
name: Build and test on x86 Ubuntu 16.04
19-
strategy:
20-
matrix:
21-
compiler: [gcc, clang]
22-
runs-on: ubuntu-16.04
23-
steps:
24-
- uses: actions/checkout@v1
25-
- name: Build srsRAN on x86 Ubuntu 16.04
26-
run: |
27-
sudo apt update
28-
sudo apt install -y build-essential cmake libfftw3-dev libmbedtls-dev libpcsclite-dev libboost-program-options-dev libconfig++-dev libsctp-dev colordiff ninja-build valgrind
29-
mkdir build && cd build && cmake -DRF_FOUND=True -GNinja .. && ninja && ctest
3017
3118
aarch64_ubuntu18_build:
3219
runs-on: ubuntu-18.04

CHANGELOG

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
Change Log for Releases
22
=======================
33

4+
## 22.04
5+
* Added baseline 5G-SA support to srsUE and srsENB
6+
* Added dynamic loading of RF libraries
7+
* Added RRC Redirect to srsUE
8+
* Added support for A5 measurement events to srsENB
9+
* Added Crest Factor Reduction (CFR) for srsENB downlink and srsUE uplink (4G only)
10+
* Raise C++ standard to C++14
11+
* Other bug-fixes and improved stability and performance in all parts
12+
413
## 21.10
514
* Add initial 5G NSA support to srsENB (tested with OnePlus 5G Nord)
615
* Improved interoperability of srsUE in NSA mode

COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Files: *
2-
Copyright: 2013-2021, Software Radio Systems Limited.
2+
Copyright: 2013-2022, Software Radio Systems Limited.
33
License:
44

55

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ srsRAN is a 4G/5G software radio suite developed by [SRS](http://www.srs.io).
1010
See the [srsRAN project pages](https://www.srsran.com) for information, guides and project news.
1111

1212
The srsRAN suite includes:
13-
* srsUE - a full-stack SDR 4G/5G-NSA UE application (5G-SA coming soon)
14-
* srsENB - a full-stack SDR 4G/5G-NSA eNodeB application (5G-SA coming soon)
13+
* srsUE - a full-stack SDR 4G/5G UE application
14+
* srsENB - a full-stack SDR 4G/5G e(g)NodeB application
1515
* srsEPC - a light-weight 4G core network implementation with MME, HSS and S/P-GW
1616

1717
For application features, build instructions and user guides see the [srsRAN documentation](https://docs.srsran.com).

cmake/modules/SRSRANVersion.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
# and at http://www.gnu.org/licenses/.
1919
#
2020

21-
SET(SRSRAN_VERSION_MAJOR 21)
22-
SET(SRSRAN_VERSION_MINOR 10)
21+
SET(SRSRAN_VERSION_MAJOR 22)
22+
SET(SRSRAN_VERSION_MINOR 04)
2323
SET(SRSRAN_VERSION_PATCH 0)
2424
SET(SRSRAN_VERSION_STRING "${SRSRAN_VERSION_MAJOR}.${SRSRAN_VERSION_MINOR}.${SRSRAN_VERSION_PATCH}")
2525
SET(SRSRAN_SOVERSION 0)

lib/include/srsran/asn1/liblte_mme.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3649,6 +3649,8 @@ typedef struct {
36493649
// Functions
36503650
LIBLTE_ERROR_ENUM liblte_mme_pack_deactivate_eps_bearer_context_request_msg(
36513651
LIBLTE_MME_DEACTIVATE_EPS_BEARER_CONTEXT_REQUEST_MSG_STRUCT* deact_eps_bearer_context_req,
3652+
uint8 sec_hdr_type,
3653+
uint32 count,
36523654
LIBLTE_BYTE_MSG_STRUCT* msg);
36533655
LIBLTE_ERROR_ENUM liblte_mme_unpack_deactivate_eps_bearer_context_request_msg(
36543656
LIBLTE_BYTE_MSG_STRUCT* msg,

lib/include/srsran/asn1/nas_5g_ies.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,6 @@ class eps_nas_message_container_t
708708
class dnn_t
709709
{
710710
public:
711-
uint32_t length;
712711
std::vector<uint8_t> dnn_value;
713712

714713
SRSASN_CODE pack(asn1::bit_ref& bref);

lib/include/srsran/interfaces/rrc_interface_types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ inline uint16_t enum_to_number(const pmch_info_t::mch_sched_period_t& mch_period
407407

408408
struct mcch_msg_t {
409409
uint32_t nof_common_sf_alloc = 0;
410-
mbsfn_sf_cfg_t common_sf_alloc[8];
410+
mbsfn_sf_cfg_t common_sf_alloc[8] = {};
411411
enum class common_sf_alloc_period_t { rf4, rf8, rf16, rf32, rf64, rf128, rf256, nulltype } common_sf_alloc_period;
412412
uint32_t nof_pmch_info;
413413
pmch_info_t pmch_info_list[15];

lib/include/srsran/mac/mac_sch_pdu_nr.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ class mac_sch_subpdu_nr
140140
/// internal buffer, useful for storing very short SDUs.
141141
class sdu_buffer
142142
{
143-
static const uint8_t mac_ce_payload_len = 8 + 1; // Long BSR has max. 9 octets (see sizeof_ce() too)
144-
std::array<uint8_t, mac_ce_payload_len> ce_write_buffer; // Buffer for CE payload
145-
uint8_t* sdu = nullptr;
143+
static const uint8_t mac_ce_payload_len = 8 + 1; // Long BSR has max. 9 octets (see sizeof_ce() too)
144+
std::array<uint8_t, mac_ce_payload_len> ce_write_buffer = {}; // Buffer for CE payload
145+
uint8_t* sdu = nullptr;
146146

147147
public:
148148
sdu_buffer() = default;

lib/include/srsran/radio/radio_dummy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,15 @@ class radio_dummy : public srsran::radio_base, public srsran::radio_interface_ph
171171
}
172172

173173
// Create receiver ring buffers
174-
rx_ring_buffers.resize(args_.nof_carriers * args_.nof_antennas);
174+
rx_ring_buffers.resize(args_.nof_carriers * (size_t)args_.nof_antennas);
175175
for (auto& rb : rx_ring_buffers) {
176176
if (srsran_ringbuffer_init(&rb, (int)sizeof(cf_t) * TEMP_BUFFER_SZ) != SRSRAN_SUCCESS) {
177177
perror("init softbuffer");
178178
}
179179
}
180180

181181
// Create transmitter ring buffers
182-
tx_ring_buffers.resize(args_.nof_carriers * args_.nof_antennas);
182+
tx_ring_buffers.resize(args_.nof_carriers * (size_t)args_.nof_antennas);
183183
for (auto& rb : tx_ring_buffers) {
184184
if (srsran_ringbuffer_init(&rb, (int)sizeof(cf_t) * TEMP_BUFFER_SZ) != SRSRAN_SUCCESS) {
185185
perror("init softbuffer");

0 commit comments

Comments
 (0)