maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/282-flags-cleanup' into develop_integration_2018_w04

Browse Source 
Conflicts:
	openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
	openair1/SCHED/defs.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp.c
	openair2/RRC/LITE/rrc_eNB.c
This commit is contained in:
Cedric Roux
2018-01-22 17:47:01 +01:00
parent b5513cadf1 9c93307ab4
commit 97ebc165cc
249 changed files with 102 additions and 28668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair2/LAYER2/openair2_proc.c
+1 -51
View File
@@ -29,21 +29,7 @@
# @ingroup _openair2
*/
#ifdef USER_MODE
# include <inttypes.h>
#else
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/proc_fs.h>
# ifndef PRIu64
# if __WORDSIZE == 64
# define PRIu64 "lu"
# else
# define PRIu64 "llu"
# endif
# endif
#endif
#include <inttypes.h>
#include "LAYER2/RLC/rlc.h"
#include "LAYER2/MAC/defs.h"
@@ -410,11 +396,7 @@ int dump_eNB_l2_stats(char *buffer, int length)
}
#ifdef PROC
#ifndef USER_MODE
static int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length)
#else
int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length)
#endif
{
int len = 0,fg,Overhead, Sign;
@@ -697,36 +679,4 @@ int openair2_stats_read(char *buffer, char **my_buffer, off_t off, int length)
return len;
}
#ifndef USER_MODE
static struct proc_dir_entry *proc_openair2_root;
/*
* Initialize the module and add the /proc file.
*/
int add_openair2_stats()
{
struct proc_dir_entry *pde;
proc_openair2_root = proc_mkdir("openair2",0);
// pde = proc_create_entry("lchan_stats", S_IFREG | S_IRUGO, proc_openair2_root);
pde = proc_create_data("lchan_stats", S_IFREG | S_IRUGO, proc_openair2_root, NULL,openair2_stats_read);
if (!pde) {
printk("[OPENAIR][ERROR] can't create proc entry !\n");
}
return 0;
}
/*
* Unregister the file when the module is closed.
*/
void remove_openair_stats()
{
if (proc_openair2_root) {
printk("[OPENAIR][CLEANUP] Removing openair proc entry\n");
remove_proc_entry("lchan_stats", proc_openair2_root);
}
}
#endif
#endif