Fix #582, RTAI, RTAI_ENABLED, ENABLE_RTAI_CLOCK, RTAI_ISNT_POSIX, _RTAI_MATH_H, CELLULAR, TIMER_ONESHOT_MODE, EMOS, EMOS_CHANNEL, OAI_EMU, OPENAIR_EMU, PHY_ABSTRACTION, PHY_ABSTRACTION_UL removed

openair2/NETWORK_DRIVER/MESH/Makefile

@@ -1,70 +0,0 @@
-# NASMESH Driver makefile
-#
-include $(OPENAIR_DIR)/common/utils/Makefile.inc
-NAS_UPDIR	:= $(shell /bin/pwd)
-
-####################################################
-#      NASMESH compilation flags
-####################################################
-#RTAI=1
-
-####################################################
-#  D E B U G   F L A G S
-####################################################
-
-####################################################
-#      EXTRA COMPILER FLAGS
-####################################################
-#EXTRA_CFLAGS = -fno-common -fno-stack-protector -mpreferred-stack-boundary=4 $(if $(SET_X64),-DARCH_64,) $(if $(SET_X64),-mcmodel=kernel,) $(if $(SET_X64),-m64,) 
-EXTRA_CFLAGS += -I$(OPENAIR2_DIR)
-ifdef PDCP_USE_NETLINK
-EXTRA_CFLAGS += -DPDCP_USE_NETLINK
-else
-EXTRA_CFLAGS += $(shell rtai-config --module-cflags) -DRTAI -D__IN_RTAI__ -Wall
-endif
-
-ifdef LOOPBACK
-EXTRA_CFLAGS += -DLOOPBACK_TEST
-endif
-
-ifdef ADDRESS_FIX
-EXTRA_CFLAGS += -DNAS_ADDRESS_FIX
-endif
-ifdef NAS_DEBUG_RECEIVE
-EXTRA_CFLAGS += -DNAS_DEBUG_RECEIVE
-endif
-
-ifdef NAS_DEBUG_SEND
-EXTRA_CFLAGS += -DNAS_DEBUG_SEND
-endif
-
-ccflags-y := $(CFLAGS) $(EXTRA_CFLAGS)
-CFLAGS=
-
-####################################################
-#      LOADABLE MODULE GOALS
-####################################################
-obj-m += nasmesh.o
-nasmesh-objs += device.o
-nasmesh-objs += common.o
-nasmesh-objs += ioctl.o
-nasmesh-objs += classifier.o
-nasmesh-objs += tool.o
-nasmesh-objs += mesh.o
-ifdef PDCP_USE_NETLINK
-nasmesh-objs += netlink.o
-endif
-
-####################################################
-#      REVOIR LE CLEAN
-####################################################
-
-#netlink.ko:
-#	make PDCP_USE_NETLINK=1 V=1 -C $(KERNEL_DIR) M=`pwd` modules
-
-#nasmesh.ko:
-#	make  V=1 -C $(KERNEL_DIR) M=`pwd` modules
-
-clean:
-	rm -f $(nasmesh-objs) $(obj-m)
-#	make -C $(KERNEL_DIR) modules

openair2/NETWORK_DRIVER/MESH/common.c

@@ -28,12 +28,8 @@
 * \email: navid.nikaein@eurecom.fr, lionel.gauthier@eurecom.fr
 */
 
-//#include "nas_common.h"
 #include "local.h"
 #include "proto_extern.h"
-#ifdef RTAI
-#include "rtai_fifos.h"
-#endif
 
 //#define NAS_DEBUG_RECEIVE 1
 //#define NAS_DEBUG_SEND 1

openair2/NETWORK_DRIVER/MESH/device.c

@@ -28,13 +28,6 @@
 */
 /*******************************************************************************/
 
-#ifndef PDCP_USE_NETLINK
-#ifdef RTAI
-#include "rtai_posix.h"
-#define RTAI_IRQ 30 //try to get this irq with RTAI
-#endif // RTAI
-#endif // PDCP_USE_NETLINK
-
 #include "constant.h"
 #include "local.h"
 #include "proto_extern.h"
@@ -116,6 +109,7 @@ void *nas_interrupt(void)
   printk("INTERRUPT: end\n");
 #endif
   //  return 0;
+  return NULL;
 }
 #endif //NETLINK
 
@@ -449,23 +443,12 @@ int init_module (void)
 
 #ifndef PDCP_USE_NETLINK
 
-#ifdef RTAI //with RTAI you have to indicate which irq# you want
-
-  pdcp_2_nas_irq=rt_request_srq(0, nas_interrupt, NULL);
-
-#endif
-
   if (pdcp_2_nas_irq == -EBUSY || pdcp_2_nas_irq == -EINVAL) {
     printk("[NAS][INIT] No interrupt resource available\n");
     return -EBUSY;
   } else
     printk("[NAS][INIT]: Interrupt %d\n", pdcp_2_nas_irq);
 
-  //rt_startup_irq(RTAI_IRQ);
-
-  //rt_enable_irq(RTAI_IRQ);
-
-
 #endif //NETLINK
 
   for (inst=0; inst<NB_INSTANCES_MAX; inst++) {
@@ -529,12 +512,6 @@ void cleanup_module(void)
 
   if (pdcp_2_nas_irq!=-EBUSY) {
     pdcp_2_nas_irq=0;
-#ifdef RTAI
-    // V1
-    //    rt_free_linux_irq(priv->irq, NULL);
-    // END V1
-    rt_free_srq(pdcp_2_nas_irq);
-#endif
     // Start IRQ linux
     //    free_irq(priv->irq, NULL);
     // End IRQ linux