Skip to content

Commit 655a098

Browse files
committed
Merge branch 'next' into agpl_next
2 parents 3a53370 + adc0e2d commit 655a098

Some content is hidden

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

52 files changed

+52931
-16338
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Change Log for Releases
22
=======================
33
## 23.04
44
* Introduced configurable s1 connection timer
5+
* Updated 4G RRC ASN.1 to Rel 17
56
* Added reestablishment support during S1-Handover
67
* Added basic support for NSSAI based slicing in UE & gNodeB
78
* Updated the RRC to enable srsUE compatibility with new srsgnb

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ srsRAN
33

44
[![Build Status](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/ccpp.yml)
55
[![CodeQL](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml/badge.svg?branch=master)](https://github.com/srsran/srsRAN_4G/actions/workflows/codeql.yml)
6-
[![Coverity](https://scan.coverity.com/projects/23045/badge.svg)](https://scan.coverity.com/projects/srsran)
6+
[![Coverity](https://scan.coverity.com/projects/28268/badge.svg)](https://scan.coverity.com/projects/srsran_4g_agpl)
77

88
srsRAN is an open source 4G software radio suite developed by [SRS](http://www.srs.io). For 5G RAN, see our new O-RAN CU/DU solution - [srsRAN Project](https://www.github.com/srsran/srsran_project).
99

lib/examples/pdsch_ue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ int main(int argc, char** argv)
642642

643643
#ifdef ENABLE_GUI
644644
if (!prog_args.disable_plots) {
645-
init_plots(cell);
645+
init_plots();
646646
sleep(1);
647647
}
648648
#endif /* ENABLE_GUI */

lib/examples/pssch_ue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ int main(int argc, char** argv)
394394

395395
#ifdef ENABLE_GUI
396396
if (!prog_args.disable_plots) {
397-
init_plots(&pscch);
397+
init_plots();
398398
sleep(1);
399399
}
400400
#endif

lib/include/srsran/asn1/asn1_utils.h

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ class bit_ref_impl
141141
bit_ref_impl() = default;
142142
bit_ref_impl(Ptr start_ptr_, uint32_t max_size_) :
143143
ptr(start_ptr_), start_ptr(start_ptr_), max_ptr(max_size_ + start_ptr_)
144-
{}
144+
{
145+
}
145146

146147
int distance(const bit_ref_impl<Ptr>& other) const;
147148
int distance(const uint8_t* ref_ptr) const;
@@ -1286,7 +1287,8 @@ struct choice_buffer_base_t {
12861287

12871288
template <typename... Ts>
12881289
struct choice_buffer_t : public choice_buffer_base_t<static_max<sizeof(alignment_t), sizeof(Ts)...>::value,
1289-
static_max<alignof(alignment_t), alignof(Ts)...>::value> {};
1290+
static_max<alignof(alignment_t), alignof(Ts)...>::value> {
1291+
};
12901292

12911293
using pod_choice_buffer_t = choice_buffer_t<>;
12921294

@@ -1548,6 +1550,11 @@ struct setup_release_c {
15481550
return c;
15491551
}
15501552

1553+
bool operator==(const setup_release_c<T>& other) const
1554+
{
1555+
return type_ == other.type_ and (type_ != types::setup or (c == other.c));
1556+
}
1557+
15511558
private:
15521559
types type_;
15531560
T c;
@@ -1654,15 +1661,18 @@ struct base_ie_field : public IEItem {
16541661

16551662
// ProtocolIE-Field{LAYER-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE{{IEsSetParam}}
16561663
template <class IEsSetParam>
1657-
struct protocol_ie_field_s : public detail::base_ie_field<detail::ie_field_value_item<IEsSetParam> > {};
1664+
struct protocol_ie_field_s : public detail::base_ie_field<detail::ie_field_value_item<IEsSetParam> > {
1665+
};
16581666

16591667
// ProtocolIE-SingleContainer{LAYER-PROTOCOL-IES : IEsSetParam} ::= SEQUENCE{{IEsSetParam}}
16601668
template <class ies_set_paramT_>
1661-
struct protocol_ie_single_container_s : public protocol_ie_field_s<ies_set_paramT_> {};
1669+
struct protocol_ie_single_container_s : public protocol_ie_field_s<ies_set_paramT_> {
1670+
};
16621671

16631672
// ProtocolExtensionField{LAYER-PROTOCOL-EXTENSION : ExtensionSetParam} ::= SEQUENCE{{LAYER-PROTOCOL-EXTENSION}}
16641673
template <class ExtensionSetParam>
1665-
struct protocol_ext_field_s : public detail::base_ie_field<detail::ie_field_ext_item<ExtensionSetParam> > {};
1674+
struct protocol_ext_field_s : public detail::base_ie_field<detail::ie_field_ext_item<ExtensionSetParam> > {
1675+
};
16661676

16671677
namespace detail {
16681678

0 commit comments

Comments
 (0)