Commit ef40f20f authored by Robert Schmidt's avatar Robert Schmidt

Reformat fhi_72 lib

parent 39757230
This diff is collapsed.
...@@ -32,6 +32,6 @@ typedef struct { ...@@ -32,6 +32,6 @@ typedef struct {
} 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 */
...@@ -75,7 +75,8 @@ static void print_fh_eowd_port(unsigned index, unsigned vf, const struct xran_ec ...@@ -75,7 +75,8 @@ static void print_fh_eowd_port(unsigned index, unsigned vf, const struct xran_ec
rspTimerIdx %ld\n\ rspTimerIdx %ld\n\
delaySamples [%ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld]\n\ delaySamples [%ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld, %ld]\n\
delayAvg %ld\n", delayAvg %ld\n",
index, vf, index,
vf,
eowd_port->t1, eowd_port->t1,
eowd_port->t2, eowd_port->t2,
eowd_port->tr, eowd_port->tr,
...@@ -87,14 +88,22 @@ static void print_fh_eowd_port(unsigned index, unsigned vf, const struct xran_ec ...@@ -87,14 +88,22 @@ static void print_fh_eowd_port(unsigned index, unsigned vf, const struct xran_ec
eowd_port->numMeas, eowd_port->numMeas,
eowd_port->txDone, eowd_port->txDone,
eowd_port->rspTimerIdx, eowd_port->rspTimerIdx,
eowd_port->delaySamples[0], eowd_port->delaySamples[1], eowd_port->delaySamples[0],
eowd_port->delaySamples[2], eowd_port->delaySamples[3], eowd_port->delaySamples[1],
eowd_port->delaySamples[4], eowd_port->delaySamples[5], eowd_port->delaySamples[2],
eowd_port->delaySamples[6], eowd_port->delaySamples[7], eowd_port->delaySamples[3],
eowd_port->delaySamples[8], eowd_port->delaySamples[9], eowd_port->delaySamples[4],
eowd_port->delaySamples[10], eowd_port->delaySamples[11], eowd_port->delaySamples[5],
eowd_port->delaySamples[12], eowd_port->delaySamples[13], eowd_port->delaySamples[6],
eowd_port->delaySamples[14], eowd_port->delaySamples[15], eowd_port->delaySamples[7],
eowd_port->delaySamples[8],
eowd_port->delaySamples[9],
eowd_port->delaySamples[10],
eowd_port->delaySamples[11],
eowd_port->delaySamples[12],
eowd_port->delaySamples[13],
eowd_port->delaySamples[14],
eowd_port->delaySamples[15],
eowd_port->delayAvg); eowd_port->delayAvg);
} }
...@@ -110,17 +119,26 @@ static void print_fh_init_io_cfg(const struct xran_io_cfg *io_cfg) ...@@ -110,17 +119,26 @@ static void print_fh_init_io_cfg(const struct xran_io_cfg *io_cfg)
bbdev_mode %d\n\ bbdev_mode %d\n\
dpdkIoVaMode %d\n\ dpdkIoVaMode %d\n\
dpdkMemorySize %d\n", dpdkMemorySize %d\n",
io_cfg->id, io_cfg->id == 0 ? "O-DU" : "O-RU", io_cfg->id,
io_cfg->id == 0 ? "O-DU" : "O-RU",
io_cfg->num_vfs, io_cfg->num_vfs,
io_cfg->num_rxq, io_cfg->num_rxq,
io_cfg->dpdk_dev[XRAN_UP_VF], io_cfg->dpdk_dev[XRAN_CP_VF], io_cfg->dpdk_dev[XRAN_UP_VF],
io_cfg->dpdk_dev[XRAN_UP_VF1], io_cfg->dpdk_dev[XRAN_CP_VF1], io_cfg->dpdk_dev[XRAN_CP_VF],
io_cfg->dpdk_dev[XRAN_UP_VF2], io_cfg->dpdk_dev[XRAN_CP_VF2], io_cfg->dpdk_dev[XRAN_UP_VF1],
io_cfg->dpdk_dev[XRAN_UP_VF3], io_cfg->dpdk_dev[XRAN_CP_VF3], io_cfg->dpdk_dev[XRAN_CP_VF1],
io_cfg->dpdk_dev[XRAN_UP_VF4], io_cfg->dpdk_dev[XRAN_CP_VF4], io_cfg->dpdk_dev[XRAN_UP_VF2],
io_cfg->dpdk_dev[XRAN_UP_VF5], io_cfg->dpdk_dev[XRAN_CP_VF5], io_cfg->dpdk_dev[XRAN_CP_VF2],
io_cfg->dpdk_dev[XRAN_UP_VF6], io_cfg->dpdk_dev[XRAN_CP_VF6], io_cfg->dpdk_dev[XRAN_UP_VF3],
io_cfg->dpdk_dev[XRAN_UP_VF7], io_cfg->dpdk_dev[XRAN_CP_VF7], io_cfg->dpdk_dev[XRAN_CP_VF3],
io_cfg->dpdk_dev[XRAN_UP_VF4],
io_cfg->dpdk_dev[XRAN_CP_VF4],
io_cfg->dpdk_dev[XRAN_UP_VF5],
io_cfg->dpdk_dev[XRAN_CP_VF5],
io_cfg->dpdk_dev[XRAN_UP_VF6],
io_cfg->dpdk_dev[XRAN_CP_VF6],
io_cfg->dpdk_dev[XRAN_UP_VF7],
io_cfg->dpdk_dev[XRAN_CP_VF7],
io_cfg->bbdev_dev[0], io_cfg->bbdev_dev[0],
io_cfg->bbdev_mode, io_cfg->bbdev_mode,
io_cfg->dpdkIoVaMode, io_cfg->dpdkIoVaMode,
...@@ -144,14 +162,22 @@ static void print_fh_init_io_cfg(const struct xran_io_cfg *io_cfg) ...@@ -144,14 +162,22 @@ static void print_fh_init_io_cfg(const struct xran_io_cfg *io_cfg)
io_cfg->pkt_proc_core_64_127, io_cfg->pkt_proc_core_64_127,
io_cfg->pkt_aux_core, io_cfg->pkt_aux_core,
io_cfg->timing_core, io_cfg->timing_core,
io_cfg->port[XRAN_UP_VF], io_cfg->port[XRAN_CP_VF], io_cfg->port[XRAN_UP_VF],
io_cfg->port[XRAN_UP_VF1], io_cfg->port[XRAN_CP_VF1], io_cfg->port[XRAN_CP_VF],
io_cfg->port[XRAN_UP_VF2], io_cfg->port[XRAN_CP_VF2], io_cfg->port[XRAN_UP_VF1],
io_cfg->port[XRAN_UP_VF3], io_cfg->port[XRAN_CP_VF3], io_cfg->port[XRAN_CP_VF1],
io_cfg->port[XRAN_UP_VF4], io_cfg->port[XRAN_CP_VF4], io_cfg->port[XRAN_UP_VF2],
io_cfg->port[XRAN_UP_VF5], io_cfg->port[XRAN_CP_VF5], io_cfg->port[XRAN_CP_VF2],
io_cfg->port[XRAN_UP_VF6], io_cfg->port[XRAN_CP_VF6], io_cfg->port[XRAN_UP_VF3],
io_cfg->port[XRAN_UP_VF7], io_cfg->port[XRAN_CP_VF7], io_cfg->port[XRAN_CP_VF3],
io_cfg->port[XRAN_UP_VF4],
io_cfg->port[XRAN_CP_VF4],
io_cfg->port[XRAN_UP_VF5],
io_cfg->port[XRAN_CP_VF5],
io_cfg->port[XRAN_UP_VF6],
io_cfg->port[XRAN_CP_VF6],
io_cfg->port[XRAN_UP_VF7],
io_cfg->port[XRAN_CP_VF7],
io_cfg->io_sleep, io_cfg->io_sleep,
io_cfg->nEthLinePerPort, io_cfg->nEthLinePerPort,
io_cfg->nEthLineSpeed, io_cfg->nEthLineSpeed,
...@@ -592,7 +618,7 @@ bool set_fh_init(struct xran_fh_init *fh_init) ...@@ -592,7 +618,7 @@ bool set_fh_init(struct xran_fh_init *fh_init)
fh_init->p_o_du_addr = calloc(num_du_addr, sizeof(struct rte_ether_addr)); fh_init->p_o_du_addr = calloc(num_du_addr, sizeof(struct rte_ether_addr));
AssertFatal(fh_init->p_o_du_addr != NULL, "out of memory\n"); AssertFatal(fh_init->p_o_du_addr != NULL, "out of memory\n");
for (int i = 0; i < num_du_addr; ++i) { for (int i = 0; i < num_du_addr; ++i) {
struct rte_ether_addr *ea = (struct rte_ether_addr *) fh_init->p_o_du_addr; struct rte_ether_addr *ea = (struct rte_ether_addr *)fh_init->p_o_du_addr;
if (get_ether_addr(du_addrs[i], &ea[i]) == NULL) { if (get_ether_addr(du_addrs[i], &ea[i]) == NULL) {
printf("could not read ethernet address '%s' for DU!\n", du_addrs[i]); printf("could not read ethernet address '%s' for DU!\n", du_addrs[i]);
return false; return false;
...@@ -602,7 +628,7 @@ bool set_fh_init(struct xran_fh_init *fh_init) ...@@ -602,7 +628,7 @@ bool set_fh_init(struct xran_fh_init *fh_init)
char **ru_addrs = gpd(fhip, nump, ORAN_CONFIG_RU_ADDR)->strlistptr; char **ru_addrs = gpd(fhip, nump, ORAN_CONFIG_RU_ADDR)->strlistptr;
AssertFatal(fh_init->p_o_ru_addr != NULL, "out of memory\n"); AssertFatal(fh_init->p_o_ru_addr != NULL, "out of memory\n");
for (int i = 0; i < num_ru_addr; ++i) { for (int i = 0; i < num_ru_addr; ++i) {
struct rte_ether_addr *ea = (struct rte_ether_addr *) fh_init->p_o_ru_addr; struct rte_ether_addr *ea = (struct rte_ether_addr *)fh_init->p_o_ru_addr;
if (get_ether_addr(ru_addrs[i], &ea[i]) == NULL) { if (get_ether_addr(ru_addrs[i], &ea[i]) == NULL) {
printf("could not read ethernet address '%s' for RU!\n", ru_addrs[i]); printf("could not read ethernet address '%s' for RU!\n", ru_addrs[i]);
return false; return false;
...@@ -651,7 +677,10 @@ static enum xran_cp_filterindex get_prach_filterindex_fr1(duplex_mode_t mode, in ...@@ -651,7 +677,10 @@ static enum xran_cp_filterindex get_prach_filterindex_fr1(duplex_mode_t mode, in
// this is a hack // this is a hack
int g_kbar; int g_kbar;
static bool set_fh_prach_config(const openair0_config_t* oai0, const paramdef_t *prachp, int nprach, struct xran_prach_config *prach_config) static bool set_fh_prach_config(const openair0_config_t *oai0,
const paramdef_t *prachp,
int nprach,
struct xran_prach_config *prach_config)
{ {
const split7_config_t *s7cfg = &oai0->split7; const split7_config_t *s7cfg = &oai0->split7;
...@@ -686,7 +715,7 @@ static bool set_fh_srs_config(struct xran_srs_config *srs_config) ...@@ -686,7 +715,7 @@ static bool set_fh_srs_config(struct xran_srs_config *srs_config)
return true; return true;
} }
static bool set_fh_frame_config(const openair0_config_t* oai0, struct xran_frame_config *frame_config) static bool set_fh_frame_config(const openair0_config_t *oai0, struct xran_frame_config *frame_config)
{ {
const split7_config_t *s7cfg = &oai0->split7; const split7_config_t *s7cfg = &oai0->split7;
frame_config->nFrameDuplexType = oai0->duplex_mode == duplex_mode_TDD ? XRAN_TDD : XRAN_FDD; frame_config->nFrameDuplexType = oai0->duplex_mode == duplex_mode_TDD ? XRAN_TDD : XRAN_FDD;
...@@ -722,9 +751,7 @@ static bool set_maxmin_pd(const paramdef_t *pd, int num, const char *name, uint1 ...@@ -722,9 +751,7 @@ static bool set_maxmin_pd(const paramdef_t *pd, int num, const char *name, uint1
{ {
const paramdef_t *p = gpd(pd, num, name); const paramdef_t *p = gpd(pd, num, name);
if (p->numelt != 2) { if (p->numelt != 2) {
printf("parameter list \"%s\" should have exactly two parameters (max&min), but has %d\n", printf("parameter list \"%s\" should have exactly two parameters (max&min), but has %d\n", name, num);
name,
num);
return false; return false;
} }
*min = p->uptr[0]; *min = p->uptr[0];
...@@ -737,7 +764,7 @@ static bool set_maxmin_pd(const paramdef_t *pd, int num, const char *name, uint1 ...@@ -737,7 +764,7 @@ static bool set_maxmin_pd(const paramdef_t *pd, int num, const char *name, uint1
} }
extern uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, uint32_t bw); extern uint32_t to_nrarfcn(int nr_bandP, uint64_t dl_CarrierFreq, uint8_t scs_index, uint32_t bw);
bool set_fh_config(int ru_idx, int num_rus, const openair0_config_t* oai0, struct xran_fh_config *fh_config) bool set_fh_config(int ru_idx, int num_rus, const openair0_config_t *oai0, struct xran_fh_config *fh_config)
{ {
AssertFatal(num_rus == 1 || num_rus == 2, "only support 1 or 2 RUs as of now\n"); AssertFatal(num_rus == 1 || num_rus == 2, "only support 1 or 2 RUs as of now\n");
AssertFatal(ru_idx < num_rus, "illegal ru_idx %d: must be < %d\n", ru_idx, num_rus); AssertFatal(ru_idx < num_rus, "illegal ru_idx %d: must be < %d\n", ru_idx, num_rus);
...@@ -766,8 +793,7 @@ bool set_fh_config(int ru_idx, int num_rus, const openair0_config_t* oai0, struc ...@@ -766,8 +793,7 @@ bool set_fh_config(int ru_idx, int num_rus, const openair0_config_t* oai0, struc
const int nfh = sizeofArray(FHconfigs); const int nfh = sizeofArray(FHconfigs);
config_getlist(config_get_if(), &FH_ConfigList, FHconfigs, nfh, aprefix); config_getlist(config_get_if(), &FH_ConfigList, FHconfigs, nfh, aprefix);
if (FH_ConfigList.numelt == 0) { if (FH_ConfigList.numelt == 0) {
printf("No configuration section \"%s\" found inside \"%s\": cannot initialize fhi_lib!\n", printf("No configuration section \"%s\" found inside \"%s\": cannot initialize fhi_lib!\n", CONFIG_STRING_ORAN_FH, aprefix);
CONFIG_STRING_ORAN_FH, aprefix);
return false; return false;
} }
paramdef_t *fhp = FH_ConfigList.paramarray[ru_idx]; paramdef_t *fhp = FH_ConfigList.paramarray[ru_idx];
......
...@@ -35,16 +35,15 @@ ...@@ -35,16 +35,15 @@
* 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)
{ {
......
...@@ -55,7 +55,7 @@ typedef struct oran_port_instance_t { ...@@ -55,7 +55,7 @@ typedef struct oran_port_instance_t {
} 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);
......
...@@ -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"
......
...@@ -24,19 +24,11 @@ ...@@ -24,19 +24,11 @@
#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;
......
This diff is collapsed.
...@@ -32,8 +32,7 @@ ...@@ -32,8 +32,7 @@
/* /*
* 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 // Needed for UL
int nb_rx; int nb_rx;
int32_t **rxdataF; int32_t **rxdataF;
...@@ -49,7 +48,6 @@ typedef struct ru_info_s{ ...@@ -49,7 +48,6 @@ typedef struct ru_info_s{
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_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment