Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wangjie
OpenXG-RAN
Commits
3ee1a481
Commit
3ee1a481
authored
Jan 03, 2021
by
Chenyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug
parent
0dde97b5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
9 deletions
+23
-9
executables/nr-uesoftmodem.c
executables/nr-uesoftmodem.c
+4
-4
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+4
-1
openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
+3
-0
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+12
-4
No files found.
executables/nr-uesoftmodem.c
View file @
3ee1a481
...
@@ -615,7 +615,7 @@ void *rrc_enb_process_msg(void *notUsed) {
...
@@ -615,7 +615,7 @@ void *rrc_enb_process_msg(void *notUsed) {
return
NULL
;
return
NULL
;
}
}
extern
void
tesths
(
void
);
//FINISH:test
//
extern void tesths(void);//FINISH:test
int
main
(
int
argc
,
char
**
argv
)
{
int
main
(
int
argc
,
char
**
argv
)
{
//uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
//uint8_t beta_ACK=0,beta_RI=0,beta_CQI=2;
...
@@ -678,9 +678,9 @@ int main( int argc, char **argv ) {
...
@@ -678,9 +678,9 @@ int main( int argc, char **argv ) {
#endif
#endif
*/
*/
printf
(
"witcomm111witcomm:
\n
"
);
//FINISH:test
//
printf("witcomm111witcomm: \n");//FINISH:test
tesths
();
//
tesths();
printf
(
"witcomm111witcomm
\n
"
);
//
printf("witcomm111witcomm \n");
NB_UE_INST
=
1
;
NB_UE_INST
=
1
;
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
3ee1a481
...
@@ -779,9 +779,11 @@ static void add_srb(int rnti, struct NR_SRB_ToAddMod *s)
...
@@ -779,9 +779,11 @@ static void add_srb(int rnti, struct NR_SRB_ToAddMod *s)
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
);
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
);
exit
(
1
);
exit
(
1
);
}
}
printf
(
"1111111
\n
"
);
//QUES
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager
);
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager
);
printf
(
"2222222
\n
"
);
//QUES
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
rnti
);
ue
=
nr_pdcp_manager_get_ue
(
nr_pdcp_ue_manager
,
rnti
);
printf
(
"3333333
\n
"
);
//QUES
if
(
ue
->
srb
[
srb_id
-
1
]
!=
NULL
)
{
if
(
ue
->
srb
[
srb_id
-
1
]
!=
NULL
)
{
LOG_W
(
PDCP
,
"%s:%d:%s: warning DRB %d already exist for ue %d, do nothing
\n
"
,
LOG_W
(
PDCP
,
"%s:%d:%s: warning DRB %d already exist for ue %d, do nothing
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
,
rnti
);
__FILE__
,
__LINE__
,
__FUNCTION__
,
srb_id
,
rnti
);
...
@@ -881,6 +883,7 @@ boolean_t nr_rrc_pdcp_config_asn1_req(
...
@@ -881,6 +883,7 @@ boolean_t nr_rrc_pdcp_config_asn1_req(
if
(
srb2add_list
!=
NULL
)
{
if
(
srb2add_list
!=
NULL
)
{
for
(
i
=
0
;
i
<
srb2add_list
->
list
.
count
;
i
++
)
{
for
(
i
=
0
;
i
<
srb2add_list
->
list
.
count
;
i
++
)
{
printf
(
"-------i:%d,count:%d-----------
\n
"
,
i
,
srb2add_list
->
list
.
count
);
//QUES
add_srb
(
rnti
,
srb2add_list
->
list
.
array
[
i
]);
add_srb
(
rnti
,
srb2add_list
->
list
.
array
[
i
]);
}
}
}
}
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_ue_manager.c
View file @
3ee1a481
...
@@ -59,10 +59,13 @@ int nr_pdcp_manager_get_enb_flag(nr_pdcp_ue_manager_t *_m)
...
@@ -59,10 +59,13 @@ int nr_pdcp_manager_get_enb_flag(nr_pdcp_ue_manager_t *_m)
void
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager_t
*
_m
)
void
nr_pdcp_manager_lock
(
nr_pdcp_ue_manager_t
*
_m
)
{
{
nr_pdcp_ue_manager_internal_t
*
m
=
_m
;
nr_pdcp_ue_manager_internal_t
*
m
=
_m
;
printf
(
"aaaaaaaaa
\n
"
);
//QUES
if
(
pthread_mutex_lock
(
&
m
->
lock
))
{
if
(
pthread_mutex_lock
(
&
m
->
lock
))
{
LOG_E
(
PDCP
,
"%s:%d:%s: fatal
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
LOG_E
(
PDCP
,
"%s:%d:%s: fatal
\n
"
,
__FILE__
,
__LINE__
,
__FUNCTION__
);
printf
(
"bbbbbbbbb
\n
"
);
//QUES
exit
(
1
);
exit
(
1
);
}
}
printf
(
"ccccccccc
\n
"
);
//QUES
}
}
void
nr_pdcp_manager_unlock
(
nr_pdcp_ue_manager_t
*
_m
)
void
nr_pdcp_manager_unlock
(
nr_pdcp_ue_manager_t
*
_m
)
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
3ee1a481
...
@@ -1528,22 +1528,28 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
...
@@ -1528,22 +1528,28 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
// Get configuration
// Get configuration
// Release T300 timer
// Release T300 timer
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
T300_active
=
0
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
T300_active
=
0
;
printf
(
"011111111111111111
\n
"
);
//QUES
nr_rrc_ue_process_masterCellGroup
(
nr_rrc_ue_process_masterCellGroup
(
ctxt_pP
,
ctxt_pP
,
gNB_index
,
gNB_index
,
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
masterCellGroup
);
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
masterCellGroup
);
printf
(
"022222222222222222
\n
"
);
//QUES
nr_sa_rrc_ue_process_radioBearerConfig
(
nr_sa_rrc_ue_process_radioBearerConfig
(
ctxt_pP
,
ctxt_pP
,
gNB_index
,
gNB_index
,
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
radioBearerConfig
);
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
radioBearerConfig
);
printf
(
"033333333333333333
\n
"
);
//QUES
nr_rrc_set_state
(
ctxt_pP
->
module_id
,
RRC_STATE_CONNECTED
);
nr_rrc_set_state
(
ctxt_pP
->
module_id
,
RRC_STATE_CONNECTED
);
printf
(
"044444444444444444
\n
"
);
//QUES
nr_rrc_set_sub_state
(
ctxt_pP
->
module_id
,
RRC_SUB_STATE_CONNECTED
);
nr_rrc_set_sub_state
(
ctxt_pP
->
module_id
,
RRC_SUB_STATE_CONNECTED
);
printf
(
"055555555555555555
\n
"
);
//QUES
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
rnti
=
ctxt_pP
->
rnti
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
rnti
=
ctxt_pP
->
rnti
;
rrc_ue_generate_RRCSetupComplete
(
rrc_ue_generate_RRCSetupComplete
(
ctxt_pP
,
ctxt_pP
,
gNB_index
,
gNB_index
,
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
rrc_TransactionIdentifier
,
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
rrc_TransactionIdentifier
,
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
selected_plmn_identity
);
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
selected_plmn_identity
);
printf
(
"066666666666666666
\n
"
);
//QUES
rval
=
0
;
rval
=
0
;
break
;
break
;
...
@@ -2156,8 +2162,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
...
@@ -2156,8 +2162,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
radioBearerConfig
->
srb_ToAddModList
,
radioBearerConfig
->
srb_ToAddModList
,
NULL
,
NULL
,
NULL
,
NULL
,
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
cipheringAlgorithm
|
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
(
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
integrityProtAlgorithm
<<
4
),
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
0xff
,
kRRCenc
,
kRRCenc
,
kRRCint
,
kRRCint
,
NULL
,
NULL
,
...
@@ -2337,8 +2344,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
...
@@ -2337,8 +2344,9 @@ nr_sa_rrc_ue_process_radioBearerConfig(
NULL
,
NULL
,
radioBearerConfig
->
drb_ToAddModList
,
radioBearerConfig
->
drb_ToAddModList
,
NULL
,
NULL
,
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
cipheringAlgorithm
|
// NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm |
(
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
integrityProtAlgorithm
<<
4
),
// (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
0xff
,
NULL
,
NULL
,
NULL
,
NULL
,
kUPenc
,
kUPenc
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment