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
promise
OpenXG-RAN
Commits
7f02990f
Commit
7f02990f
authored
7 years ago
by
Xu Bo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix merge miss and 256UE bug
parent
57fd729b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
9 deletions
+21
-9
openair1/PHY/defs.h
openair1/PHY/defs.h
+2
-2
openair1/SCHED/fapi_l1.c
openair1/SCHED/fapi_l1.c
+4
-0
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+15
-7
No files found.
openair1/PHY/defs.h
View file @
7f02990f
...
...
@@ -1706,7 +1706,7 @@ typedef struct UE_RX_RECEIVE_INFO_s {
/// ue_num
uint16_t
ue_num
;
/// DLSCH info
UE_RX_INFO
ue_rx_info
[
2
0
];
UE_RX_INFO
ue_rx_info
[
2
5
];
}
UE_RX_RECEIVE_INFO
;
typedef
struct
eNB_RX_RECEIVE_INFO_s
{
...
...
@@ -1725,7 +1725,7 @@ typedef struct eNB_RX_RECEIVE_INFO_s {
/// ue_num
uint16_t
ue_num
;
// ULSCH info
eNB_RX_INFO
ulsch_info
[
20
];
eNB_RX_INFO
ulsch_info
[
35
];
}
eNB_RX_RECEIVE_INFO
;
#endif
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED/fapi_l1.c
View file @
7f02990f
...
...
@@ -95,7 +95,11 @@ void handle_nfapi_hi_dci0_hi_pdu(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,
phich
->
config
[
phich
->
num_hi
].
first_rb
=
hi_dci0_config_pdu
->
hi_pdu
.
hi_pdu_rel8
.
resource_block_start
;
phich
->
config
[
phich
->
num_hi
].
n_DMRS
=
hi_dci0_config_pdu
->
hi_pdu
.
hi_pdu_rel8
.
cyclic_shift_2_for_drms
;
phich
->
num_hi
++
;
#ifndef UE_EXPANSION_SIM2
AssertFatal
(
phich
->
num_hi
<
32
,
"Maximum number of phich reached in subframe
\n
"
);
#else
AssertFatal
(
phich
->
num_hi
<
36
,
"Maximum number of phich reached in subframe
\n
"
);
#endif
}
void
handle_nfapi_bch_pdu
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
...
...
This diff is collapsed.
Click to expand it.
targets/RT/USER/lte-ue.c
View file @
7f02990f
...
...
@@ -280,6 +280,10 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
UE
->
rfdevice
.
host_type
=
RAU_HOST
;
// UE->rfdevice.type = NONE_DEV;
PHY_VARS_UE
*
UE
=
PHY_vars_UE_g
[
inst
][
0
];
AssertFatal
(
0
==
pthread_create
(
&
UE
->
proc
.
pthread_ue
,
&
UE
->
proc
.
attr_ue
,
UE_thread
,
(
void
*
)
UE
),
""
);
#else
#ifdef NAS_UE
MessageDef
*
message_p
;
...
...
@@ -290,13 +294,17 @@ void init_UE(int nb_inst,int eMBMS_active, int uecap_xer_in) {
}
#ifdef UE_EXPANSION_SIM2
pthread_mutex_init
(
&
mutex_send
,
NULL
);
pthread_cond_init
(
&
cond_send
,
NULL
);
pthread_mutex_init
(
&
mutex_send
[
0
],
NULL
);
pthread_mutex_init
(
&
mutex_send
[
1
],
NULL
);
pthread_cond_init
(
&
cond_send
[
0
],
NULL
);
pthread_cond_init
(
&
cond_send
[
1
],
NULL
);
pthread_create
(
&
PHY_vars_UE_g
[
0
][
0
]
->
proc
.
pthread_phy_send
,
NULL
,
UE_phy_send
,
(
void
*
)
PHY_vars_UE_g
[
0
][
0
]);
for
(
inst
=
0
;
inst
<
RX_NB_TH
;
inst
++
){
pthread_create
(
&
PHY_vars_UE_g
[
0
][
0
]
->
proc
.
pthread_phy_send
,
NULL
,
UE_phy_send
,
(
void
*
)
&
inst
);
usleep
(
1000
);
}
pthread_create
(
&
PHY_vars_UE_g
[
0
][
0
]
->
proc
.
pthread_time
,
NULL
,
UE_time_sync
,(
void
*
)
NULL
);
pthread_create
(
&
PHY_vars_UE_g
[
0
][
0
]
->
proc
.
pthread_phy_stub
,
NULL
,
UE_phy_rev
,
(
void
*
)
NULL
);
#endif
printf
(
"UE threads created by %ld
\n
"
,
gettid
());
#if 0
...
...
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