Move {LITE,MESH} NETWORK DRIVERS FROM openair2/NAS/DRIVER to openair2/NETWORK_DRIVER

git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7150 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
Lionel Gauthier
2015-04-14 08:07:52 +00:00
parent ebc6ff983d
commit 0fc45b0cf1
39 changed files with 46 additions and 46 deletions
+2 -2
View File
@@ -1826,7 +1826,7 @@ endif()
if (OAI_NW_DRIVER_USE_NETLINK) if (OAI_NW_DRIVER_USE_NETLINK)
list(APPEND nasmesh_src netlink.c) list(APPEND nasmesh_src netlink.c)
endif() endif()
make_driver(nasmesh ${OPENAIR2_DIR}/NAS/DRIVER/MESH ${nasmesh_src}) make_driver(nasmesh ${OPENAIR2_DIR}/NETWORK_DRIVER/MESH ${nasmesh_src})
# ??? # ???
#################### ####################
@@ -1834,7 +1834,7 @@ list(APPEND oai_nw_drv_src device.c common.c ioctl.c classifier.c tool.c)
if(OAI_NW_DRIVER_USE_NETLINK) if(OAI_NW_DRIVER_USE_NETLINK)
list(APPEND oai_nw_drv_src netlink.c) list(APPEND oai_nw_drv_src netlink.c)
endif() endif()
make_driver(oai_nw_drv ${OPENAIR2_DIR}/NAS/DRIVER/LITE ${oai_nw_drv_src}) make_driver(oai_nw_drv ${OPENAIR2_DIR}/NETWORK_DRIVER/LITE ${oai_nw_drv_src})
# Exmimo board drivers # Exmimo board drivers
######################### #########################
@@ -124,7 +124,6 @@ int main (int argc, const char* argv[])
_display_usage(argv[0]); _display_usage(argv[0]);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
} }
/* /*
* ---------------------- * ----------------------
* UE's non-volatile data * UE's non-volatile data
+2 -1
View File
@@ -175,7 +175,8 @@ int udp_eNB_create_socket(int port, char *ip_addr, task_id_t task_id)
if ((rc = bind(sd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) < 0) { if ((rc = bind(sd, (struct sockaddr *)&sin, sizeof(struct sockaddr_in))) < 0) {
close(sd); close(sd);
AssertFatal(rc >= 0, "UDP: Failed to bind socket: (%s:%d)\n\n", strerror(errno), errno); AssertFatal(rc >= 0, "UDP: Failed to bind socket: (%s:%d) address %s port %u\n",
strerror(errno), errno, ip_addr, port);
} }
/* Create a new descriptor for this connection */ /* Create a new descriptor for this connection */
+1 -1
View File
@@ -81,7 +81,7 @@ INPUT = ../../PHY/spec_defs.h \
$(OPENAIR2_DIR)/COMMON/mac_rlc_primitives.h \ $(OPENAIR2_DIR)/COMMON/mac_rlc_primitives.h \
$(OPENAIR2_DIR)/LAYER2/MAC/lchan_interface.h \ $(OPENAIR2_DIR)/LAYER2/MAC/lchan_interface.h \
$(OPENAIR2_DIR)/PHY_INTERFACE/defs.h \ $(OPENAIR2_DIR)/PHY_INTERFACE/defs.h \
$(OPENAIR2_DIR)/NAS/DRIVER/MESH/proto_extern.h \ $(OPENAIR2_DIR)/NETWORK_DRIVER/MESH/proto_extern.h \
$(OPENAIR2_DIR)/SIMULATION/PHY_EMULATION/CONTROL/defs.h \ $(OPENAIR2_DIR)/SIMULATION/PHY_EMULATION/CONTROL/defs.h \
FILE_PATTERNS = *.h FILE_PATTERNS = *.h
+1 -1
View File
@@ -59,7 +59,7 @@ extern int otg_enabled;
#include "../MAC/extern.h" #include "../MAC/extern.h"
#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h" #include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
#include "NAS/DRIVER/LITE/constant.h" #include "NETWORK_DRIVER/LITE/constant.h"
#include "SIMULATION/ETH_TRANSPORT/extern.h" #include "SIMULATION/ETH_TRANSPORT/extern.h"
#include "UTIL/OCG/OCG.h" #include "UTIL/OCG/OCG.h"
#include "UTIL/OCG/OCG_extern.h" #include "UTIL/OCG/OCG_extern.h"
+3 -3
View File
@@ -42,9 +42,9 @@
#include "nas_config.h" #include "nas_config.h"
#include "UTIL/LOG/log.h" #include "UTIL/LOG/log.h"
#include "NAS/DRIVER/MESH/rrc_nas_primitives.h" #include "NETWORK_DRIVER/MESH/rrc_nas_primitives.h"
#include "NAS/DRIVER/MESH/ioctl.h" #include "NETWORK_DRIVER/MESH/ioctl.h"
#include "NAS/DRIVER/MESH/constant.h" #include "NETWORK_DRIVER/MESH/constant.h"
#define BUF_SIZE 800 #define BUF_SIZE 800