[GITLAB] - UPGRADE TO v12 on Wednesday the 18th of December at 11.30AM

Commit 36cf2066 authored by knopp's avatar knopp

added all configuration in enb_app

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5896 818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent 35caaeea
...@@ -78,10 +78,14 @@ typedef struct CellInfo_s { ...@@ -78,10 +78,14 @@ typedef struct CellInfo_s {
//-------------------------------------------------------------------------------------------// //-------------------------------------------------------------------------------------------//
// eNB: ENB_APP -> PHY messages // eNB: ENB_APP -> PHY messages
typedef struct PhyConfigurationReq_s { typedef struct PhyConfigurationReq_s {
lte_frame_type_t frame_type[MAX_NUM_CCs]; lte_frame_type_t frame_type[MAX_NUM_CCs];
lte_prefix_type_t prefix_type[MAX_NUM_CCs]; lte_prefix_type_t prefix_type[MAX_NUM_CCs];
uint32_t downlink_frequency[MAX_NUM_CCs]; uint32_t downlink_frequency[MAX_NUM_CCs];
int32_t uplink_frequency_offset[MAX_NUM_CCs]; int32_t uplink_frequency_offset[MAX_NUM_CCs];
int32_t nb_antennas_tx[MAX_NUM_CCs];
int32_t nb_antennas_rx[MAX_NUM_CCs];
int32_t tx_gain[MAX_NUM_CCs];
int32_t rx_gain[MAX_NUM_CCs];
} PhyConfigurationReq; } PhyConfigurationReq;
// UE: RRC -> PHY messages // UE: RRC -> PHY messages
......
This diff is collapsed.
This diff is collapsed.
...@@ -106,6 +106,8 @@ typedef struct Enb_properties_s { ...@@ -106,6 +106,8 @@ typedef struct Enb_properties_s {
int16_t N_RB_DL[1+MAX_NUM_CCs];// for testing, change later int16_t N_RB_DL[1+MAX_NUM_CCs];// for testing, change later
int nb_antennas_tx[1+MAX_NUM_CCs]; int nb_antennas_tx[1+MAX_NUM_CCs];
int nb_antennas_rx[1+MAX_NUM_CCs]; int nb_antennas_rx[1+MAX_NUM_CCs];
int tx_gain[1+MAX_NUM_CCs];
int rx_gain[1+MAX_NUM_CCs];
long prach_root[1+MAX_NUM_CCs]; long prach_root[1+MAX_NUM_CCs];
long prach_config_index[1+MAX_NUM_CCs]; long prach_config_index[1+MAX_NUM_CCs];
BOOLEAN_t prach_high_speed[1+MAX_NUM_CCs]; BOOLEAN_t prach_high_speed[1+MAX_NUM_CCs];
......
...@@ -41,6 +41,7 @@ include $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated ...@@ -41,6 +41,7 @@ include $(OPENAIR2_DIR)/RRC/LITE/MESSAGES/Makefile.inc.generated
ASN_CONVERTER_SOURCES+=asn1_msg.c ASN_CONVERTER_SOURCES+=asn1_msg.c
#CFLAGS += -DEMIT_ASN_DEBUG=1
EXTRA_CFLAGS += -I. -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES EXTRA_CFLAGS += -I. -I$(OPENAIR2_DIR)/RRC/LITE/MESSAGES
......
This diff is collapsed.
...@@ -40,7 +40,7 @@ typedef struct openair0_device_t openair0_device; ...@@ -40,7 +40,7 @@ typedef struct openair0_device_t openair0_device;
/* structrue holds the parameters to configure USRP devices /* structrue holds the parameters to configure USRP devices
*/ */
#ifdef USRP #ifndef EXMIMO
#define MAX_CARDS 1 #define MAX_CARDS 1
#endif #endif
...@@ -50,6 +50,8 @@ typedef enum { ...@@ -50,6 +50,8 @@ typedef enum {
typedef struct { typedef struct {
/* Module ID for this configuration */
int Mod_id;
/* the sample rate for both transmit and receive. */ /* the sample rate for both transmit and receive. */
double sample_rate; double sample_rate;
/* number of RX channels (=RX antennas) */ /* number of RX channels (=RX antennas) */
...@@ -70,6 +72,10 @@ typedef struct { ...@@ -70,6 +72,10 @@ typedef struct {
double rx_bw; double rx_bw;
/* TX bandwidth in Hz */ /* TX bandwidth in Hz */
double tx_bw; double tx_bw;
/* RRH IP addr for Ethernet interface */
char rrh_ip[20];
/* RRH port number for Ethernet interface */
int rrh_port;
} openair0_config_t; } openair0_config_t;
typedef struct { typedef struct {
...@@ -82,9 +88,12 @@ typedef struct { ...@@ -82,9 +88,12 @@ typedef struct {
struct openair0_device_t { struct openair0_device_t {
/* USRP RF frontend parameters set by application */ /* Module ID of this device */
openair0_config_t openair0_cfg; int Mod_id;
/* RF frontend parameters set by application */
openair0_config_t openair0_cfg;
/* Can be used by driver to hold internal structure*/ /* Can be used by driver to hold internal structure*/
void *priv; void *priv;
......
This diff is collapsed.
...@@ -27,10 +27,14 @@ CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON ...@@ -27,10 +27,14 @@ CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/COMMON
CFLAGS += -DMAX_NUM_CCs=1 CFLAGS += -DMAX_NUM_CCs=1
ifeq ($(USRP),0) ifeq ($(EXMIMO),1)
CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS -DENABLE_VCD_FIFO
endif endif
ifeq ($(ETHERNET),1)
CFLAGS += -I$(OPENAIR_TARGETS)/ARCH/ETHERNET/USERSPACE/LIB/
endif
ifeq ($(DEBUG),1) ifeq ($(DEBUG),1)
CFLAGS += -g -ggdb CFLAGS += -g -ggdb
CFLAGS += -DRRC_MSG_PRINT CFLAGS += -DRRC_MSG_PRINT
...@@ -59,7 +63,7 @@ endif ...@@ -59,7 +63,7 @@ endif
OBJ += $(OPENAIR1_DIR)/SIMULATION/TOOLS/taus.o $(OPENAIR_TARGETS)/SIMU/USER/init_lte.o OBJ += $(OPENAIR1_DIR)/SIMULATION/TOOLS/taus.o $(OPENAIR_TARGETS)/SIMU/USER/init_lte.o
ifeq ($(USRP),0) ifeq ($(EXMIMO),1)
OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/gain_control.o OBJ += $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/openair0_lib.o $(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/gain_control.o
CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS CFLAGS += -DDRIVER2013 -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/USERSPACE/LIB/ -I$(OPENAIR_TARGETS)/ARCH/EXMIMO/DEFS
endif endif
...@@ -93,6 +97,11 @@ CFLAGS += -DUSRP ...@@ -93,6 +97,11 @@ CFLAGS += -DUSRP
LDFLAGS += -L/opt/lib -luhd -lpthread -lstdc++ LDFLAGS += -L/opt/lib -luhd -lpthread -lstdc++
endif endif
ifeq ($(ETHERNET),1)
include $(OPENAIR_TARGETS)/ARCH/ETHERNET/USERSPACE/LIB/Makefile.inc
LDFLAGS += -lpthread
endif
OBJ += $(ENB_APP_OBJS) OBJ += $(ENB_APP_OBJS)
ifeq ($(RTAI),1) ifeq ($(RTAI),1)
...@@ -154,7 +163,7 @@ CFLAGS += -Wall -fno-strict-aliasing -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP - ...@@ -154,7 +163,7 @@ CFLAGS += -Wall -fno-strict-aliasing -DPHYSIM -DUSER_MODE -DPC_TARGET -DPC_DSP -
CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 -DDLSCH_THREAD #-DULSCH_THREAD CFLAGS += -DOPENAIR_LTE -DENABLE_FXP -DOPENAIR1 -DDLSCH_THREAD #-DULSCH_THREAD
ifeq ($(USRP),0) ifeq ($(EXMIMO),1)
CFLAGS += -DEXMIMO CFLAGS += -DEXMIMO
#CFLAGS += -DEXMIMO -DTIMING_ADVANCE_HW=138 #this is for ExpressMIMO 1 #CFLAGS += -DEXMIMO -DTIMING_ADVANCE_HW=138 #this is for ExpressMIMO 1
#CFLAGS += -DEXMIMO -DTIMING_ADVANCE_HW=45 #this is for ExpressMIMO 2 #CFLAGS += -DEXMIMO -DTIMING_ADVANCE_HW=45 #this is for ExpressMIMO 2
...@@ -208,6 +217,12 @@ $(USRP_OBJ):$(USRP_FILE_OBJ) ...@@ -208,6 +217,12 @@ $(USRP_OBJ):$(USRP_FILE_OBJ)
@$(CXX) -c $(USRP_CFLAGS) $(USRP_FILE_OBJ) -o $(USRP_OBJ) @$(CXX) -c $(USRP_CFLAGS) $(USRP_FILE_OBJ) -o $(USRP_OBJ)
endif endif
ifeq ($(ETHERNET),1)
$(ETHERNET_OBJ):$(ETHERNET_FILE_OBJ)
@echo Compiling $<
@$(CC) -c $(ETHERNET_CFLAGS) $(ETHERNET_FILE_OBJ) -o $(ETHERNET_OBJ)
endif
ifeq ($(RTAI),1) ifeq ($(RTAI),1)
$(RTAI_OBJ) lte-softmodem.o: %.o : %.c $(RTAI_OBJ) lte-softmodem.o: %.o : %.c
else else
...@@ -255,9 +270,9 @@ synctest: $(OBJ_SYNC) $(SHARED_DEPENDENCIES) synctest.c ...@@ -255,9 +270,9 @@ synctest: $(OBJ_SYNC) $(SHARED_DEPENDENCIES) synctest.c
sleeptest: rt_wrapper.o sleeptest.c sleeptest: rt_wrapper.o sleeptest.c
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(RTAI_CFLAGS) rt_wrapper.o -o sleeptest sleeptest.c $(LDFLAGS) $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(RTAI_CFLAGS) rt_wrapper.o -o sleeptest sleeptest.c $(LDFLAGS)
lte-softmodem: $(OBJ) $(USRP_OBJ) $(ASN1_MSG_OBJS1) $(RTAI_OBJ) lte-softmodem.o $(SHARED_DEPENDENCIES) lte-softmodem: $(OBJ) $(USRP_OBJ) $(ETHERNET_OBJ) $(ASN1_MSG_OBJS1) $(RTAI_OBJ) lte-softmodem.o $(SHARED_DEPENDENCIES)
@echo Linking $@ @echo Linking $@
@$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(USRP_OBJ) $(RTAI_OBJ) $(ASN1_MSG_OBJS1) lte-softmodem.o -o lte-softmodem $(LDFLAGS) $(LIBS) @$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(OBJ) $(USRP_OBJ) $(ETHERNET_OBJ) $(RTAI_OBJ) $(ASN1_MSG_OBJS1) lte-softmodem.o -o lte-softmodem $(LDFLAGS) $(LIBS)
emos-raw: $(SHARED_DEPENDENCIES) $(OBJ_EMOS) emos-raw.c emos-raw: $(SHARED_DEPENDENCIES) $(OBJ_EMOS) emos-raw.c
@$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(RTAI_CFLAGS) $(OBJ_EMOS) -o emos-raw emos-raw.c $(LDFLAGS) $(LIBS) @$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(RTAI_CFLAGS) $(OBJ_EMOS) -o emos-raw emos-raw.c $(LDFLAGS) $(LIBS)
...@@ -380,6 +395,8 @@ show: ...@@ -380,6 +395,8 @@ show:
@echo $(EXTRA_CFLAGS) @echo $(EXTRA_CFLAGS)
@echo $(OBJ) $(RTAI_OBJ) @echo $(OBJ) $(RTAI_OBJ)
@echo $(USRP_OBJ) @echo $(USRP_OBJ)
@echo $(ETHERNET_OBJ)
@echo $(ETHERNET_FILE_OBJ)
@echo IS_REL8 is $(IS_REL8) @echo IS_REL8 is $(IS_REL8)
@echo IS_REL10 is $(IS_REL10) @echo IS_REL10 is $(IS_REL10)
@echo openssl $(OPENSSL_FOUND) @echo openssl $(OPENSSL_FOUND)
......
This diff is collapsed.
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