branch LG_PRE_RELEASE_0.3 reintegration
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7117 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
include $(OPENAIR_HOME)/common/utils/Makefile.inc
|
||||
include $(OPENAIR_DIR)/common/utils/Makefile.inc
|
||||
|
||||
TOP_DIR = $(OPENAIR1_DIR)
|
||||
OPENAIR1_TOP = $(OPENAIR1_DIR)
|
||||
@@ -21,8 +21,8 @@ ifdef DEBUG_PHY
|
||||
CFLAGS += -DDEBUG_PHY
|
||||
endif
|
||||
|
||||
ifdef NAS_NETLINK
|
||||
CFLAGS += -DNAS_NETLINK -DLINUX -DDEBUG_CONTROL
|
||||
ifdef PDCP_USE_NETLINK
|
||||
CFLAGS += -DPDCP_USE_NETLINK -DLINUX -DDEBUG_CONTROL
|
||||
endif
|
||||
|
||||
CFLAGS += -DPHY_ABSTRACTION #-DEMIT_ASN_DEBUG=1
|
||||
|
||||
@@ -153,7 +153,7 @@ BOOL init_pdcp_entity(pdcp_t *pdcp_entity)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL test_tx_window()
|
||||
BOOL test_tx_window(void)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
|
||||
@@ -171,7 +171,7 @@ BOOL test_tx_window()
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL test_rx_window()
|
||||
BOOL test_rx_window(void)
|
||||
{
|
||||
unsigned long index = 0;
|
||||
|
||||
@@ -190,7 +190,7 @@ BOOL test_rx_window()
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL test_pdcp_data_req()
|
||||
BOOL test_pdcp_data_req(void)
|
||||
{
|
||||
unsigned char* pdcp_test_pdu_buffer = NULL;
|
||||
unsigned char pdcp_test_pdu_buffer_size = DUMMY_BUFFER_SIZE + PDCP_USER_PLANE_DATA_PDU_LONG_SN_HEADER_SIZE;
|
||||
@@ -288,7 +288,7 @@ BOOL test_pdcp_data_req()
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL test_pdcp_data_ind()
|
||||
BOOL test_pdcp_data_ind(void)
|
||||
{
|
||||
/*
|
||||
* This is the list that pdcp_data_ind() takes to put pdcp_data_ind_header_t
|
||||
|
||||
@@ -17,24 +17,15 @@
|
||||
* /homes/demiray/workspace/openair4G/trunk/openair2/LAYER2/PDCP_v10.1.0/pdcp.c:270: undefined reference to `pdcp_fifo_read_input_sdus'
|
||||
* /homes/demiray/workspace/openair4G/trunk/openair2/LAYER2/PDCP_v10.1.0/pdcp.c:273: undefined reference to `pdcp_fifo_flush_sdus'
|
||||
*/
|
||||
int pdcp_fifo_flush_sdus ()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int pdcp_fifo_read_input_sdus_remaining_bytes ()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int pdcp_fifo_read_input_sdus ()
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int pdcp_fifo_flush_sdus (void) { return 0; }
|
||||
int pdcp_fifo_read_input_sdus_remaining_bytes (void) { return 0; }
|
||||
int pdcp_fifo_read_input_sdus (void) { return 0; }
|
||||
|
||||
BOOL init_pdcp_entity(pdcp_t *pdcp_entity);
|
||||
BOOL test_tx_window();
|
||||
BOOL test_rx_window();
|
||||
BOOL test_pdcp_data_req();
|
||||
BOOL test_pdcp_data_ind();
|
||||
BOOL test_tx_window(void);
|
||||
BOOL test_rx_window(void);
|
||||
BOOL test_pdcp_data_req(void);
|
||||
BOOL test_pdcp_data_ind(void);
|
||||
|
||||
/*
|
||||
* PDCP methods that are going to be utilised throughout the test
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
include $(OPENAIR_HOME)/common/utils/Makefile.inc
|
||||
include $(OPENAIR_DIR)/common/utils/Makefile.inc
|
||||
|
||||
TOP_DIR = $(OPENAIR1_DIR)
|
||||
OPENAIR1_TOP = $(OPENAIR1_DIR)
|
||||
@@ -21,8 +21,8 @@ ifdef DEBUG_PHY
|
||||
CFLAGS += -DDEBUG_PHY
|
||||
endif
|
||||
|
||||
ifdef NAS_NETLINK
|
||||
CFLAGS += -DNAS_NETLINK -DLINUX -DDEBUG_CONTROL
|
||||
ifdef PDCP_USE_NETLINK
|
||||
CFLAGS += -DPDCP_USE_NETLINK -DLINUX -DDEBUG_CONTROL
|
||||
endif
|
||||
|
||||
CFLAGS += -DPHY_ABSTRACTION #-DEMIT_ASN_DEBUG=1
|
||||
|
||||
@@ -91,8 +91,7 @@ int pdcp_fifo_read_input_sdus () {}
|
||||
BOOL init_pdcp_entity(pdcp_t *pdcp_entity);
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
void pdcp_rlc_test_mac_rlc_loop (struct mac_data_ind *data_indP, struct mac_data_req *data_requestP, int* drop_countP, int *tx_packetsP,
|
||||
int* dropped_tx_packetsP) //-----------------------------------------------------------------------------
|
||||
void pdcp_rlc_test_mac_rlc_loop (struct mac_data_ind *data_indP, struct mac_data_req *data_requestP, int* drop_countP, int *tx_packetsP, int* dropped_tx_packetsP) //-----------------------------------------------------------------------------
|
||||
{
|
||||
mem_block_t* tb_src;
|
||||
mem_block_t* tb_dst;
|
||||
|
||||
Reference in New Issue
Block a user