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
4593a2a3
Commit
4593a2a3
authored
10 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@5811
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
59a5663d
develop
1
128-ues
207-feature-ued-platform-support
256_QAM_demod
2cw_fairRRscd
340-fix-beamforming-for-multiple-antenna
342-isip-pcie-lib
375-syrtem-sdr-platform
383-ulsch-scheduler-optimization
387-fraunhofer-iis-transmission-mode-4
401-bug-related-to-nr-pucch-format-2-generator
408-reworked
408-ue-main-threads
445-LDPC-implementation-on-GPU
459-pusch-based-ta-updates
464-ru_beamforming_in_gpu
464-ru_beamforming_in_gpu-CPUsubfunction
472-add-pusch-dmrs-modes
481-ldpc-decoder-on-gpu
5g_fapi_scf
LTE-sidelink
LTE_TRX_on_single_port
NCTU_CS_ISIP
NCTU_CS_ISIP_CPU
NCTU_CS_ISIP_GPU
NCTU_OpinConnect_LDPC
NR-PHY-MAC-IF-multi-UE
NR_10MHz
NR_CSI_reporting
NR_DCI_01
NR_DLUL_PF
NR_DLUL_PF_rebased
NR_DL_sched_fixes
NR_DL_scheduler
NR_FAPI_beamindex_SSB_RO
NR_FR2_RA
NR_FR2_RRC_SSB
NR_MAC_CE_GlobalEdge
NR_MAC_Multi_Rach_GlobalEdge
NR_MAC_SSB_RO_GlobalEdge
NR_MAC_SSB_RO_UE_IDCC
NR_MAC_SSB_RO_merge
NR_MAC_TCI_UCI_GlobalEdge
NR_NGAP
NR_PDCP_noS1
NR_PUCCH_MultiUE
NR_RA_updates
NR_RRCConfiguragion_FR2
NR_RRCConfiguration
NR_RRCConfiguration_FR2
NR_RRCConfiguration_S1U
NR_RRCConfiguration_merge_develop
NR_RRCConfiguration_sync_source
NR_RRCConfiguration_trx_thread
NR_RRC_CP_bugfix
NR_RRC_PDCP
NR_RRC_PRACH_procedures
NR_RRC_PRACH_procedures_todevelop
NR_RRC_PUSCH
NR_RRC_TA
NR_RRC_X2AP_AMBR_Change_Global_edge
NR_RRC_X2AP_RemoveHardcodings_GlobalEdge
NR_RRC_config_simplified
NR_RRC_harq
NR_RRC_harq_b
NR_RRC_harq_hacks
NR_RRC_harq_newdcipdu
NR_SA_F1AP_dev
NR_SA_NGAP_RRC
NR_SA_NGAP_RRC_wk42
NR_SA_itti_sim_wk48
NR_SA_itti_sim_wk48_hs
NR_SA_itti_sim_wk48_hs1
NR_SCHED
NR_SCHED_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ
NR_SCHED_PDCCH_PUCCH_HARQ_rebased
NR_SCHED_fixes
NR_SRB_Config
NR_TRX_on_single_port
NR_TRX_on_single_port2
NR_UE_MAC_scheduler
NR_UE_RA_fixes
NR_UE_UL_DCI_improvements
NR_UE_dlsch_bugfix
NR_UE_enable_parallelization
NR_UE_stability_fixes
NR_UL_FAPI_programming
NR_UL_scheduler
NR_UL_scheduler_rebased
NR_UL_scheduling
NR_beam_simulation
NR_beamforming_test
NR_gNB_SCF_Indication
NR_ipaccess_testing
NR_mac_uci_functions_rework
NR_msg2_phytest
NR_scheduling_CSIRS
NR_scheduling_request
NR_scheduling_request2
NR_test_S1U_RRC_PRACH_procedures
NR_ue_dlsch_dmrs_cdm
New-Merge-sidelink-develop
OpInConnect_ISIP
PUSCH_TA_update
PerfumeOldTdd
RA_CI_test
RRC-measurements-merge2develop
UE_DL_DCI_hotfix
UpdateRANRemoteUEReport
add_iris_hw
addoptions_nr_USRPdevice
bch-fixes-bitmap
benetel_5g_prach_fix
benetel_driver_update
benetel_phase_rotation
benetel_phase_rotation_old
block_mmse_receiver_with_whitenning
bugfix-find-uci
bugfix-minor-remove-wrong-log
bugfix-nr-bands
bugfix-nr-ldpc-post-processing
bugfix-nr-ldpc-size-typo
bugfix-nr-pdcp-sn-size
bugfix-nr-rate-matching-assertion
bugfix-pdcch_order
cce_indexing_fix
cce_indexing_fix2
ci-deploy-asterix
ci-deploy-docker-compose
ci-rd-july-improvements
ci-test
ci-ul-iperf-from-trf-container
ci-yacine
clean-5G-scope-round2
cleanup_softmodem_main
constant_power
container_fix
container_v1.2.2
debug_branch_init_sync
develop-FeMBMS
develop-SnT
develop-aarch64build
develop-ci
develop-ci-fju
develop-large-scale-emulations
develop-m2ap
develop-multi-RRUs
develop-nb-iot
develop-nb-iot-RRC
develop-nb-iot-merge
develop-nb-iot-merge-w-conflicts
develop-nb-iot-ntust
develop-nr
develop-nr-adding-2018-09-asn1
develop-nr-fr2
develop-nr-fr2-rework
develop-nr_cppcheck
develop-oriecpriupdates
develop-sib1
develop-sib1-local
develop-sib1-lts
develop-sidekiq
develop-vco3
develop_ci
develop_inria_ci_deployment
develop_inria_ci_deployment_gp
develop_inria_ci_deployment_gp_b4merge
develop_integration_2019_w44
develop_integration_2020_w15
develop_integration_2020_w19
develop_integration_w08
develop_jenkins_replay
develop_stable
dfts_alternatives
dlsch-all-dlslots
dlsch_encode_mthread
dlsch_parallel
dlsim-autotests
documentation
docupdate_tools
dongzhanyi-zte-0001
dongzhanyi-zte-develop
dongzhanyi-zte-develop2
dreibh/apt-auth-fix
dreibh/device-load-fix
dreibh/device-load-fix-develop-branch
dreibh/doxygen-fix
dual-connectivity
dummy
edrx
enhancement-149-iqtxshift
extend_sharedlibusage
extend_sharedlibusage2
fapi_for_dmrs_and_ptrs
feat-mac-sock
feature-15-carrier_aggregation
feature-21-TM7
feature-230-tm3_scheduler
feature-247-tm89
feature-247-tm89-fixes
feature-247-tm89-rebased
feature-278-physical-layer-GPU-version
feature-309-phy_procedures_eNB_TX_split_to_multi_threading
feature-31-ff-scheduler-api
feature-330-turbo_decoder_gpu
feature-368-channel-simulator
feature-39-X2-handover
feature-4g-sched
feature-68-enb-agent
feature-flexran-cm-s1ap
feature-nr-4g-nfapi-modifications
feature-pdcp-task
feature-send-rrc-message-for-wireshark-logging
feature-support-clang-format
feature/make-s1-mme-port-configurable
feature/make-s1-mme-port-configurable-with-astyle-fixes
feature_tm3
fembms-enb-ue
finalize-oaicn-integration
firas
fix-ci-tun
fix-clock-source
fix-dirty-ue-same-machine
fix-itti
fix-itti-segv
fix-l2-sim
fix-limeSDR-compile
fix-segfault-flexran-isolated
fix-softmodem-restart
fix-warnings
fix_NR_DLUL_PF
fix_do_ra_data
fix_pdsch_low_prb
fix_rfsim_mimo
fix_rrc_x2_ticking
fixes-CE-RLC-PDU-size
fixes-mac-sched-nfapi
fixes-mac-sched-tun
fixes-tun
flexran-apps
flexran-improvements
flexran-repair-mme-mgmt
flexran-report-split
fr2-hw-test
fujitsu_lte_contribution
fujitsu_lte_contribution-128
gNB-nrUE-USRP
gNB_mwc18_integration
generate_push_ptrs
gnb-only-test
harq-hotfix
hotfix-minor-remove-nr-rlc-cppcheck-error
hotfix-nr-rlc-tick
hotfix-ocp-executable
hotfix-ue-musim-compilation
hotfix_usrp_lib
improve_build_nr_lte_merge
improve_nr_modulation
improve_ue_stability
initial-nfapi-PNF-fixes
integration-develop-nr-2019w45
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
inter-RRU-final
inter-RRU-nr
inter-RRU-oairu
inter-rru-UE
interoperability-test
isip-turbo-decoder-dynamic
isip-turbo-decoder-parallel
isip_nr
issue271_simulator
issue392-simplify-s1-nos1step2_01
issue416_nfapicleanup
issue_345_l2_fapi_simulator
itti-enhancement
l2-fixes
large_scale_simulations
ldpc-dec-layering
ldpc-decoder-codegen
ldpc-decoder-codegen2
ldpc-decoder-improvements
ldpc-offload
ldpc_short_codeword_fixes
load_gnb
lte-m-ue_type
lte_uplink_improvement
mac-fixes-wk45_2
mac-monitoring
main_python
master
mbms-fix-develop-nr
merging-2019-w51-to-develop-nr
mex_mmse_receiver
minor-fix-doc-basic-sim
mobipass-hack
modify_fairRRscd_parallel
mosaic5g-oai-ran
mosaic5g-oai-sim
mu_allocate
multi-L1
multi-RRUs
nasmesh_kernel_5.8
new_nos1
new_pdcp
new_rlc
new_rlc_2020
new_rlc_in_mbms
nfapi-L2-emulator
nfapi-bugfix
nfapi_improvement
nfapi_nr_develop
ngap-dlul
ngap-support
ngap-w48-merge2
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-coreset-bug-fix
nr-dlsch-multi-thread
nr-dlsch-thread
nr-dual-connectivity
nr-interdigital-test
nr-ip-uplink-noS1
nr-mac-pdu-wireshark
nr-mac-remove-ue-list
nr-multiple-ssb
nr-pdcp
nr-pdsch-extraction-bugfix
nr-physim-update
nr-rlc-am-bugfix-w44
nr-rlc-bugfix-w44
nr-ssb-measurements
nr-timing-measurement
nr-timing-measurement-merge
nr-ue-buffer-status
nr-ue-slot-based
nr-uldci
nrUE
nrUE-hs
nrUE-upper-layer
nr_beamforming
nr_bsr
nr_ci_dlsim
nr_csi_newbranch
nr_dci_procedures
nr_demo_wsa2019
nr_dl_dmrs_type2
nr_dl_pf
nr_dl_pf2
nr_dl_ul_ptrs
nr_dlsch_parallel_measurements
nr_dlsim_plot
nr_fapi_for_push_tmp
nr_fdd_if_fix
nr_fix_easycppcheck
nr_flexible_NRBDL
nr_improve_build_procedures
nr_increase_tp
nr_mib_vsa_test
nr_pdcch_testing
nr_pdcch_updates
nr_pdsch_integration
nr_polar_decoder_improvement
nr_prach
nr_prach_fr2
nr_pucch
nr_pucch2
nr_segmentation_fixes
nr_sim_fix
nr_tdd_configuration
nr_ue_msg3
nr_ue_tti_cleanup
nr_ul_pf
nr_ul_scfdma
nr_vcd
nrue-multi-thread
nrue_msg2_reception
nsa-ue
nsa_remove_band_hardcodings
oai-sim
oai-ubuntu-docker
oai-ubuntu-docker-for-lmssdr
oai_ue_mwc18_integration
oairu
oc-docker-october-improvements
ocp_simulator
openxg/develop
pdcp-benchmark
pdsch-ch-est
polar8
preprocessor_refactor-2
ptrs_rrc_config
pucch2ab
pucchsim-multiue
pusch-mthread-scaling-fix
pusch-retrans-fix-ue
ra-dl-ul
rau_rru_reciprocity_measurements
recode_itti_from_scratch
reduce_memory_footprint
release_v1_2_0_candidate
remove-ci-workaround
remove_nos1_hack_pdcp
remove_x2_gnb_hardcoding
repair-TA
revert-f5c94279
revert-itti
revert_memcpy
rh-ci-add-ue-parallelization
rh_ci_fix_autoterminate
rh_ci_fr1_update
rh_ci_oc
rh_ci_py
rh_ci_rfsim_ra
rh_doc_update_3
rh_fr1_newjenkins
rh_fr1_update
rh_gnb_compile_fix
rh_wk50_debug
rhel77-build
rlc-v2-bugfix-status-reporting
rlc-v2-tick
rlc_v2_coverity_fixes
rrc-enb-phy-testmode
rru-txwrite-modification
ru-parallel-beamforming
ru_rau_enhancement
ru_rau_enhancement-external-timing
runel
runel-reverse-test
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
schedule-si-fix
signal-delay
small-bugfixes-w40
small-config-change
smallcleanup
softmodem_cleanup
split73
tcri
test-x310-perf
testing_2symb_pdcch
testing_with_external_txdata
thread-pool
tm7-iris
tools_5Gadapt
tp-ota-test
trx_thread_param
trx_write_thread
ue-csi
ue-fixes-ota
ue-updates-runel-test
ue_adjust_gain
ue_beam_selection
ue_dlsch-multi-threading
ue_dlsch_decoding_ldpc_offload
ue_nfapi_mch
ues_test_tmp
uhd_priority_set_cleanup
ul-freq-iq-samps-to-file
ul_dl_dci_same_slot
ul_harq
ulsch_decode_mthread
ulsim_changes
update-to-2019-march-june-release
usrp_fix_adc_shift_and_pps_sync
usrp_gpio_test
wireshark-log-scheduling-requests
workaround-rebased
workaround-restart-not-working
x2-endc-processing
x2-ho
x2-ka-test
x2_neighbor_6cells
x2_tdd
xiangwab
xiangwan
yihongzheng_srb
zzs
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
2020.w39
2020.w38
2020.w37
2020.w36
2020.w34
2020.w33
2020.w31
2020.w30
2020.w29
2020.w28
2020.w26
2020.w25
2020.w24
2020.w23
2020.w22
2020.w19
2020.w17
2020.w16
2020.w15
2020.w11
2020.w09
2020.w06
2020.w05
2020.w04
2020.w03
2019.w51
2019.w44
2019.w41
2019.w36
2019.w30
2019.w28
2019.w27
2019.w25
2019.w23
2019.w21
2019.w17
2019.w15
2019.w13
2019.w11
2019.w10
2019.w09
2019.w08
2019.w07
2019.w06
2019.w04
2019.w03
2018.w51
2018.w48
2018.w47
2018.w46
2018.w44
2018.w41
2018.w40
2018.w39
2018.w36
2018.w33
2018.w31
2018.w29
2018.w25
2018.w19
2018.w15
2018.w12
2018.w11
2018.w10
2018.w09
2018.w08
2018.w07
2018.w06
2018.w05
2018.w04
2018.w03
2018.w02
2017.w48
2017.w46
2017.w43
2017.w42
2017.w34
2017.w30
2017.w25
2017.w24
2017.w22
2017.w20
2017.w19
2017.w15
2017.w14
2017.w13
2017.w12
2017.w11
2017.w10
2017.w09
2017.w08
2017.w07
2017.w06
2017.w05
2017.w04
2017.w03
2017.w02
2017.w01
2016.w50
2016.w49
v1.2.2
v1.2.1
v1.2.0
v1.1.1
v1.1.0
v1.0.3
v1.0.2
v1.0.1
v1.0.0
v1B0.8
v1B0.7
v1B0.6
v1B0.5
v1B0.4
v1B0.3
v1B0.2
v1B0.1
v0.6.1
v0.6.1_tdd
v0.6
v0.5.2
v0.5.1_tdd
v0.5
v0.4
v0.3
v0.2
v0.1
testing-cmw500
osa-etsi-ws-ue
osa-etsi-ws-try2
osa-etsi-ws-try1
osa-etsi-ws-gNB
oai_nr_sync
nr-ip-over-lte
nr-ip-over-lte-v.1.5
nr-ip-over-lte-v.1.4
nr-ip-over-lte-v.1.3
nr-ip-over-lte-v.1.2
nr-ip-over-lte-v.1.1
nr-ip-over-lte-v.1.0
develop-nr-pdcch
develop-nr-2020w03
develop-nr-2020w02
develop-nr-2019w51
develop-nr-2019w50
develop-nr-2019w48
develop-nr-2019w47
develop-nr-2019w45
develop-nr-2019w43
develop-nr-2019w42
develop-nr-2019w40
develop-nr-2019w28
develop-nr-2019w23
benetel_phase_rotation
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
154 additions
and
175 deletions
+154
-175
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/defs.h
+2
-0
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
+0
-53
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+94
-56
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+10
-9
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+44
-43
openair2/LAYER2/MAC/main.c
openair2/LAYER2/MAC/main.c
+0
-1
openair2/LAYER2/MAC/proto.h
openair2/LAYER2/MAC/proto.h
+3
-9
openair2/PHY_INTERFACE/defs.h
openair2/PHY_INTERFACE/defs.h
+1
-4
No files found.
openair2/LAYER2/MAC/defs.h
View file @
4593a2a3
...
...
@@ -478,6 +478,8 @@ typedef struct{
uint8_t
oldNDI_UL
[
8
];
/// Flag to indicate UL has been scheduled at least once
boolean_t
ul_active
;
/// Flag to indicate UE has been configured (ACK from RRCConnectionSetup received)
boolean_t
configured
;
// PHY interface info
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_RA.c
View file @
4593a2a3
...
...
@@ -484,56 +484,3 @@ void cancel_ra_proc(module_id_t module_idP, int CC_id, frame_t frameP, rnti_t rn
}
}
void
terminate_ra_proc
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
unsigned
char
*
msg3
,
uint16_t
msg3_len
)
{
unsigned
char
rx_ces
[
MAX_NUM_CE
],
num_ce
,
num_sdu
,
i
,
*
payload_ptr
;
unsigned
char
rx_lcids
[
NB_RB_MAX
];
uint16_t
rx_lengths
[
NB_RB_MAX
];
int8_t
UE_id
;
RA_TEMPLATE
*
RA_template
=
(
RA_TEMPLATE
*
)
&
eNB_mac_inst
[
module_idP
].
common_channels
[
CC_id
].
RA_template
[
0
];
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d, Received msg3 %x.%x.%x.%x.%x.%x, Terminating RA procedure for UE rnti %x
\n
"
,
module_idP
,
frameP
,
msg3
[
3
],
msg3
[
4
],
msg3
[
5
],
msg3
[
6
],
msg3
[
7
],
msg3
[
8
],
rnti
);
for
(
i
=
0
;
i
<
NB_RA_PROC_MAX
;
i
++
)
{
LOG_D
(
MAC
,
"[RAPROC] Checking proc %d : rnti (%x, %x), active %d
\n
"
,
i
,
RA_template
[
i
].
rnti
,
rnti
,
RA_template
[
i
].
RA_active
);
if
((
RA_template
[
i
].
rnti
==
rnti
)
&&
(
RA_template
[
i
].
RA_active
==
TRUE
))
{
payload_ptr
=
parse_ulsch_header
(
msg3
,
&
num_ce
,
&
num_sdu
,
rx_ces
,
rx_lcids
,
rx_lengths
,
msg3_len
);
LOG_D
(
MAC
,
"[eNB %d][RAPROC] Frame %d Received CCCH: length %d, offset %d
\n
"
,
module_idP
,
frameP
,
rx_lengths
[
0
],
payload_ptr
-
msg3
);
if
(
/*(num_ce == 0) &&*/
(
num_sdu
==
1
)
&&
(
rx_lcids
[
0
]
==
CCCH
))
{
// This is an RRCConnectionRequest/Restablishment
memcpy
(
&
RA_template
[
i
].
cont_res_id
[
0
],
payload_ptr
,
6
);
LOG_D
(
MAC
,
"[eNB %d][RAPROC] Frame %d Received CCCH: length %d, offset %d
\n
"
,
module_idP
,
frameP
,
rx_lengths
[
0
],
payload_ptr
-
msg3
);
UE_id
=
add_new_ue
(
module_idP
,
CC_id
,
RA_template
[
i
].
rnti
);
if
(
UE_id
==-
1
)
{
mac_xface
->
macphy_exit
(
"[MAC][eNB] Max user count reached
\n
"
);
}
else
{
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d Added user with rnti %x => UE %d
\n
"
,
module_idP
,
frameP
,
RA_template
[
i
].
rnti
,
UE_id
);
}
if
(
Is_rrc_registered
==
1
)
mac_rrc_data_ind
(
module_idP
,
frameP
,
CCCH
,(
uint8_t
*
)
payload_ptr
,
rx_lengths
[
0
],
1
,
module_idP
,
0
);
// add_user. This is needed to have the rnti for configuring UE (PHY). The UE is removed if RRC
// doesn't provide a CCCH SDU
}
else
if
(
num_ce
>
0
)
{
// handle msg3 which is not RRCConnectionRequest
// process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
}
RA_template
[
i
].
generate_Msg4
=
1
;
RA_template
[
i
].
wait_ack_Msg4
=
0
;
return
;
}
// if process is active
}
// loop on RA processes
}
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
4593a2a3
...
...
@@ -164,7 +164,7 @@ unsigned char generate_dlsch_header(unsigned char *mac_header,
last_size
=
1
;
// msg("last_size %d,mac_header_ptr %p\n",last_size,mac_header_ptr);
((
TIMING_ADVANCE_CMD
*
)
ce_ptr
)
->
R
=
0
;
((
TIMING_ADVANCE_CMD
*
)
ce_ptr
)
->
TA
=
timing_advance_cmd
&
0x3f
;
((
TIMING_ADVANCE_CMD
*
)
ce_ptr
)
->
TA
=
(
timing_advance_cmd
+
31
)
&
0x3f
;
LOG_I
(
MAC
,
"timing advance =%d (%d)
\n
"
,
timing_advance_cmd
,((
TIMING_ADVANCE_CMD
*
)
ce_ptr
)
->
TA
);
ce_ptr
+=
sizeof
(
TIMING_ADVANCE_CMD
);
//msg("offset %d\n",ce_ptr-mac_header_control_elements);
...
...
@@ -290,6 +290,82 @@ unsigned char generate_dlsch_header(unsigned char *mac_header,
}
void
set_ul_DAI
(
int
module_idP
,
int
UE_idP
,
int
CC_idP
,
int
frameP
,
int
subframeP
,
LTE_DL_FRAME_PARMS
*
frame_parms
[
MAX_NUM_CCs
])
{
eNB_MAC_INST
*
eNB
=
&
eNB_mac_inst
[
module_idP
];
UE_list_t
*
UE_list
=
&
eNB
->
UE_list
;
unsigned
char
DAI
;
if
(
frame_parms
[
CC_idP
]
->
frame_type
==
TDD
)
{
DAI
=
(
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI
-
1
)
&
3
;
LOG_D
(
MAC
,
"[eNB %d] Frame %d, subframe %d: DAI %d for UE %d
\n
"
,
module_idP
,
frameP
,
subframeP
,
DAI
,
UE_idP
);
// Save DAI for Format 0 DCI
switch
(
frame_parms
[
CC_idP
]
->
tdd_config
)
{
case
0
:
// if ((subframeP==0)||(subframeP==1)||(subframeP==5)||(subframeP==6))
break
;
case
1
:
switch
(
subframeP
)
{
case
1
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
7
]
=
DAI
;
break
;
case
4
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
8
]
=
DAI
;
break
;
case
6
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
2
]
=
DAI
;
break
;
case
9
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
3
]
=
DAI
;
break
;
}
case
2
:
// if ((subframeP==3)||(subframeP==8))
// UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
break
;
case
3
:
//if ((subframeP==6)||(subframeP==8)||(subframeP==0)) {
// LOG_D(MAC,"schedule_ue_spec: setting UL DAI to %d for subframeP %d => %d\n",DAI,subframeP, ((subframeP+8)%10)>>1);
// UE_list->UE_template[CC_idP][UE_idP].DAI_ul[((subframeP+8)%10)>>1] = DAI;
//}
switch
(
subframeP
)
{
case
5
:
case
6
:
case
1
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
2
]
=
DAI
;
break
;
case
7
:
case
8
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
3
]
=
DAI
;
break
;
case
9
:
case
0
:
UE_list
->
UE_template
[
CC_idP
][
UE_idP
].
DAI_ul
[
4
]
=
DAI
;
break
;
default:
break
;
}
break
;
case
4
:
// if ((subframeP==8)||(subframeP==9))
// UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
break
;
case
5
:
// if (subframeP==8)
// UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
break
;
case
6
:
// if ((subframeP==1)||(subframeP==4)||(subframeP==6)||(subframeP==9))
// UE_list->UE_template[CC_idP][UE_idP].DAI_ul = DAI;
break
;
default:
break
;
}
}
}
void
schedule_ue_spec
(
module_id_t
module_idP
,
frame_t
frameP
,
...
...
@@ -393,6 +469,18 @@ void schedule_ue_spec(module_id_t module_idP,
// else
// break;
}
if
(
frame_parms
[
CC_id
]
->
frame_type
==
TDD
)
{
set_ue_dai
(
subframeP
,
frame_parms
[
CC_id
]
->
tdd_config
,
UE_id
,
CC_id
,
UE_list
);
// update UL DAI after DLSCH scheduling
set_ul_DAI
(
module_idP
,
UE_id
,
CC_id
,
frameP
,
subframeP
,
frame_parms
);
}
if
(
continue_flag
==
1
){
add_ue_dlsch_info
(
module_idP
,
CC_id
,
...
...
@@ -401,13 +489,7 @@ void schedule_ue_spec(module_id_t module_idP,
S_DL_NONE
);
continue
;
}
if
(
frame_parms
[
CC_id
]
->
frame_type
==
TDD
)
set_ue_dai
(
subframeP
,
frame_parms
[
CC_id
]
->
tdd_config
,
UE_id
,
CC_id
,
UE_list
);
nb_available_rb
=
pre_nb_available_rbs
[
CC_id
][
UE_id
];
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
crnti
=
rnti
;
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
rrc_status
=
mac_get_rrc_status
(
module_idP
,
1
,
UE_id
);
...
...
@@ -1064,54 +1146,7 @@ void schedule_ue_spec(module_id_t module_idP,
}
}
if
(
frame_parms
[
CC_id
]
->
frame_type
==
TDD
)
{
DAI
=
(
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI
-
1
)
&
3
;
LOG_D
(
MAC
,
"[eNB %d] Frame %d: DAI %d for UE %d
\n
"
,
module_idP
,
frameP
,
DAI
,
UE_id
);
// Save DAI for Format 0 DCI
switch
(
frame_parms
[
CC_id
]
->
tdd_config
)
{
case
0
:
// if ((subframeP==0)||(subframeP==1)||(subframeP==5)||(subframeP==6))
break
;
case
1
:
switch
(
subframeP
)
{
case
1
:
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI_ul
[
7
]
=
DAI
;
break
;
case
4
:
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI_ul
[
8
]
=
DAI
;
break
;
case
6
:
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI_ul
[
2
]
=
DAI
;
break
;
case
9
:
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI_ul
[
3
]
=
DAI
;
break
;
}
case
2
:
// if ((subframeP==3)||(subframeP==8))
// UE_list->UE_template[CC_id][UE_id].DAI_ul = DAI;
break
;
case
3
:
if
((
subframeP
==
6
)
||
(
subframeP
==
8
)
||
(
subframeP
==
0
))
{
LOG_D
(
MAC
,
"schedule_ue_spec: setting UL DAI to %d for subframeP %d => %d
\n
"
,
DAI
,
subframeP
,
((
subframeP
+
8
)
%
10
)
>>
1
);
UE_list
->
UE_template
[
CC_id
][
UE_id
].
DAI_ul
[((
subframeP
+
8
)
%
10
)
>>
1
]
=
DAI
;
}
break
;
case
4
:
// if ((subframeP==8)||(subframeP==9))
// UE_list->UE_template[CC_id][UE_id].DAI_ul = DAI;
break
;
case
5
:
// if (subframeP==8)
// UE_list->UE_template[CC_id][UE_id].DAI_ul = DAI;
break
;
case
6
:
// if ((subframeP==1)||(subframeP==4)||(subframeP==6)||(subframeP==9))
// UE_list->UE_template[CC_id][UE_id].DAI_ul = DAI;
break
;
default:
break
;
}
set_ul_DAI
(
module_idP
,
UE_id
,
CC_id
,
frameP
,
subframeP
,
frame_parms
);
}
}
}
...
...
@@ -1701,6 +1736,9 @@ void fill_DLSCH_dci(module_id_t module_idP,frame_t frameP, sub_frame_t subframeP
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d, subframeP %d : Msg4 acknowledged
\n
"
,
module_idP
,
frameP
,
subframeP
);
RA_template
->
wait_ack_Msg4
=
0
;
RA_template
->
RA_active
=
FALSE
;
UE_id
=
find_UE_id
(
module_idP
,
RA_template
->
rnti
);
eNB_mac_inst
[
module_idP
].
UE_list
.
UE_template
[
UE_PCCID
(
module_idP
,
UE_id
)][
UE_id
].
configured
=
TRUE
;
}
}
}
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
4593a2a3
...
...
@@ -203,7 +203,7 @@ void dump_ue_list(UE_list_t *listP) {
}
}
int
add_new_ue
(
module_id_t
mod_idP
,
int
cc_idP
,
rnti_t
rntiP
)
{
int
add_new_ue
(
module_id_t
mod_idP
,
int
cc_idP
,
rnti_t
rntiP
,
int
harq_pidP
)
{
int
UE_id
;
int
j
;
...
...
@@ -218,18 +218,19 @@ int add_new_ue(module_id_t mod_idP, int cc_idP, rnti_t rntiP) {
UE_list
->
next
[
UE_id
]
=
UE_list
->
head
;
UE_list
->
head
=
UE_id
;
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
rnti
=
rntiP
;
UE_list
->
numactiveCCs
[
UE_id
]
=
1
;
UE_list
->
numactiveULCCs
[
UE_id
]
=
1
;
UE_list
->
pCC_id
[
UE_id
]
=
cc_idP
;
UE_list
->
ordered_CCids
[
0
][
UE_id
]
=
cc_idP
;
UE_list
->
ordered_ULCCids
[
0
][
UE_id
]
=
cc_idP
;
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
rnti
=
rntiP
;
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
configured
=
FALSE
;
UE_list
->
numactiveCCs
[
UE_id
]
=
1
;
UE_list
->
numactiveULCCs
[
UE_id
]
=
1
;
UE_list
->
pCC_id
[
UE_id
]
=
cc_idP
;
UE_list
->
ordered_CCids
[
0
][
UE_id
]
=
cc_idP
;
UE_list
->
ordered_ULCCids
[
0
][
UE_id
]
=
cc_idP
;
UE_list
->
num_UEs
++
;
UE_list
->
active
[
UE_id
]
=
TRUE
;
UE_list
->
active
[
UE_id
]
=
TRUE
;
for
(
j
=
0
;
j
<
8
;
j
++
)
{
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
oldNDI
[
j
]
=
(
j
==
0
)
?
1
:
0
;
// 1 because first transmission is with format1A (Msg4) for harq_pid 0
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
oldNDI_UL
[
j
]
=
0
;
UE_list
->
UE_template
[
cc_idP
][
UE_id
].
oldNDI_UL
[
j
]
=
(
j
==
harq_pidP
)
?
0
:
1
;
// 1st transmission is with Msg3
;
}
eNB_ulsch_info
[
mod_idP
][
UE_id
].
status
=
S_UL_WAITING
;
eNB_dlsch_info
[
mod_idP
][
UE_id
].
status
=
S_UL_WAITING
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
4593a2a3
...
...
@@ -73,7 +73,7 @@
// This table holds the allowable PRB sizes for ULSCH transmissions
uint8_t
rb_table
[
33
]
=
{
1
,
2
,
3
,
4
,
5
,
6
,
8
,
9
,
10
,
12
,
15
,
16
,
18
,
20
,
24
,
25
,
27
,
30
,
32
,
36
,
40
,
45
,
48
,
50
,
54
,
60
,
72
,
75
,
80
,
81
,
90
,
96
,
100
};
void
rx_sdu
(
module_id_t
enb_mod_idP
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rntiP
,
uint8_t
*
sdu
,
uint16_t
sdu_len
)
{
void
rx_sdu
(
module_id_t
enb_mod_idP
,
int
CC_id
P
,
frame_t
frameP
,
rnti_t
rntiP
,
uint8_t
*
sduP
,
uint16_t
sdu_lenP
,
int
harq_pidP
)
{
unsigned
char
rx_ces
[
MAX_NUM_CE
],
num_ce
,
num_sdu
,
i
,
*
payload_ptr
;
unsigned
char
rx_lcids
[
NB_RB_MAX
];
...
...
@@ -91,7 +91,7 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU
,
1
);
LOG_D
(
MAC
,
"[eNB %d] Received ULSCH sdu from PHY (rnti %x, UE_id %d), parsing header
\n
"
,
enb_mod_idP
,
rntiP
,
UE_id
);
payload_ptr
=
parse_ulsch_header
(
sdu
,
&
num_ce
,
&
num_sdu
,
rx_ces
,
rx_lcids
,
rx_lengths
,
sdu_len
);
payload_ptr
=
parse_ulsch_header
(
sdu
P
,
&
num_ce
,
&
num_sdu
,
rx_ces
,
rx_lcids
,
rx_lengths
,
sdu_lenP
);
// control element
for
(
i
=
0
;
i
<
num_ce
;
i
++
)
{
...
...
@@ -99,8 +99,8 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
switch
(
rx_ces
[
i
])
{
// implement and process BSR + CRNTI +
case
POWER_HEADROOM
:
if
(
UE_id
!=
UE_INDEX_INVALID
){
UE_list
->
UE_template
[
CC_id
][
UE_id
].
phr_info
=
(
payload_ptr
[
0
]
&
0x3f
)
-
PHR_MAPPING_OFFSET
;
LOG_D
(
MAC
,
"[eNB] MAC CE_LCID %d : Received PHR PH = %d (db)
\n
"
,
rx_ces
[
i
],
UE_list
->
UE_template
[
CC_id
][
UE_id
].
phr_info
);
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
phr_info
=
(
payload_ptr
[
0
]
&
0x3f
)
-
PHR_MAPPING_OFFSET
;
LOG_D
(
MAC
,
"[eNB] MAC CE_LCID %d : Received PHR PH = %d (db)
\n
"
,
rx_ces
[
i
],
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
phr_info
);
}
payload_ptr
+=
sizeof
(
POWER_HEADROOM_CMD
);
break
;
...
...
@@ -115,25 +115,25 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
lcgid
=
(
payload_ptr
[
0
]
>>
6
);
LOG_D
(
MAC
,
"[eNB] MAC CE_LCID %d : Received short BSR LCGID = %u bsr = %d
\n
"
,
rx_ces
[
i
],
lcgid
,
payload_ptr
[
0
]
&
0x3f
);
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
lcgid
]
=
(
payload_ptr
[
0
]
&
0x3f
);
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
lcgid
]
=
(
payload_ptr
[
0
]
&
0x3f
);
}
payload_ptr
+=
1
;
//sizeof(SHORT_BSR); // fixme
}
break
;
case
LONG_BSR
:
if
(
UE_id
!=
UE_INDEX_INVALID
){
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID0
]
=
((
payload_ptr
[
0
]
&
0xFC
)
>>
2
);
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID1
]
=
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID0
]
=
((
payload_ptr
[
0
]
&
0xFC
)
>>
2
);
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID1
]
=
((
payload_ptr
[
0
]
&
0x03
)
<<
4
)
|
((
payload_ptr
[
1
]
&
0xF0
)
>>
4
);
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID2
]
=
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID2
]
=
((
payload_ptr
[
1
]
&
0x0F
)
<<
2
)
|
((
payload_ptr
[
2
]
&
0xC0
)
>>
6
);
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID3
]
=
(
payload_ptr
[
2
]
&
0x3F
);
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID3
]
=
(
payload_ptr
[
2
]
&
0x3F
);
LOG_D
(
MAC
,
"[eNB] MAC CE_LCID %d: Received long BSR LCGID0 = %u LCGID1 = "
"%u LCGID2 = %u LCGID3 = %u
\n
"
,
rx_ces
[
i
],
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID0
],
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID1
],
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID2
],
UE_list
->
UE_template
[
CC_id
][
UE_id
].
bsr_info
[
LCGID3
]);
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID0
],
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID1
],
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID2
],
UE_list
->
UE_template
[
CC_id
P
][
UE_id
].
bsr_info
[
LCGID3
]);
}
payload_ptr
+=
3
;
////sizeof(LONG_BSR);
break
;
...
...
@@ -154,26 +154,26 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
for
(
ii
=
0
;
ii
<
NB_RA_PROC_MAX
;
ii
++
)
{
LOG_D
(
MAC
,
"[RAPROC] Checking proc %d : rnti (%x, %x), active %d
\n
"
,
ii
,
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
rnti
,
rntiP
,
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
RA_active
);
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
rnti
,
rntiP
,
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
RA_active
);
if
((
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
rnti
==
rntiP
)
&&
(
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
RA_active
==
TRUE
))
{
if
((
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
rnti
==
rntiP
)
&&
(
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
RA_active
==
TRUE
))
{
//payload_ptr = parse_ulsch_header(msg3,&num_ce,&num_sdu,rx_ces,rx_lcids,rx_lengths,msg3_len);
if
(
UE_id
<
0
)
{
memcpy
(
&
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
cont_res_id
[
0
],
payload_ptr
,
6
);
memcpy
(
&
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
cont_res_id
[
0
],
payload_ptr
,
6
);
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionRequest: length %d, offset %d
\n
"
,
enb_mod_idP
,
frameP
,
rx_lengths
[
ii
],
payload_ptr
-
sdu
);
if
((
UE_id
=
add_new_ue
(
enb_mod_idP
,
CC_id
,
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
rnti
))
==
-
1
)
enb_mod_idP
,
frameP
,
rx_lengths
[
ii
],
payload_ptr
-
sdu
P
);
if
((
UE_id
=
add_new_ue
(
enb_mod_idP
,
CC_id
P
,
eNB
->
common_channels
[
CC_idP
].
RA_template
[
ii
].
rnti
,
harq_pidP
))
==
-
1
)
mac_xface
->
macphy_exit
(
"[MAC][eNB] Max user count reached
\n
"
);
else
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d Added user with rnti %x => UE %d
\n
"
,
enb_mod_idP
,
frameP
,
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
rnti
,
UE_id
);
enb_mod_idP
,
frameP
,
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
rnti
,
UE_id
);
}
else
{
LOG_I
(
MAC
,
"[eNB %d][RAPROC] Frame %d CCCH: Received RRCConnectionReestablishment from UE %d: length %d, offset %d
\n
"
,
enb_mod_idP
,
frameP
,
UE_id
,
rx_lengths
[
ii
],
payload_ptr
-
sdu
);
enb_mod_idP
,
frameP
,
UE_id
,
rx_lengths
[
ii
],
payload_ptr
-
sdu
P
);
}
if
(
Is_rrc_registered
==
1
)
...
...
@@ -184,8 +184,8 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
// process_ra_message(msg3,num_ce,rx_lcids,rx_ces);
}
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
generate_Msg4
=
1
;
eNB
->
common_channels
[
CC_id
].
RA_template
[
ii
].
wait_ack_Msg4
=
0
;
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
generate_Msg4
=
1
;
eNB
->
common_channels
[
CC_id
P
].
RA_template
[
ii
].
wait_ack_Msg4
=
0
;
}
// if process is active
...
...
@@ -195,10 +195,10 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
break
;
case
DCCH
:
case
DCCH1
:
// if(eNB_mac_inst[module_idP][CC_id].Dcch_lchan[UE_id].Active==1){
// if(eNB_mac_inst[module_idP][CC_id
P
].Dcch_lchan[UE_id].Active==1){
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
LOG_T
(
MAC
,
"offset: %d
\n
"
,(
unsigned
char
)((
unsigned
char
*
)
payload_ptr
-
sdu
));
LOG_T
(
MAC
,
"offset: %d
\n
"
,(
unsigned
char
)((
unsigned
char
*
)
payload_ptr
-
sdu
P
));
for
(
j
=
0
;
j
<
32
;
j
++
)
LOG_T
(
MAC
,
"%x "
,
payload_ptr
[
j
]);
LOG_T
(
MAC
,
"
\n
"
);
...
...
@@ -215,17 +215,17 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
rx_lengths
[
i
],
1
,
NULL
);
//(unsigned int*)crc_status);
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
num_pdu_rx
[
rx_lcids
[
i
]]
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
num_bytes_rx
[
rx_lcids
[
i
]]
+=
rx_lengths
[
i
];
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
num_pdu_rx
[
rx_lcids
[
i
]]
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
num_bytes_rx
[
rx_lcids
[
i
]]
+=
rx_lengths
[
i
];
}
// }
break
;
case
DTCH
:
// default DRB
// if(eNB_mac_inst[module_idP][CC_id].Dcch_lchan[UE_id].Active==1){
// if(eNB_mac_inst[module_idP][CC_id
P
].Dcch_lchan[UE_id].Active==1){
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
LOG_T
(
MAC
,
"offset: %d
\n
"
,(
unsigned
char
)((
unsigned
char
*
)
payload_ptr
-
sdu
));
LOG_T
(
MAC
,
"offset: %d
\n
"
,(
unsigned
char
)((
unsigned
char
*
)
payload_ptr
-
sdu
P
));
for
(
j
=
0
;
j
<
32
;
j
++
)
LOG_T
(
MAC
,
"%x "
,
payload_ptr
[
j
]);
LOG_T
(
MAC
,
"
\n
"
);
...
...
@@ -241,14 +241,14 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
rx_lengths
[
i
],
1
,
NULL
);
//(unsigned int*)crc_status);
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
num_pdu_rx
[
rx_lcids
[
i
]]
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
num_bytes_rx
[
rx_lcids
[
i
]]
+=
rx_lengths
[
i
];
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
num_pdu_rx
[
rx_lcids
[
i
]]
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
num_bytes_rx
[
rx_lcids
[
i
]]
+=
rx_lengths
[
i
];
}
// }
break
;
default
:
//if (rx_lcids[i] >= DTCH) {
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
num_errors_rx
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
num_errors_rx
+=
1
;
LOG_E
(
MAC
,
"[eNB %d] received unsupported or unknown LCID %d from UE %d "
,
rx_lcids
[
i
],
UE_id
);
break
;
}
...
...
@@ -256,8 +256,8 @@ void rx_sdu(module_id_t enb_mod_idP,int CC_id,frame_t frameP,rnti_t rntiP,uint8_
}
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
total_pdu_bytes_rx
+=
sdu_len
;
UE_list
->
eNB_UE_stats
[
CC_id
][
UE_id
].
total_num_pdus_rx
+=
1
;
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
total_pdu_bytes_rx
+=
sdu_lenP
;
UE_list
->
eNB_UE_stats
[
CC_id
P
][
UE_id
].
total_num_pdus_rx
+=
1
;
vcd_signal_dumper_dump_function_by_name
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RX_SDU
,
0
);
stop_meas
(
&
eNB
->
rx_ulsch_sdu
);
...
...
@@ -499,7 +499,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
UE_list_t
*
UE_list
=&
eNB
->
UE_list
;
UE_TEMPLATE
*
UE_template
;
int
rvidx_tab
[
4
]
=
{
0
,
3
,
1
,
2
};
int
rvidx_tab
[
4
]
=
{
0
,
2
,
3
,
1
};
// loop over all active UEs
...
...
@@ -571,8 +571,7 @@ void schedule_ulsch_rnti(module_id_t module_idP,
UE_template
->
oldNDI_UL
[
harq_pid
]
=
ndi
;
mcs
=
openair_daq_vars
.
target_ue_ul_mcs
;
}
LOG_D
(
MAC
,
"[eNB %d] ULSCH scheduler: Ndi %d, mcs %d
\n
"
,
module_idP
,
ndi
,
mcs
);
LOG_D
(
MAC
,
"[eNB %d] ULSCH scheduler: harq_pid %d, Ndi %d, mcs %d
\n
"
,
module_idP
,
harq_pid
,
ndi
,
mcs
);
/* if((cooperation_flag > 0) && (UE_id == 1)) { // Allocation on same set of RBs
// RIV:resource indication value // function in openair1/PHY/LTE_TRANSPORT/dci_tools.c
...
...
@@ -623,11 +622,13 @@ void schedule_ulsch_rnti(module_id_t module_idP,
}
//rb_table_index = 8;
LOG_I
(
MAC
,
"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d)
\n
"
,
module_idP
,
harq_pid
,
rnti
,
frameP
,
subframeP
,
mcs
,
*
first_rb
,
rb_table
[
rb_table_index
],
rb_table_index
,
mac_xface
->
get_TBS_UL
(
mcs
,
rb_table
[
rb_table_index
]),
harq_pid
);
LOG_I
(
MAC
,
"[eNB %d][PUSCH %d/%x] Frame %d subframeP %d Scheduled UE (mcs %d, first rb %d, nb_rb %d, rb_table_index %d, TBS %d, harq_pid %d,DAI %d)
\n
"
,
module_idP
,
harq_pid
,
rnti
,
frameP
,
subframeP
,
mcs
,
*
first_rb
,
rb_table
[
rb_table_index
],
rb_table_index
,
mac_xface
->
get_TBS_UL
(
mcs
,
rb_table
[
rb_table_index
]),
harq_pid
,
UE_template
->
DAI_ul
[
sched_subframe
]);
rballoc
=
mac_xface
->
computeRIV
(
mac_xface
->
lte_frame_parms
->
N_RB_UL
,
*
first_rb
,
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/main.c
View file @
4593a2a3
...
...
@@ -417,7 +417,6 @@ int l2_init(LTE_DL_FRAME_PARMS *frame_parms,int eMBMS_active, uint8_t cba_group_
mac_xface
->
eNB_dlsch_ulsch_scheduler
=
eNB_dlsch_ulsch_scheduler
;
mac_xface
->
get_dci_sdu
=
get_dci_sdu
;
mac_xface
->
fill_rar
=
fill_rar
;
mac_xface
->
terminate_ra_proc
=
terminate_ra_proc
;
mac_xface
->
initiate_ra_proc
=
initiate_ra_proc
;
mac_xface
->
cancel_ra_proc
=
cancel_ra_proc
;
mac_xface
->
SR_indication
=
SR_indication
;
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/proto.h
View file @
4593a2a3
...
...
@@ -258,13 +258,6 @@ uint16_t fill_rar(module_id_t module_idP,
uint16_t
N_RB_UL
,
uint8_t
input_buffer_length
);
/* \brief This function indicates the end of RA procedure and provides the l3msg received on ULSCH.
@param Mod_id Instance ID of eNB
@param rnti RNTI of UE transmitting l3msg
@param l3msg Pointer to received l3msg
*/
void
terminate_ra_proc
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
*
l3msg
,
uint16_t
l3msg_len
);
/* \brief Function to indicate a failed RA response. It removes all temporary variables related to the initial connection of a UE
@param Mod_id Instance ID of eNB
@param preamble_index index of the received RA request.
...
...
@@ -275,8 +268,9 @@ void cancel_ra_proc(module_id_t module_idP,int CC_id,frame_t frameP, uint16_t pr
@param Mod_id Instance ID of eNB
@param rnti RNTI of UE transmitting the SR
@param sdu Pointer to received SDU
@param harq_pid Index of harq process corresponding to this sdu
*/
void
rx_sdu
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
*
sdu
,
uint16_t
sdu_len
);
void
rx_sdu
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
*
sdu
,
uint16_t
sdu_len
,
int
harq_pid
);
/* \brief Function to indicate a scheduled schduling request (SR) was received by eNB.
@param Mod_id Instance ID of eNB
...
...
@@ -476,7 +470,7 @@ uint8_t *parse_ulsch_header(uint8_t *mac_header,
int
l2_init
(
LTE_DL_FRAME_PARMS
*
frame_parms
,
int
eMBMS_active
,
uint8_t
cba_group_active
,
uint8_t
HO_active
);
int
mac_init
(
void
);
int
add_new_ue
(
module_id_t
Mod_id
,
int
CC_id
,
rnti_t
rnti
);
int
add_new_ue
(
module_id_t
Mod_id
,
int
CC_id
,
rnti_t
rnti
,
int
harq_pid
);
int
mac_remove_ue
(
module_id_t
Mod_id
,
int
UE_id
);
void
swap_UEs
(
UE_list_t
*
listP
,
int
nodeiP
,
int
nodejP
);
...
...
This diff is collapsed.
Click to expand it.
openair2/PHY_INTERFACE/defs.h
View file @
4593a2a3
...
...
@@ -75,9 +75,6 @@ typedef struct
/// Fill random access response sdu, passing timing advance
uint16_t
(
*
fill_rar
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
uint8_t
*
dlsch_buffer
,
uint16_t
N_RB_UL
,
uint8_t
input_buffer_length
);
/// Terminate the RA procedure upon reception of l3msg on ulsch
void
(
*
terminate_ra_proc
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
uint16_t
UE_id
,
uint8_t
*
l3msg
,
uint16_t
l3msg_len
);
/// Initiate the RA procedure upon reception (hypothetical) of a valid preamble
void
(
*
initiate_ra_proc
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
uint16_t
preamble
,
int16_t
timing_offset
,
uint8_t
sect_id
,
sub_frame_t
subframe
,
uint8_t
f_id
);
...
...
@@ -91,7 +88,7 @@ typedef struct
uint8_t
*
(
*
get_dlsch_sdu
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
TB_index
);
/// Send ULSCH sdu to MAC for given rnti
void
(
*
rx_sdu
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
*
sdu
,
uint16_t
sdu_len
);
void
(
*
rx_sdu
)(
module_id_t
Mod_id
,
int
CC_id
,
frame_t
frameP
,
rnti_t
rnti
,
uint8_t
*
sdu
,
uint16_t
sdu_len
,
int
harq_pid
);
/// Indicate failure to synch to external source
void
(
*
mrbch_phy_sync_failure
)
(
module_id_t
Mod_id
,
frame_t
frameP
,
uint8_t
free_eNB_index
);
...
...
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