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
faa9fa8e
Commit
faa9fa8e
authored
Feb 20, 2018
by
hongzhi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
re-adding UL TBS table
parent
b6a21283
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
35 additions
and
6 deletions
+35
-6
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
+2
-2
openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h
openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h
+28
-0
openair1/PHY/LTE_TRANSPORT/extern.h
openair1/PHY/LTE_TRANSPORT/extern.h
+1
-1
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+4
-3
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools.c
View file @
faa9fa8e
...
...
@@ -8224,7 +8224,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
}
//LOG_E(PHY,"Fatal: mcs(%d) > 28!!! and round == 0\n", mcs);
}
ulsch
->
harq_processes
[
harq_pid
]
->
TBS
=
TBStable
[
get_I_TBS_UL
(
ulsch
->
harq_processes
[
harq_pid
]
->
mcs
)][
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
-
1
];
ulsch
->
harq_processes
[
harq_pid
]
->
TBS
=
TBStable
UL
[
get_I_TBS_UL
(
ulsch
->
harq_processes
[
harq_pid
]
->
mcs
)][
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
-
1
];
/*
else if (ulsch->harq_processes[harq_pid]->mcs == 29) {
...
...
@@ -8875,7 +8875,7 @@ int generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB *eNB,
// printf("Auto-Calibration (eNB): mcs %d, nb_rb %d\n",ulsch->harq_processes[harq_pid]->mcs,ulsch->harq_processes[harq_pid]->nb_rb);
}
*/
ulsch
->
harq_processes
[
harq_pid
]
->
TBS
=
TBStable
[
get_I_TBS_UL
(
ulsch
->
harq_processes
[
harq_pid
]
->
mcs
)][
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
-
1
];
ulsch
->
harq_processes
[
harq_pid
]
->
TBS
=
TBStable
UL
[
get_I_TBS_UL
(
ulsch
->
harq_processes
[
harq_pid
]
->
mcs
)][
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
-
1
];
ulsch
->
harq_processes
[
harq_pid
]
->
Msc_initial
=
12
*
ulsch
->
harq_processes
[
harq_pid
]
->
nb_rb
;
ulsch
->
harq_processes
[
harq_pid
]
->
Nsymb_initial
=
ulsch
->
harq_processes
[
harq_pid
]
->
Nsymb_pusch
;
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h
View file @
faa9fa8e
This diff is collapsed.
Click to expand it.
openair1/PHY/LTE_TRANSPORT/extern.h
View file @
faa9fa8e
...
...
@@ -19,7 +19,7 @@
* contact@openairinterface.org
*/
extern
unsigned
int
dlsch_tbs25
[
27
][
25
],
TBStable
[
27
][
110
],
TBStable1C
[
32
];
extern
unsigned
int
dlsch_tbs25
[
27
][
25
],
TBStable
[
27
][
110
],
TBStable1C
[
32
]
,
TBStableUL
[
27
][
110
]
;
extern
unsigned
short
lte_cqi_eff1024
[
16
];
extern
char
lte_cqi_snr_dB
[
15
];
extern
short
conjugate
[
8
],
conjugate2
[
8
];
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
faa9fa8e
...
...
@@ -1720,14 +1720,15 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
#endif
}
#ifdef UE_DEBUG_TRACE
//
#ifdef UE_DEBUG_TRACE
LOG_I
(
PHY
,
"[UE %d][PUSCH %d] AbsSubframe %d.%d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, "
"[UE %d][PUSCH %d] AbsSubframe %d.%d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d,
tbs %d,
rv %d, "
"cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d, ack_status_cw0 %d ack_status_cw1 %d bundling %d, Nbundled %d, CQI %d, RI %d
\n
"
,
Mod_id
,
harq_pid
,
frame_tx
%
1024
,
nr_tti_tx
,
first_rb
,
nb_rb
,
ue
->
ulsch
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
round
,
ue
->
ulsch
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
mcs
,
ue
->
ulsch
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
TBS
,
ue
->
ulsch
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
rvidx
,
(
ue
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
cyclicShift
+
ue
->
ulsch
[
eNB_id
]
->
harq_processes
[
harq_pid
]
->
n_DMRS2
+
...
...
@@ -1742,7 +1743,7 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue
->
ulsch
[
eNB_id
]
->
bundling
,
Nbundled
,
cqi_status
,
ri_status
);
#endif
//
#endif
...
...
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