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
canghaiwuhen
OpenXG-RAN
Commits
6d413e2c
Commit
6d413e2c
authored
Mar 26, 2020
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bugfix returning null pointer to prach resources
parent
3bb1407e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+1
-6
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
6d413e2c
...
@@ -109,7 +109,6 @@ void nr_get_prach_resources(module_id_t mod_id,
...
@@ -109,7 +109,6 @@ void nr_get_prach_resources(module_id_t mod_id,
// // - available SSB with SS-RSRP above rsrp-ThresholdSSB: SSB selection
// // - available SSB with SS-RSRP above rsrp-ThresholdSSB: SSB selection
// // - availalbe CSI-RS with CSI-RSRP above rsrp-ThresholdCSI-RS: CSI-RS selection
// // - availalbe CSI-RS with CSI-RSRP above rsrp-ThresholdCSI-RS: CSI-RS selection
// prach_resources->ra_PreambleIndex = rach_ConfigDedicated->ra_PreambleIndex;
// prach_resources->ra_PreambleIndex = rach_ConfigDedicated->ra_PreambleIndex;
// return;
// }
// }
//////////* Contention-based RA preamble selection *//////////
//////////* Contention-based RA preamble selection *//////////
...
@@ -503,8 +502,6 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
...
@@ -503,8 +502,6 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
for
(
int
j
=
0
;
j
<
(
TBS_bytes
-
offset
);
j
++
)
for
(
int
j
=
0
;
j
<
(
TBS_bytes
-
offset
);
j
++
)
payload
[
offset
+
j
]
=
0
;
// mac_pdu[offset + j] = 0;
payload
[
offset
+
j
]
=
0
;
// mac_pdu[offset + j] = 0;
}
}
return
;
}
}
}
else
{
// RACH is active
}
else
{
// RACH is active
...
@@ -603,13 +600,11 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
...
@@ -603,13 +600,11 @@ void nr_ue_get_rach(NR_PRACH_RESOURCES_t *prach_resources,
mac
->
RA_tx_subframe
=
nr_tti_tx
;
mac
->
RA_tx_subframe
=
nr_tti_tx
;
// Fill in preamble and PRACH resources
// Fill in preamble and PRACH resources
nr_get_prach_resources
(
mod_id
,
CC_id
,
gNB_id
,
nr_tti_tx
,
0
,
prach_resources
,
NULL
);
nr_get_prach_resources
(
mod_id
,
CC_id
,
gNB_id
,
nr_tti_tx
,
0
,
prach_resources
,
NULL
);
return
;
}
}
}
}
}
else
if
(
UE_mode
==
PUSCH
)
{
}
else
if
(
UE_mode
==
PUSCH
)
{
LOG_D
(
MAC
,
"[UE %d] FATAL: Should not have checked for RACH in PUSCH yet ..."
,
mod_id
);
LOG_D
(
MAC
,
"[UE %d] FATAL: Should not have checked for RACH in PUSCH yet ..."
,
mod_id
);
AssertFatal
(
1
==
0
,
""
);
AssertFatal
(
1
==
0
,
""
);
}
}
prach_resources
=
NULL
;
return
;
return
;
}
}
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