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
c9ab59fc
Commit
c9ab59fc
authored
Nov 12, 2018
by
Wang Tsu-Han
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for misplacing L1_rxtx_proc_t with L1_proc_t
parent
17bb5db3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
13 deletions
+13
-13
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
+1
-1
openair1/SCHED/phy_mac_stub.c
openair1/SCHED/phy_mac_stub.c
+1
-1
openair1/SIMULATION/LTE_PHY/pdcchsim.c
openair1/SIMULATION/LTE_PHY/pdcchsim.c
+1
-1
openair1/SIMULATION/LTE_PHY/ulsim.c
openair1/SIMULATION/LTE_PHY/ulsim.c
+3
-3
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+7
-7
No files found.
openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c
View file @
c9ab59fc
...
@@ -4222,7 +4222,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
...
@@ -4222,7 +4222,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
/*
/*
int generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB *eNB,
int generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB *eNB,
eNB
_rxtx_proc_t *proc,
L1
_rxtx_proc_t *proc,
void *dci_pdu,
void *dci_pdu,
uint16_t rnti,
uint16_t rnti,
DCI_format_t dci_format,
DCI_format_t dci_format,
...
...
openair1/SCHED/phy_mac_stub.c
View file @
c9ab59fc
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
uint8_t
dci_ndi_toggle_even
[
8
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
uint8_t
dci_ndi_toggle_even
[
8
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
uint8_t
dci_ndi_toggle_odd
[
8
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
uint8_t
dci_ndi_toggle_odd
[
8
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
void
fill_dci
(
DCI_PDU
*
DCI_pdu
,
PHY_VARS_eNB
*
eNB
,
L1_proc_t
*
proc
)
void
fill_dci
(
DCI_PDU
*
DCI_pdu
,
PHY_VARS_eNB
*
eNB
,
L1_
rxtx_
proc_t
*
proc
)
{
{
/* SYRTEM */
/* SYRTEM */
uint8_t
*
dci_ndi_toggle_tmp
=
NULL
;
uint8_t
*
dci_ndi_toggle_tmp
=
NULL
;
...
...
openair1/SIMULATION/LTE_PHY/pdcchsim.c
View file @
c9ab59fc
...
@@ -750,7 +750,7 @@ int main(int argc, char **argv)
...
@@ -750,7 +750,7 @@ int main(int argc, char **argv)
0
,
0
,
0
);
0
);
L1_proc_t
*
proc_rxtx
=
(
subframe
==
0
)
?
&
eNB
->
proc
.
L1_proc
:
&
eNB
->
proc
.
L1_proc_tx
;
L1_
rxtx_
proc_t
*
proc_rxtx
=
(
subframe
==
0
)
?
&
eNB
->
proc
.
L1_proc
:
&
eNB
->
proc
.
L1_proc_tx
;
eNB
->
ulsch
[
0
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
N_RB_DL
,
0
);
eNB
->
ulsch
[
0
]
=
new_eNB_ulsch
(
MAX_TURBO_ITERATIONS
,
N_RB_DL
,
0
);
UE
->
ulsch
[
0
]
=
new_ue_ulsch
(
N_RB_DL
,
0
);
UE
->
ulsch
[
0
]
=
new_ue_ulsch
(
N_RB_DL
,
0
);
...
...
openair1/SIMULATION/LTE_PHY/ulsim.c
View file @
c9ab59fc
...
@@ -85,8 +85,8 @@ int nfapi_mode = 0;
...
@@ -85,8 +85,8 @@ int nfapi_mode = 0;
extern
void
fep_full
(
RU_t
*
ru
);
extern
void
fep_full
(
RU_t
*
ru
);
extern
void
ru_fep_full_2thread
(
RU_t
*
ru
);
extern
void
ru_fep_full_2thread
(
RU_t
*
ru
);
extern
void
eNB_fep_full
(
PHY_VARS_eNB
*
eNB
,
L1_proc_t
*
proc
);
extern
void
eNB_fep_full
(
PHY_VARS_eNB
*
eNB
,
L1_
rxtx_
proc_t
*
proc
);
extern
void
eNB_fep_full_2thread
(
PHY_VARS_eNB
*
eNB
,
L1_proc_t
*
proc
);
extern
void
eNB_fep_full_2thread
(
PHY_VARS_eNB
*
eNB
,
L1_
rxtx_
proc_t
*
proc
);
nfapi_dl_config_request_t
DL_req
;
nfapi_dl_config_request_t
DL_req
;
nfapi_ul_config_request_t
UL_req
;
nfapi_ul_config_request_t
UL_req
;
...
@@ -818,7 +818,7 @@ int main(int argc, char **argv) {
...
@@ -818,7 +818,7 @@ int main(int argc, char **argv) {
UE
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
UE
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
eNB
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
eNB
->
frame_parms
.
pusch_config_common
.
ul_ReferenceSignalsPUSCH
.
groupAssignmentPUSCH
=
0
;
UE
->
mac_enabled
=
0
;
UE
->
mac_enabled
=
0
;
L1_proc_t
*
proc_rxtx
=
&
eNB
->
proc
.
L1_proc
;
L1_
rxtx_
proc_t
*
proc_rxtx
=
&
eNB
->
proc
.
L1_proc
;
UE_rxtx_proc_t
*
proc_rxtx_ue
=
&
UE
->
proc
.
proc_rxtx
[
subframe
&
1
];
UE_rxtx_proc_t
*
proc_rxtx_ue
=
&
UE
->
proc
.
proc_rxtx
[
subframe
&
1
];
proc_rxtx
->
frame_rx
=
1
;
proc_rxtx
->
frame_rx
=
1
;
proc_rxtx
->
subframe_rx
=
subframe
;
proc_rxtx
->
subframe_rx
=
subframe
;
...
...
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
c9ab59fc
...
@@ -590,7 +590,7 @@ int dl_config_req_UE_MAC(nfapi_dl_config_request_t* req, module_id_t Mod_id) //,
...
@@ -590,7 +590,7 @@ int dl_config_req_UE_MAC(nfapi_dl_config_request_t* req, module_id_t Mod_id) //,
//Mod_id = 0; // Currently static (only for one UE) but this should change.
//Mod_id = 0; // Currently static (only for one UE) but this should change.
/*struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
/*struct PHY_VARS_eNB_s *eNB = RC.eNB[0][0];
L1_proc_t *proc = &eNB->proc.L1_proc;*/
L1_
rxtx_
proc_t *proc = &eNB->proc.L1_proc;*/
nfapi_dl_config_request_pdu_t
*
dl_config_pdu_list
=
req
->
dl_config_request_body
.
dl_config_pdu_list
;
nfapi_dl_config_request_pdu_t
*
dl_config_pdu_list
=
req
->
dl_config_request_body
.
dl_config_pdu_list
;
nfapi_dl_config_request_pdu_t
*
dl_config_pdu_tmp
;
nfapi_dl_config_request_pdu_t
*
dl_config_pdu_tmp
;
...
@@ -941,14 +941,14 @@ void UE_config_stub_pnf(void) {
...
@@ -941,14 +941,14 @@ void UE_config_stub_pnf(void) {
/* Dummy functions*/
/* Dummy functions*/
void
handle_nfapi_hi_dci0_dci_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_proc_t
*
proc
,
void
handle_nfapi_hi_dci0_dci_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_hi_dci0_request_pdu_t
*
hi_dci0_config_pdu
)
nfapi_hi_dci0_request_pdu_t
*
hi_dci0_config_pdu
)
{
{
}
}
void
handle_nfapi_hi_dci0_hi_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_proc_t
*
proc
,
void
handle_nfapi_hi_dci0_hi_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_hi_dci0_request_pdu_t
*
hi_dci0_config_pdu
)
nfapi_hi_dci0_request_pdu_t
*
hi_dci0_config_pdu
)
{
{
...
@@ -957,14 +957,14 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_pro
...
@@ -957,14 +957,14 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_pro
void
handle_nfapi_dci_dl_pdu
(
PHY_VARS_eNB
*
eNB
,
void
handle_nfapi_dci_dl_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
int
frame
,
int
subframe
,
L1_proc_t
*
proc
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
)
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
)
{
{
}
}
void
handle_nfapi_bch_pdu
(
PHY_VARS_eNB
*
eNB
,
L1_proc_t
*
proc
,
void
handle_nfapi_bch_pdu
(
PHY_VARS_eNB
*
eNB
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
,
uint8_t
*
sdu
)
uint8_t
*
sdu
)
{
{
...
@@ -972,7 +972,7 @@ void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_proc_t *proc,
...
@@ -972,7 +972,7 @@ void handle_nfapi_bch_pdu(PHY_VARS_eNB *eNB,L1_proc_t *proc,
}
}
void
handle_nfapi_dlsch_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_proc_t
*
proc
,
void
handle_nfapi_dlsch_pdu
(
PHY_VARS_eNB
*
eNB
,
int
frame
,
int
subframe
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
,
nfapi_dl_config_request_pdu_t
*
dl_config_pdu
,
uint8_t
codeword_index
,
uint8_t
codeword_index
,
uint8_t
*
sdu
)
uint8_t
*
sdu
)
...
@@ -981,7 +981,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_proc_t *
...
@@ -981,7 +981,7 @@ void handle_nfapi_dlsch_pdu(PHY_VARS_eNB *eNB,int frame,int subframe,L1_proc_t *
}
}
void
handle_nfapi_ul_pdu
(
PHY_VARS_eNB
*
eNB
,
L1_proc_t
*
proc
,
void
handle_nfapi_ul_pdu
(
PHY_VARS_eNB
*
eNB
,
L1_
rxtx_
proc_t
*
proc
,
nfapi_ul_config_request_pdu_t
*
ul_config_pdu
,
nfapi_ul_config_request_pdu_t
*
ul_config_pdu
,
uint16_t
frame
,
uint8_t
subframe
,
uint8_t
srs_present
)
uint16_t
frame
,
uint8_t
subframe
,
uint8_t
srs_present
)
{
{
...
...
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