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
e4b6e855
Commit
e4b6e855
authored
Sep 11, 2019
by
Daniel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
debug openair1 error (delete PHY/defs.h modify openair2/ENB_APP/enb_config.h)
parent
72542401
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
1325 deletions
+10
-1325
openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
+4
-4
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
+0
-74
openair1/PHY/defs.h
openair1/PHY/defs.h
+0
-892
openair1/PHY/defs_NB_IoT.h
openair1/PHY/defs_NB_IoT.h
+1
-1
openair2/ENB_APP/enb_config.h
openair2/ENB_APP/enb_config.h
+5
-354
No files found.
openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h
View file @
e4b6e855
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
#include "PHY/defs_NB_IoT.h"
#include "PHY/defs_NB_IoT.h"
#include "PHY/impl_defs_lte.h"
#include "PHY/impl_defs_lte.h"
#include "PHY/defs.h"
//#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
//#include "PHY/LTE_TRANSPORT/defs_NB_IoT.h"
//#include <math.h>
//#include <math.h>
...
@@ -428,7 +428,7 @@ void descrambling_NPUSCH_ack_NB_IoT(LTE_DL_FRAME_PARMS *fp,
...
@@ -428,7 +428,7 @@ void descrambling_NPUSCH_ack_NB_IoT(LTE_DL_FRAME_PARMS *fp,
uint32_t
turbo_decoding_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
uint32_t
turbo_decoding_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
NB_IoT_eNB_NULSCH_t
*
ulsch_NB_IoT
,
NB_IoT_eNB_NULSCH_t
*
ulsch_NB_IoT
,
eNB_rxtx_proc_t
*
proc
,
eNB_rxtx_proc_
NB_IoT_
t
*
proc
,
uint8_t
npusch_format
,
uint8_t
npusch_format
,
unsigned
int
G
,
unsigned
int
G
,
uint8_t
rvdx
,
uint8_t
rvdx
,
...
@@ -438,7 +438,7 @@ uint32_t turbo_decoding_NB_IoT(PHY_VARS_eNB *eNB,
...
@@ -438,7 +438,7 @@ uint32_t turbo_decoding_NB_IoT(PHY_VARS_eNB *eNB,
void
decode_NPUSCH_msg_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
void
decode_NPUSCH_msg_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
LTE_DL_FRAME_PARMS
*
fp
,
LTE_DL_FRAME_PARMS
*
fp
,
eNB_rxtx_proc_t
*
proc
,
eNB_rxtx_proc_
NB_IoT_
t
*
proc
,
uint8_t
npusch_format
,
uint8_t
npusch_format
,
uint16_t
N_SF_per_word
,
uint16_t
N_SF_per_word
,
uint16_t
Nsc_RU
,
uint16_t
Nsc_RU
,
...
@@ -453,7 +453,7 @@ void deinterleaving_NPUSCH_data_NB_IoT(NB_IoT_UL_eNB_HARQ_t *ulsch_harq, int16_t
...
@@ -453,7 +453,7 @@ void deinterleaving_NPUSCH_data_NB_IoT(NB_IoT_UL_eNB_HARQ_t *ulsch_harq, int16_t
uint8_t
rx_ulsch_Gen_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
uint8_t
rx_ulsch_Gen_NB_IoT
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
eNB_rxtx_proc_
NB_IoT_
t
*
proc
,
uint8_t
eNB_id
,
// this is the effective sector id
uint8_t
eNB_id
,
// this is the effective sector id
uint8_t
UE_id
,
uint8_t
UE_id
,
uint16_t
UL_RB_ID_NB_IoT
,
// 22 , to be included in // to be replaced by NB_IoT_start ??
uint16_t
UL_RB_ID_NB_IoT
,
// 22 , to be included in // to be replaced by NB_IoT_start ??
...
...
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
View file @
e4b6e855
...
@@ -138,80 +138,6 @@ typedef struct {
...
@@ -138,80 +138,6 @@ typedef struct {
}
LTE_DL_eNB_HARQ_t
;
}
LTE_DL_eNB_HARQ_t
;
typedef
struct
{
/// Indicator of first transmission
uint8_t
first_tx
;
/// Last Ndi received for this process on DCI (used for C-RNTI only)
uint8_t
DCINdi
;
/// Flag indicating that this ULSCH has a new packet (start of new round)
// uint8_t Ndi;
/// Status Flag indicating for this ULSCH (idle,active,disabled)
SCH_status_t
status
;
/// Subframe scheduling indicator (i.e. Transmission opportunity indicator)
uint8_t
subframe_scheduling_flag
;
/// Subframe cba scheduling indicator (i.e. Transmission opportunity indicator)
uint8_t
subframe_cba_scheduling_flag
;
/// First Allocated RB
uint16_t
first_rb
;
/// Current Number of RBs
uint16_t
nb_rb
;
/// Last TPC command
uint8_t
TPC
;
/// Transport block size
uint32_t
TBS
;
/// The payload + CRC size in bits, "B" from 36-212
uint32_t
B
;
/// Length of ACK information (bits)
uint8_t
O_ACK
;
/// Pointer to the payload
uint8_t
*
b
;
/// Pointers to transport block segments
uint8_t
*
c
[
MAX_NUM_ULSCH_SEGMENTS
];
/// RTC values for each segment (for definition see 36-212 V8.6 2009-03, p.15)
uint32_t
RTC
[
MAX_NUM_ULSCH_SEGMENTS
];
/// Index of current HARQ round for this ULSCH
uint8_t
round
;
/// MCS format of this ULSCH
uint8_t
mcs
;
/// Redundancy-version of the current sub-frame
uint8_t
rvidx
;
/// Turbo-code outputs (36-212 V8.6 2009-03, p.12
uint8_t
d
[
MAX_NUM_ULSCH_SEGMENTS
][(
96
+
3
+
(
3
*
6144
))];
/// Sub-block interleaver outputs (36-212 V8.6 2009-03, p.16-17)
uint8_t
w
[
MAX_NUM_ULSCH_SEGMENTS
][
3
*
6144
];
/// Number of code segments (for definition see 36-212 V8.6 2009-03, p.9)
uint32_t
C
;
/// Number of "small" code segments (for definition see 36-212 V8.6 2009-03, p.10)
uint32_t
Cminus
;
/// Number of "large" code segments (for definition see 36-212 V8.6 2009-03, p.10)
uint32_t
Cplus
;
/// Number of bits in "small" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
uint32_t
Kminus
;
/// Number of bits in "large" code segments (<6144) (for definition see 36-212 V8.6 2009-03, p.10)
uint32_t
Kplus
;
/// Total number of bits across all segments
uint32_t
sumKr
;
/// Number of "Filler" bits (for definition see 36-212 V8.6 2009-03, p.10)
uint32_t
F
;
/// Msc_initial, Initial number of subcarriers for ULSCH (36-212, v8.6 2009-03, p.26-27)
uint16_t
Msc_initial
;
/// Nsymb_initial, Initial number of symbols for ULSCH (36-212, v8.6 2009-03, p.26-27)
uint8_t
Nsymb_initial
;
/// n_DMRS for cyclic shift of DMRS (36.213 Table 9.1.2-2)
uint8_t
n_DMRS
;
/// n_DMRS2 for cyclic shift of DMRS (36.211 Table 5.5.1.1.-1)
uint8_t
n_DMRS2
;
/// Flag to indicate that this is a control only ULSCH (i.e. no MAC SDU)
uint8_t
control_only
;
/// Flag to indicate that this is a calibration ULSCH (i.e. no MAC SDU and filled with TDD calibration information)
// int calibration_flag;
/// Number of soft channel bits
uint32_t
G
;
// decode phich
uint8_t
decode_phich
;
}
LTE_UL_UE_HARQ_t
;
typedef
struct
{
typedef
struct
{
/// TX buffers for UE-spec transmission (antenna ports 5 or 7..14, prior to precoding)
/// TX buffers for UE-spec transmission (antenna ports 5 or 7..14, prior to precoding)
...
...
openair1/PHY/defs.h
deleted
100644 → 0
View file @
72542401
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_NB_IoT.h
View file @
e4b6e855
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
# include "COMMON/ral_messages_types.h"
# include "COMMON/ral_messages_types.h"
# include "UTIL/queue.h"
# include "UTIL/queue.h"
# endif
# endif
# include "log.h"
//
# include "log.h"
# define msg(aRGS...) LOG_D(PHY, ##aRGS)
# define msg(aRGS...) LOG_D(PHY, ##aRGS)
# else
# else
# define msg printf
# define msg printf
...
...
openair2/ENB_APP/enb_config.h
View file @
e4b6e855
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