Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG
OpenXG UE
Commits
719deab7
Commit
719deab7
authored
Apr 06, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning remove
parent
7d2f74bd
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
15 deletions
+8
-15
common/utils/T/T_defs.h
common/utils/T/T_defs.h
+2
-2
common/utils/system.c
common/utils/system.c
+0
-1
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
+2
-2
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+0
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+2
-7
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+2
-2
No files found.
common/utils/T/T_defs.h
View file @
719deab7
...
@@ -8,10 +8,10 @@
...
@@ -8,10 +8,10 @@
#define T_MAX_ARGS 16
#define T_MAX_ARGS 16
/* maximum size of a message - increase if needed */
/* maximum size of a message - increase if needed */
#define T_BUFFER_MAX (10
)
/*(1024*64)*/
#define T_BUFFER_MAX (10
24*64)
/* size of the local cache for messages (must be pow(2,something)) */
/* size of the local cache for messages (must be pow(2,something)) */
#define T_CACHE_SIZE (
1)
/*(8192 * 2)*/
#define T_CACHE_SIZE (
8192 * 2)
/* maximum number of bytes a message can contain */
/* maximum number of bytes a message can contain */
#ifdef T_SEND_TIME
#ifdef T_SEND_TIME
...
...
common/utils/system.c
View file @
719deab7
...
@@ -148,7 +148,6 @@ int background_system(char *command)
...
@@ -148,7 +148,6 @@ int background_system(char *command)
void
start_background_system
(
void
)
void
start_background_system
(
void
)
{
{
return
;
int
p
[
2
];
int
p
[
2
];
pid_t
son
;
pid_t
son
;
...
...
openair1/PHY/LTE_TRANSPORT/dlsch_modulation.c
View file @
719deab7
...
@@ -2175,8 +2175,8 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
...
@@ -2175,8 +2175,8 @@ int dlsch_modulation(PHY_VARS_eNB* phy_vars_eNB,
uint8_t
mod_order0
=
0
;
uint8_t
mod_order0
=
0
;
uint8_t
mod_order1
=
0
;
uint8_t
mod_order1
=
0
;
int16_t
amp_rho_a
,
amp_rho_b
;
int16_t
amp_rho_a
,
amp_rho_b
;
int16_t
q
psk_table_a0
[
2
],
qam16_table_a0
[
4
],
qam64_table_a0
[
8
],
qpsk_table_b0
[
2
],
qam16_table_b0
[
4
],
qam64_table_b0
[
8
];
int16_t
q
am16_table_a0
[
4
],
qam64_table_a0
[
8
],
qam16_table_b0
[
4
],
qam64_table_b0
[
8
];
//qpsk_table_a0[2],qpsk_table_b0[2]
int16_t
q
psk_table_a1
[
2
],
qam16_table_a1
[
4
],
qam64_table_a1
[
8
],
qpsk_table_b1
[
2
],
qam16_table_b1
[
4
],
qam64_table_b1
[
8
];
int16_t
q
am16_table_a1
[
4
],
qam64_table_a1
[
8
],
qam16_table_b1
[
4
],
qam64_table_b1
[
8
];
//qpsk_table_a1[2],qpsk_table_b1[2]
int16_t
*
qam_table_s0
=
NULL
,
*
qam_table_s1
=
NULL
;
int16_t
*
qam_table_s0
=
NULL
,
*
qam_table_s1
=
NULL
;
#ifdef NEW_ALLOC_RE
#ifdef NEW_ALLOC_RE
...
...
openair1/SCHED/fapi_l1.c
View file @
719deab7
...
@@ -201,7 +201,6 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_pr
...
@@ -201,7 +201,6 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,eNB_rxtx_pr
dlsch0_harq
->
pdsch_start
=
eNB
->
pdcch_vars
[
subframe
&
1
].
num_pdcch_symbols
;
dlsch0_harq
->
pdsch_start
=
eNB
->
pdcch_vars
[
subframe
&
1
].
num_pdcch_symbols
;
if
(
dlsch0_harq
->
round
==
0
)
{
//get pointer to SDU if this a new SDU
if
(
dlsch0_harq
->
round
==
0
)
{
//get pointer to SDU if this a new SDU
//if (sdu==NULL) printf("dlsch0_harq %p harq %d\n", dlsch0_harq, harq_pid);
AssertFatal
(
sdu
!=
NULL
,
"sdu==%d, NFAPI: SFN/SF:%04d%d proc:TX:[frame %d subframe %d]: programming dlsch for round 0, rnti %x, UE_id %d, harq_pid %d : sdu is null for pdu_index %d dlsch0_harq[round:%d SFN/SF:%d%d pdu:%p mcs:%d ndi:%d pdschstart:%d]
\n
"
,
AssertFatal
(
sdu
!=
NULL
,
"sdu==%d, NFAPI: SFN/SF:%04d%d proc:TX:[frame %d subframe %d]: programming dlsch for round 0, rnti %x, UE_id %d, harq_pid %d : sdu is null for pdu_index %d dlsch0_harq[round:%d SFN/SF:%d%d pdu:%p mcs:%d ndi:%d pdschstart:%d]
\n
"
,
*
sdu
,
frame
,
subframe
,
*
sdu
,
frame
,
subframe
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
rel8
->
rnti
,
UE_id
,
harq_pid
,
proc
->
frame_tx
,
proc
->
subframe_tx
,
rel8
->
rnti
,
UE_id
,
harq_pid
,
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
719deab7
...
@@ -399,7 +399,6 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,
...
@@ -399,7 +399,6 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,
dlsch
->
active
=
0
;
dlsch
->
active
=
0
;
dlsch_harq
->
round
++
;
dlsch_harq
->
round
++
;
//printf(" dlsch_harq ++ %p %d.%d harq %d rnti %d\n", dlsch_harq, frame, subframe, harq_pid, dlsch->rnti);
LOG_D
(
PHY
,
"Generating DLSCH/PDSCH dlsch_harq[round:%d]
\n
"
,
dlsch_harq
->
round
);
LOG_D
(
PHY
,
"Generating DLSCH/PDSCH dlsch_harq[round:%d]
\n
"
,
dlsch_harq
->
round
);
}
}
...
@@ -519,7 +518,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
...
@@ -519,7 +518,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
//LOG_D(PHY,"Before generate_dci_top num_pdcch_symbols:%d num_dci:%d dci_alloc:dci_length:%d\n", num_pdcch_symbols, num_dci, eNB->pdcch_vars[subframe&1].dci_alloc[0].dci_length);
//LOG_D(PHY,"Before generate_dci_top num_pdcch_symbols:%d num_dci:%d dci_alloc:dci_length:%d\n", num_pdcch_symbols, num_dci, eNB->pdcch_vars[subframe&1].dci_alloc[0].dci_length);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PDCCH_TX
,
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_ENB_PDCCH_TX
,
1
);
//printf("//////////************before generate_dci_top UL %d.%d TX %d.%d \n", ul_frame, ul_subframe, frame, subframe);
if
(
nfapi_mode
==
0
||
nfapi_mode
==
1
)
{
if
(
nfapi_mode
==
0
||
nfapi_mode
==
1
)
{
generate_dci_top
(
num_pdcch_symbols
,
generate_dci_top
(
num_pdcch_symbols
,
num_dci
,
num_dci
,
...
@@ -557,7 +556,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
...
@@ -557,7 +556,7 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
else
else
{
{
// generate pdsch
// generate pdsch
//printf("%d.%d pdsch_procedures ue rnti %d\n", frame, subframe, dlsch0->rnti);///////////////////////////////////**********************
pdsch_procedures
(
eNB
,
pdsch_procedures
(
eNB
,
proc
,
proc
,
harq_pid
,
harq_pid
,
...
@@ -1662,8 +1661,6 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
...
@@ -1662,8 +1661,6 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
// release DLSCH if needed
// release DLSCH if needed
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
release_harq
(
eNB
,
UE_id
,
i
,
frame
,
subframe
,
0xffff
,
ulsch_harq
->
o_ACK
[
i
]
==
1
);
//if (ulsch_harq->o_ACK[i] != 1)
//printf("got NACK %d.%d rnti %d harq %d\n", frame, subframe, rnti, eNB->dlsch[UE_id][0]->harq_ids[(subframe+6)%10]);
#if T_TRACER
#if T_TRACER
/* TODO: get correct harq pid */
/* TODO: get correct harq pid */
...
@@ -1763,8 +1760,6 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
...
@@ -1763,8 +1760,6 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
// release DLSCH if needed
// release DLSCH if needed
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
release_harq
(
eNB
,
UE_id
,
0
,
frame
,
subframe
,
0xffff
,
harq_ack
[
0
]
==
1
);
//if (harq_ack[0] != 1)
//printf("got NACK %d.%d rnti %d harq %d\n", frame, subframe, uci->rnti, eNB->dlsch[UE_id][0]->harq_ids[(subframe+6)%10]);
#if T_TRACER
#if T_TRACER
if
(
harq_ack
[
0
]
!=
1
)
if
(
harq_ack
[
0
]
!=
1
)
...
...
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
719deab7
...
@@ -928,7 +928,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
...
@@ -928,7 +928,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
eNB
->
DL_req
[
CC_id
].
sfn_sf
=
frameP
<<
4
|
subframeP
;
eNB
->
DL_req
[
CC_id
].
sfn_sf
=
frameP
<<
4
|
subframeP
;
eNB
->
DL_req
[
CC_id
].
header
.
message_id
=
NFAPI_DL_CONFIG_REQUEST
;
eNB
->
DL_req
[
CC_id
].
header
.
message_id
=
NFAPI_DL_CONFIG_REQUEST
;
//printf("doing retransmission for fill_nfapi_dlsch_config frame %d subframe %d rnti = %d harq_pid = %d\n", frameP, subframeP, rnti, harq_pid);
fill_nfapi_dlsch_config
(
eNB
,
dl_req
,
TBS
,
-
1
fill_nfapi_dlsch_config
(
eNB
,
dl_req
,
TBS
,
-
1
/* retransmission, no pdu_index */
/* retransmission, no pdu_index */
,
rnti
,
0
,
// type 0 allocation from 7.1.6 in 36.213
,
rnti
,
0
,
// type 0 allocation from 7.1.6 in 36.213
...
@@ -1455,7 +1455,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
...
@@ -1455,7 +1455,7 @@ schedule_ue_spec(module_id_t module_idP,slice_id_t slice_idP,
"physicalConfigDedicated is NULL
\n
"
);
"physicalConfigDedicated is NULL
\n
"
);
AssertFatal
(
UE_list
->
UE_template
[
CC_id
][
UE_id
].
physicalConfigDedicated
->
pdsch_ConfigDedicated
!=
NULL
,
AssertFatal
(
UE_list
->
UE_template
[
CC_id
][
UE_id
].
physicalConfigDedicated
->
pdsch_ConfigDedicated
!=
NULL
,
"physicalConfigDedicated->pdsch_ConfigDedicated is NULL
\n
"
);
"physicalConfigDedicated->pdsch_ConfigDedicated is NULL
\n
"
);
//printf("mac DL transmition with frame = %d, subframe = %d, rnti = %d, pdu_index = %p\n", frameP, subframeP, rnti, eNB->pdu_index);
fill_nfapi_dlsch_config
(
eNB
,
dl_req
,
TBS
,
eNB
->
pdu_index
[
CC_id
],
rnti
,
0
,
// type 0 allocation from 7.1.6 in 36.213
fill_nfapi_dlsch_config
(
eNB
,
dl_req
,
TBS
,
eNB
->
pdu_index
[
CC_id
],
rnti
,
0
,
// type 0 allocation from 7.1.6 in 36.213
0
,
// virtual_resource_block_assignment_flag, unused here
0
,
// virtual_resource_block_assignment_flag, unused here
0
,
// resource_block_coding, to be filled in later
0
,
// resource_block_coding, to be filled in later
...
...
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