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
Michael Black
OpenXG UE
Commits
c6c0459a
Commit
c6c0459a
authored
Jul 06, 2018
by
oai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix basic_simulator compilation failure
parent
f3a82884
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
24 deletions
+32
-24
common/utils/T/T.h
common/utils/T/T.h
+24
-3
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+6
-4
openair2/NETWORK_DRIVER/UE_IP/device.c
openair2/NETWORK_DRIVER/UE_IP/device.c
+2
-2
targets/RT/USER/lte-softmodem.h
targets/RT/USER/lte-softmodem.h
+0
-15
No files found.
common/utils/T/T.h
View file @
c6c0459a
...
...
@@ -14,6 +14,7 @@
/* T message IDs */
#include "T_IDs.h"
#define T_ACTIVE_STDOUT 2
/* known type - this is where you add new types */
#define T_INT(x) int, (x)
...
...
@@ -99,7 +100,7 @@ struct T_header;
20,19,18,17,16,15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0)(__VA_ARGS__)
#define TN_N(n0,n1,n2,n3,n4,n5,n6,n7,n8,n9,n10,n11,n12,n13,n14,n15,n16,n17,\
n18,n19,n20,n21,n22,n23,n24,n25,n26,n27,n28,n29,n30,n31,n32,n,...) T##n
#define T(...)
TN(__VA_ARGS__)
#define T(...)
if(T_stdout == 0) {TN(__VA_ARGS__);}
/* type used to send arbitrary buffer data */
typedef
struct
{
...
...
@@ -564,10 +565,30 @@ extern T_cache_t *T_cache;
} \
} while (0)
extern
int
*
T_active
;
void
T_init
(
int
remote_port
,
int
wait_for_tracer
,
int
dont_fork
);
#define CONFIG_HLP_TPORT "tracer port\n"
#define CONFIG_HLP_NOTWAIT "don't wait for tracer, start immediately\n"
#define CONFIG_HLP_TNOFORK "to ease debugging with gdb\n"
#define CONFIG_HLP_STDOUT "print log messges on console\n"
#define TTRACER_CONFIG_PREFIX "TTracer"
/*------------------------------------------------------------------------------------------------------------------------------------------*/
/* configuration parameters for TTRACE utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*------------------------------------------------------------------------------------------------------------------------------------------*/
#define CMDLINE_TTRACEPARAMS_DESC { \
{"T_port", CONFIG_HLP_TPORT, 0, iptr:&T_port, defintval:2021, TYPE_INT, 0}, \
{"T_nowait", CONFIG_HLP_NOTWAIT, PARAMFLAG_BOOL, iptr:&T_nowait, defintval:0, TYPE_INT, 0}, \
{"T_dont_fork", CONFIG_HLP_TNOFORK, PARAMFLAG_BOOL, iptr:&T_dont_fork, defintval:0, TYPE_INT, 0}, \
{"T_stdout", CONFIG_HLP_STDOUT, PARAMFLAG_BOOL, iptr:&T_stdout, defintval:1, TYPE_INT, 0}, \
}
extern
int
*
T_active
;
extern
int
T_stdout
;
/* log on stdout */
void
T_init
(
int
remote_port
,
int
wait_for_tracer
,
int
dont_fork
);
void
T_Config_Init
(
void
);
#else
/* T_TRACER */
/* if T_TRACER is not defined or is 0, the T is deactivated */
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
c6c0459a
...
...
@@ -1769,13 +1769,14 @@ void fill_ulsch_harq_indication(PHY_VARS_eNB *eNB,LTE_UL_eNB_HARQ_t *ulsch_harq,
{
int
subframe_tx
=
(
subframe
+
6
)
%
10
;
int
frame_tx
=
subframe_tx
>=
6
?
(
frame
+
1023
)
%
1024
:
frame
;
if
(
ulsch_harq
->
o_ACK
[
i
]
!=
1
)
if
(
ulsch_harq
->
o_ACK
[
i
]
!=
1
)
{
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
else
}
else
{
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
}
}
#endif
}
}
...
...
@@ -1871,13 +1872,14 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
{
int
subframe_tx
=
(
subframe
+
6
)
%
10
;
int
frame_tx
=
subframe_tx
>=
6
?
(
frame
+
1023
)
%
1024
:
frame
;
if
(
harq_ack
[
0
]
!=
1
)
if
(
harq_ack
[
0
]
!=
1
)
{
T
(
T_ENB_PHY_DLSCH_UE_NACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
uci
->
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
else
}
else
{
T
(
T_ENB_PHY_DLSCH_UE_ACK
,
T_INT
(
0
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
uci
->
rnti
),
T_INT
(
eNB
->
dlsch
[
UE_id
][
0
]
->
harq_ids
[
frame_tx
%
2
][
subframe_tx
]));
}
}
#endif
}
else
if
(
uci
->
pucch_fmt
==
pucch_format1b
)
{
...
...
openair2/NETWORK_DRIVER/UE_IP/device.c
View file @
c6c0459a
...
...
@@ -236,7 +236,7 @@ int ue_ip_hard_start_xmit(struct sk_buff *skb_pP, struct net_device *dev_pP)
// End debug information
netif_stop_queue
(
dev_pP
);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ||
RHEL_RELEASE_CODE >= 1796
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ||
(defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796)
netif_trans_update
(
dev_pP
);
#else
dev_pP
->
trans_start
=
jiffies
;
...
...
@@ -312,7 +312,7 @@ void ue_ip_tx_timeout(struct net_device *dev_pP)
printk
(
"[UE_IP_DRV][%s] begin
\n
"
,
__FUNCTION__
);
// (ue_ip_priv_t *)(dev_pP->priv_p)->stats.tx_errors++;
(
priv_p
->
stats
).
tx_errors
++
;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ||
RHEL_RELEASE_CODE >= 1796
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,7,0) ||
(defined RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 1796)
netif_trans_update
(
dev_pP
);
#else
dev_pP
->
trans_start
=
jiffies
;
...
...
targets/RT/USER/lte-softmodem.h
View file @
c6c0459a
...
...
@@ -209,21 +209,6 @@
#define CMDLINE_STARTTELN_IDX 3
extern
int
T_port
;
extern
int
T_nowait
;
extern
int
T_dont_fork
;
/*------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters for TTRACE utility */
/* optname helpstr paramflags XXXptr defXXXval type numelt */
/*------------------------------------------------------------------------------------------------------------------------------------------*/
#define CMDLINE_TTRACEPARAMS_DESC { \
{"T_port", CONFIG_HLP_TPORT, 0, iptr:&T_port, defintval:0, TYPE_INT, 0}, \
{"T_nowait", CONFIG_HLP_NOTWAIT, PARAMFLAG_BOOL, iptr:&T_nowait, defintval:0, TYPE_INT, 0}, \
{"T_dont_fork", CONFIG_HLP_TNOFORK, PARAMFLAG_BOOL, iptr:&T_dont_fork, defintval:1, TYPE_INT, 0}, \
}
/***************************************************************************************************************************************/
/* */
extern
pthread_cond_t
sync_cond
;
...
...
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