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
spbro
OpenXG-RAN
Commits
ef40f20f
Commit
ef40f20f
authored
Jan 23, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reformat fhi_72 lib
parent
39757230
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
733 additions
and
722 deletions
+733
-722
radio/fhi_72/oaioran.c
radio/fhi_72/oaioran.c
+412
-401
radio/fhi_72/oaioran.h
radio/fhi_72/oaioran.h
+4
-4
radio/fhi_72/oran-config.c
radio/fhi_72/oran-config.c
+196
-170
radio/fhi_72/oran-init.c
radio/fhi_72/oran-init.c
+5
-6
radio/fhi_72/oran-init.h
radio/fhi_72/oran-init.h
+3
-3
radio/fhi_72/oran-params.h
radio/fhi_72/oran-params.h
+0
-3
radio/fhi_72/oran.h
radio/fhi_72/oran.h
+7
-15
radio/fhi_72/oran_isolate.c
radio/fhi_72/oran_isolate.c
+97
-109
radio/fhi_72/oran_isolate.h
radio/fhi_72/oran_isolate.h
+9
-11
No files found.
radio/fhi_72/oaioran.c
View file @
ef40f20f
This diff is collapsed.
Click to expand it.
radio/fhi_72/oaioran.h
View file @
ef40f20f
...
@@ -26,12 +26,12 @@
...
@@ -26,12 +26,12 @@
#include "xran_fh_o_du.h"
#include "xran_fh_o_du.h"
typedef
struct
{
typedef
struct
{
uint32_t
tti
;
uint32_t
tti
;
uint32_t
sl
;
uint32_t
sl
;
uint32_t
f
;
uint32_t
f
;
}
oran_sync_info_t
;
}
oran_sync_info_t
;
void
oai_xran_fh_rx_callback
(
void
*
pCallbackTag
,
xran_status_t
status
);
void
oai_xran_fh_rx_callback
(
void
*
pCallbackTag
,
xran_status_t
status
);
int
oai_physide_dl_tti_call_back
(
void
*
param
);
int
oai_physide_dl_tti_call_back
(
void
*
param
);
#endif
/* OAIORAN_H */
#endif
/* OAIORAN_H */
radio/fhi_72/oran-config.c
View file @
ef40f20f
This diff is collapsed.
Click to expand it.
radio/fhi_72/oran-init.c
View file @
ef40f20f
...
@@ -35,23 +35,22 @@
...
@@ -35,23 +35,22 @@
* 840 samples for long sequence or 144 for short sequence. The payload length
* 840 samples for long sequence or 144 for short sequence. The payload length
* is 840*16*2/8 octets.*/
* is 840*16*2/8 octets.*/
#ifdef FCN_1_2_6_EARLIER
#ifdef FCN_1_2_6_EARLIER
#define PRACH_PLAYBACK_BUFFER_BYTES (144
*
4L)
#define PRACH_PLAYBACK_BUFFER_BYTES (144
*
4L)
#else
#else
#define PRACH_PLAYBACK_BUFFER_BYTES (840
*
4L)
#define PRACH_PLAYBACK_BUFFER_BYTES (840
*
4L)
#endif
#endif
// structure holding allocated memory for ports (multiple DUs) and sectors
// structure holding allocated memory for ports (multiple DUs) and sectors
// (multiple CCs)
// (multiple CCs)
static
oran_port_instance_t
gPortInst
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
static
oran_port_instance_t
gPortInst
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
void
*
gxran_handle
;
void
*
gxran_handle
;
static
uint32_t
get_nSW_ToFpga_FTH_TxBufferLen
(
int
mu
,
int
sections
)
static
uint32_t
get_nSW_ToFpga_FTH_TxBufferLen
(
int
mu
,
int
sections
)
{
{
uint32_t
xran_max_sections_per_slot
=
RTE_MAX
(
sections
,
XRAN_MIN_SECTIONS_PER_SLOT
);
uint32_t
xran_max_sections_per_slot
=
RTE_MAX
(
sections
,
XRAN_MIN_SECTIONS_PER_SLOT
);
uint32_t
overhead
=
xran_max_sections_per_slot
uint32_t
overhead
=
xran_max_sections_per_slot
*
(
RTE_PKTMBUF_HEADROOM
+
sizeof
(
struct
rte_ether_hdr
)
+
sizeof
(
struct
xran_ecpri_hdr
)
*
(
RTE_PKTMBUF_HEADROOM
+
sizeof
(
struct
rte_ether_hdr
)
+
sizeof
(
struct
xran_ecpri_hdr
)
+
sizeof
(
struct
radio_app_common_hdr
)
+
sizeof
(
struct
data_section_hdr
));
+
sizeof
(
struct
radio_app_common_hdr
)
+
sizeof
(
struct
data_section_hdr
));
if
(
mu
<=
1
)
{
if
(
mu
<=
1
)
{
return
13168
+
overhead
;
/* 273*12*4 + 64* + ETH AND ORAN HDRs */
return
13168
+
overhead
;
/* 273*12*4 + 64* + ETH AND ORAN HDRs */
}
else
if
(
mu
==
3
)
{
}
else
if
(
mu
==
3
)
{
...
...
radio/fhi_72/oran-init.h
View file @
ef40f20f
...
@@ -50,12 +50,12 @@ typedef struct oran_port_instance_t {
...
@@ -50,12 +50,12 @@ typedef struct oran_port_instance_t {
void
*
instanceHandle
;
void
*
instanceHandle
;
//uint32_t dpdkPoolIndex[MAX_SW_XRAN_INTERFACE_NUM];
//uint32_t dpdkPoolIndex[MAX_SW_XRAN_INTERFACE_NUM];
struct
xran_cb_tag
RxCbTag
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
struct
xran_cb_tag
RxCbTag
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
struct
xran_cb_tag
PrachCbTag
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
struct
xran_cb_tag
PrachCbTag
[
XRAN_PORTS_NUM
][
XRAN_MAX_SECTOR_NR
];
}
oran_port_instance_t
;
}
oran_port_instance_t
;
extern
struct
xran_fh_config
gxran_fh_config
[
XRAN_PORTS_NUM
];
extern
struct
xran_fh_config
gxran_fh_config
[
XRAN_PORTS_NUM
];
extern
void
*
gxran_handle
;
extern
void
*
gxran_handle
;
struct
openair0_config
;
struct
openair0_config
;
int
*
oai_oran_initialize
(
const
struct
openair0_config
*
openair0_cfg
);
int
*
oai_oran_initialize
(
const
struct
openair0_config
*
openair0_cfg
);
...
...
radio/fhi_72/oran-params.h
View file @
ef40f20f
...
@@ -53,7 +53,6 @@
...
@@ -53,7 +53,6 @@
}
}
// clang-format on
// clang-format on
#define CONFIG_STRING_ORAN_FH "fh_config"
#define CONFIG_STRING_ORAN_FH "fh_config"
#define ORAN_FH_CONFIG_TADV_CP_DL "Tadv_cp_dl"
#define ORAN_FH_CONFIG_TADV_CP_DL "Tadv_cp_dl"
...
@@ -86,7 +85,6 @@
...
@@ -86,7 +85,6 @@
}
}
// clang-format on
// clang-format on
#define CONFIG_STRING_ORAN_RU "ru_config"
#define CONFIG_STRING_ORAN_RU "ru_config"
#define ORAN_RU_CONFIG_IQWIDTH "iq_width"
#define ORAN_RU_CONFIG_IQWIDTH "iq_width"
...
@@ -101,7 +99,6 @@
...
@@ -101,7 +99,6 @@
}
}
// clang-format on
// clang-format on
#define CONFIG_STRING_ORAN_PRACH "prach_config"
#define CONFIG_STRING_ORAN_PRACH "prach_config"
#define ORAN_PRACH_CONFIG_EAXC_OFFSET "eAxC_offset"
#define ORAN_PRACH_CONFIG_EAXC_OFFSET "eAxC_offset"
...
...
radio/fhi_72/oran.h
View file @
ef40f20f
...
@@ -24,25 +24,17 @@
...
@@ -24,25 +24,17 @@
#include "shared_buffers.h"
#include "shared_buffers.h"
#include "common_lib.h"
#include "common_lib.h"
void
oran_fh_if4p5_south_out
(
RU_t
*
ru
,
void
oran_fh_if4p5_south_out
(
RU_t
*
ru
,
int
frame
,
int
slot
,
uint64_t
timestamp
);
int
frame
,
int
slot
,
uint64_t
timestamp
);
void
oran_fh_if4p5_south_in
(
RU_t
*
ru
,
void
oran_fh_if4p5_south_in
(
RU_t
*
ru
,
int
*
frame
,
int
*
slot
);
int
*
frame
,
int
*
slot
);
int
transport_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
,
eth_params_t
*
eth_params
);
int
transport_init
(
openair0_device
*
device
,
openair0_config_t
*
openair0_cfg
,
eth_params_t
*
eth_params
);
typedef
struct
{
typedef
struct
{
eth_state_t
e
;
eth_state_t
e
;
shared_buffers
buffers
;
shared_buffers
buffers
;
rru_config_msg_type_t
last_msg
;
rru_config_msg_type_t
last_msg
;
int
capabilities_sent
;
int
capabilities_sent
;
void
*
oran_priv
;
void
*
oran_priv
;
}
oran_eth_state_t
;
}
oran_eth_state_t
;
#endif
/* _ORAN_H_ */
#endif
/* _ORAN_H_ */
radio/fhi_72/oran_isolate.c
View file @
ef40f20f
This diff is collapsed.
Click to expand it.
radio/fhi_72/oran_isolate.h
View file @
ef40f20f
...
@@ -32,24 +32,22 @@
...
@@ -32,24 +32,22 @@
/*
/*
* Structure added to bear the information needed from OAI RU
* Structure added to bear the information needed from OAI RU
*/
*/
typedef
struct
ru_info_s
{
typedef
struct
ru_info_s
{
// Needed for UL
int
nb_rx
;
int32_t
**
rxdataF
;
// Needed for U
L
// Needed for D
L
int
nb_r
x
;
int
nb_t
x
;
int32_t
**
rxdata
F
;
int32_t
**
txdataF_B
F
;
// Needed for DL
// Needed for Prach
int
nb_tx
;
int16_t
**
prach_buf
;
int32_t
**
txdataF_BF
;
// Needed for Prach
int16_t
**
prach_buf
;
}
ru_info_t
;
}
ru_info_t
;
int
xran_fh_rx_read_slot
(
ru_info_t
*
ru
,
int
*
frame
,
int
*
slot
);
int
xran_fh_rx_read_slot
(
ru_info_t
*
ru
,
int
*
frame
,
int
*
slot
);
int
xran_fh_tx_send_slot
(
ru_info_t
*
ru
,
int
frame
,
int
slot
,
uint64_t
timestamp
);
int
xran_fh_tx_send_slot
(
ru_info_t
*
ru
,
int
frame
,
int
slot
,
uint64_t
timestamp
);
int
compute_xran_statistics
();
int
compute_xran_statistics
();
#endif
/* _ORAN_ISOLATE_H_ */
#endif
/* _ORAN_ISOLATE_H_ */
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