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
wangwenhui
OpenXG-RAN
Commits
88e6fb9d
Commit
88e6fb9d
authored
4 years ago
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed warnings
parent
e81b1959
develop
1
128-ues
256_QAM_demod
NR-PHY-MAC-IF-multi-UE
NR_10MHz
NR_CSI_reporting
NR_DLUL_PF
NR_DLUL_PF_rebased
NR_DL_sched_fixes
NR_FAPI_beamindex_SSB_RO
NR_FR2_RA
NR_FR2_RRC_SSB
NR_MAC_Multi_Rach_GlobalEdge
NR_MAC_SSB_RO_GlobalEdge
NR_MAC_SSB_RO_UE_IDCC
NR_MAC_TCI_UCI_GlobalEdge
NR_PUCCH_MultiUE
NR_RA_updates
NR_RRCConfiguration_FR2
NR_SA_F1AP_dev
NR_SA_NGAP_RRC_wk42
NR_SA_itti_sim_wk48
NR_SA_itti_sim_wk48_hs
NR_SA_itti_sim_wk48_hs1
NR_SCHED_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ_rebased
NR_SCHED_fixes
NR_SRB_Config
NR_UE_MAC_scheduler
NR_UE_RA_fixes
NR_UE_dlsch_bugfix
NR_UE_enable_parallelization
NR_UE_stability_fixes
NR_UL_scheduler
NR_UL_scheduler_rebased
NR_beam_simulation
NR_mac_uci_functions_rework
NR_scheduling_CSIRS
NR_scheduling_request
NR_scheduling_request2
RA_CI_test
UE_DL_DCI_hotfix
bch-fixes-bitmap
benetel_driver_update
benetel_phase_rotation
bugfix-nr-bands
bugfix-nr-ldpc-post-processing
bugfix-nr-ldpc-size-typo
bugfix-nr-pdcp-sn-size
bugfix-nr-rate-matching-assertion
cce_indexing_fix
cce_indexing_fix2
ci-deploy-asterix
ci-deploy-docker-compose
ci-test
ci-ul-iperf-from-trf-container
cleanup_softmodem_main
constant_power
develop-SnT
develop-oriecpriupdates
develop-sib1
develop-sib1-local
develop-sib1-lts
develop_stable
dlsch_parallel
dongzhanyi-zte-develop2
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
finalize-oaicn-integration
fix-ci-tun
fix-itti-segv
fix_NR_DLUL_PF
fix_do_ra_data
fix_pdsch_low_prb
fix_rrc_x2_ticking
fixes-CE-RLC-PDU-size
fixes-mac-sched-nfapi
fixes-tun
flexran-repair-mme-mgmt
fujitsu_lte_contribution
fujitsu_lte_contribution-128
gnb-only-test
harq-hotfix
hotfix-minor-remove-nr-rlc-cppcheck-error
hotfix-nr-rlc-tick
integration_2020_wk40
integration_2020_wk41
integration_2020_wk42_2
integration_2020_wk45
integration_2020_wk45_2
integration_2020_wk46
integration_2020_wk46_2
integration_2020_wk47
integration_2020_wk48
integration_2020_wk48_2
integration_2020_wk49
integration_2020_wk50
integration_2020_wk50_1
integration_2020_wk51
integration_2020_wk51_2
integration_2021_wk02
integration_2021_wk02_wMR988
inter-RRU-final
itti-enhancement
ldpc_short_codeword_fixes
lte_uplink_improvement
mac-fixes-wk45_2
minor-fix-doc-basic-sim
mosaic5g-oai-ran
mosaic5g-oai-sim
nasmesh_kernel_5.8
nfapi_nr_develop
ngap-dlul
ngap-wf
ngap-wf-1120
ngap-wf-1120-srb
ngap-wf-1120-srb-gtp
ngap-wf-1120-srb-gtp-hs
ngap-wf-1120-srb-gtp-hs1
ngap-wf-1120-srb-gtp-hs2
ngap-wf-1120-srb-gtp-yhz
ngap-wf-1203-yunsdr
ngap-wf-liuyu
ngap_lfq_1120
ngap_merge
noCore
nr-mac-pdu-wireshark
nr-mac-remove-ue-list
nr-rlc-am-bugfix-w44
nr-rlc-bugfix-w44
nrUE
nrUE-hs
nrUE-upper-layer
nr_bsr
nr_dl_dmrs_type2
nr_dl_pf
nr_dl_pf2
nr_dl_ul_ptrs
nr_fdd_if_fix
nr_prach_fr2
nr_ue_msg3
nr_ue_tti_cleanup
nr_ul_pf
nr_ul_scfdma
nsa-ue
oai-sim
oairu
oc-docker-october-improvements
openxg/develop
ptrs_rrc_config
pusch-mthread-scaling-fix
pusch-retrans-fix-ue
ra-dl-ul
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
rh-ci-add-ue-parallelization
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rrc-enb-phy-testmode
s1-subnormal_rewrite
s1_subnormal
s1_subnormal-robert
s1ap-bugfix-rab_setup
sa-demo
sa-merge-rrc-srb
sa-msg4
sa-msg4-rrc
sa-msg4-rrc-yihz
sa-msg4-rrc-yihz-hs
sa_rrc_yihz
small-config-change
testing_with_external_txdata
ue_beam_selection
ul-freq-iq-samps-to-file
ulsim_changes
wireshark-log-scheduling-requests
xiangwab
xiangwan
yihongzheng_srb
2021.w02
2020.w51_2
2020.w51
2020.w50
2020.w49
2020.w48_2
2020.w48
2020.w47
2020.w46_2
2020.w46
2020.w45_2
2020.w45
2020.w44
2020.w42_2
2020.w42
2020.w41
benetel_phase_rotation
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
51 deletions
+12
-51
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+3
-47
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/LAYER2/NR_MAC_UE/mac_proto.h
+6
-0
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
+2
-3
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
88e6fb9d
...
...
@@ -811,36 +811,12 @@ void nr_ue_pdsch_procedures(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc, int eNB
void
nr_process_rar
(
nr_downlink_indication_t
*
dl_info
)
{
module_id_t
module_id
=
dl_info
->
module_id
;
int
cc_id
=
dl_info
->
cc_id
,
frame_rx
=
dl_info
->
proc
->
frame_rx
,
nr_tti_rx
=
dl_info
->
proc
->
nr_tti_rx
,
ta_command
,
delta
;
int
cc_id
=
dl_info
->
cc_id
,
frame_rx
=
dl_info
->
proc
->
frame_rx
,
nr_tti_rx
=
dl_info
->
proc
->
nr_tti_rx
,
ta_command
;
uint8_t
gNB_index
=
dl_info
->
gNB_index
;
// *rar;
//fapi_nr_dci_indication_t *dci_ind = dl_info->dci_ind;
PHY_VARS_NR_UE
*
ue
=
PHY_vars_UE_g
[
module_id
][
cc_id
];
NR_UE_DLSCH_t
*
dlsch0
=
ue
->
dlsch_ra
[
gNB_index
];
UE_MODE_t
UE_mode
=
ue
->
UE_mode
[
gNB_index
];
NR_PRACH_RESOURCES_t
*
prach_resources
=
ue
->
prach_resources
[
gNB_index
];
uint16_t
slots_per_frame
=
ue
->
frame_parms
.
slots_per_frame
;
uint8_t
mu_pusch
=
1
,
sliv_S
,
sliv_L
;
// definition table j Table 6.1.2.1.1-4
uint8_t
j
=
(
mu_pusch
==
3
)
?
3
:
(
mu_pusch
==
2
)
?
2
:
1
;
uint8_t
table_6_1_2_1_1_2_time_dom_res_alloc_A
[
16
][
3
]
=
{
// for PUSCH from TS 38.214 subclause 6.1.2.1.1
{
j
,
0
,
14
},
// row index 1
{
j
,
0
,
12
},
// row index 2
{
j
,
0
,
10
},
// row index 3
{
j
,
2
,
10
},
// row index 4
{
j
,
4
,
10
},
// row index 5
{
j
,
4
,
8
},
// row index 6
{
j
,
4
,
6
},
// row index 7
{
j
+
1
,
0
,
14
},
// row index 8
{
j
+
1
,
0
,
12
},
// row index 9
{
j
+
1
,
0
,
10
},
// row index 10
{
j
+
2
,
0
,
14
},
// row index 11
{
j
+
2
,
0
,
12
},
// row index 12
{
j
+
2
,
0
,
10
},
// row index 13
{
j
,
8
,
6
},
// row index 14
{
j
+
3
,
0
,
14
},
// row index 15
{
j
+
3
,
0
,
10
}
// row index 16
};
LOG_D
(
PHY
,
"[UE %d][RAPROC] Frame %d subframe %d Received RAR mode %d
\n
"
,
module_id
,
frame_rx
,
nr_tti_rx
,
UE_mode
);
...
...
@@ -868,29 +844,9 @@ void nr_process_rar(nr_downlink_indication_t *dl_info) {
nr_process_timing_advance_rar
(
ue
,
dl_info
->
proc
,
ta_command
);
if
(
ue
->
mode
!=
debug_prach
)
{
switch
(
mu_pusch
)
{
case
0
:
delta
=
2
;
break
;
case
1
:
delta
=
3
;
break
;
case
2
:
delta
=
4
;
break
;
case
3
:
delta
=
6
;
break
;
}
#ifdef DEBUG_RA
LOG_D
(
PHY
,
"[UE %d][RAPROC] Msg3 nr_tti_rx %d delta %d
\n
"
,
ue
->
Mod_id
,
nr_tti_rx
,
delta
);
#endif
if
(
ue
->
mode
!=
debug_prach
)
ue
->
UE_mode
[
gNB_index
]
=
RA_RESPONSE
;
}
}
else
{
LOG_W
(
PHY
,
"[UE %d][RAPROC] Received RAR preamble (%d) doesn't match !!!
\n
"
,
ue
->
Mod_id
,
prach_resources
->
ra_PreambleIndex
);
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/mac_proto.h
View file @
88e6fb9d
...
...
@@ -294,5 +294,11 @@ void nr_Msg1_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, uint
void
nr_Msg3_transmitted
(
module_id_t
mod_id
,
uint8_t
CC_id
,
frame_t
frameP
,
uint8_t
gNB_id
);
void
nr_ue_msg2_scheduler
(
module_id_t
mod_id
,
uint16_t
rach_frame
,
uint16_t
rach_slot
,
uint16_t
*
msg2_frame
,
uint16_t
*
msg2_slot
);
int8_t
nr_ue_process_dci_freq_dom_resource_assignment
(
nfapi_nr_ue_pusch_pdu_t
*
pusch_config_pdu
,
fapi_nr_dl_config_dlsch_pdu_rel15_t
*
dlsch_config_pdu
,
uint16_t
n_RB_ULBWP
,
uint16_t
n_RB_DLBWP
,
uint16_t
riv
);
#endif
/** @}*/
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
View file @
88e6fb9d
...
...
@@ -66,9 +66,9 @@ void fill_dci_search_candidates(NR_SearchSpace_t *ss,fapi_nr_dl_config_dci_dl_pd
void
config_dci_pdu
(
NR_UE_MAC_INST_t
*
mac
,
fapi_nr_dl_config_dci_dl_pdu_rel15_t
*
rel15
,
fapi_nr_dl_config_request_t
*
dl_config
,
int
rnti_type
,
int
ss_id
,
uint8_t
dci_format
){
uint16_t
monitoringSymbolsWithinSlot
;
uint16_t
monitoringSymbolsWithinSlot
=
0
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
int
sps
;
int
sps
=
0
;
def_dci_pdu_rel15
=
calloc
(
1
,
sizeof
(
dci_pdu_rel15_t
));
AssertFatal
(
mac
->
scc
!=
NULL
,
"scc is null
\n
"
);
NR_ServingCellConfigCommon_t
*
scc
=
mac
->
scc
;
...
...
@@ -184,7 +184,6 @@ void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl
int
ss_id
;
uint8_t
bwp_id
=
1
,
coreset_id
=
1
;
NR_ServingCellConfig_t
*
scd
=
mac
->
scg
->
spCellConfig
->
spCellConfigDedicated
;
NR_BWP_Downlink_t
*
bwp
=
mac
->
DLbwp
[
bwp_id
-
1
];
#ifdef DEBUG_DCI
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
88e6fb9d
...
...
@@ -1017,7 +1017,7 @@ void nr_ue_msg3_scheduler(NR_UE_MAC_INST_t *mac,
sub_frame_t
current_slot
,
uint8_t
Msg3_tda_id
){
int
delta
;
int
delta
=
0
;
NR_BWP_Uplink_t
*
ubwp
=
mac
->
ULbwp
[
0
];
int
mu
=
ubwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
struct
NR_PUSCH_TimeDomainResourceAllocationList
*
pusch_TimeDomainAllocationList
=
ubwp
->
bwp_Common
->
pusch_ConfigCommon
->
choice
.
setup
->
pusch_TimeDomainAllocationList
;
...
...
This diff is collapsed.
Click to expand it.
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