diff options
author | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-06-04 09:42:14 +0200 |
---|---|---|
committer | Jacob Erlbeck <jerlbeck@sysmocom.de> | 2015-06-08 09:39:43 +0200 |
commit | 62e96a3535714088a5dabe3cb4a8523165b19877 (patch) | |
tree | 14be557e47f903a506624a50ba11d58b41687181 /src | |
parent | a700dd9e11d31805cfe8dd07fc27ac96425cbf0c (diff) |
vty: Add a file for C++ functions
Currently the pcu_vty.c doesn't compile with C++. Thus C++ object
cannot be access directly there.
This commit adds a helper C++ file that exports all functions with C
calling conventions and naming to work around that limitation until
the transition of pcu_vty.c is completed.
Sponsored-by: On-Waves ehf
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/pcu_vty.c | 4 | ||||
-rw-r--r-- | src/pcu_vty_functions.cpp | 36 | ||||
-rw-r--r-- | src/pcu_vty_functions.h | 33 |
4 files changed, 74 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 35ba7a92..b18c1cea 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -43,6 +43,7 @@ libgprs_la_SOURCES = \ bitvector.cpp \ pcu_l1_if.cpp \ pcu_vty.c \ + pcu_vty_functions.cpp \ tbf.cpp \ tbf_ul.cpp \ tbf_dl.cpp \ @@ -85,6 +86,7 @@ noinst_HEADERS = \ gsm_timer.h \ bitvector.h \ pcu_vty.h \ + pcu_vty_functions.h \ sysmo_l1_if.h \ femtobts.h \ tbf.h \ diff --git a/src/pcu_vty.c b/src/pcu_vty.c index 9490664f..7add3930 100644 --- a/src/pcu_vty.c +++ b/src/pcu_vty.c @@ -12,6 +12,8 @@ #include "bts.h" #include "tbf.h" +#include "pcu_vty_functions.h" + enum node_type pcu_vty_go_parent(struct vty *vty) { switch (vty->node) { @@ -96,7 +98,7 @@ static int config_write_pcu(struct vty *vty) vty_out(vty, " dl-tbf-idle-time %d%s", bts->dl_tbf_idle_msec, VTY_NEWLINE); - return CMD_SUCCESS; + return pcu_vty_config_write_pcu_ext(vty); } /* per-BTS configuration */ diff --git a/src/pcu_vty_functions.cpp b/src/pcu_vty_functions.cpp new file mode 100644 index 00000000..b43e3e47 --- /dev/null +++ b/src/pcu_vty_functions.cpp @@ -0,0 +1,36 @@ +/* pcu_vty_functions.cpp + * + * Copyright (C) 2015 by Sysmocom s.f.m.c. GmbH + * Author: Jacob Erlbeck <jerlbeck@sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +/* OsmoBTS VTY interface */ + + +#include <stdint.h> +#include <stdlib.h> +#include "pcu_vty_functions.h" + +extern "C" { +# include <osmocom/vty/command.h> +# include <osmocom/vty/logging.h> +# include <osmocom/vty/misc.h> +} + +int pcu_vty_config_write_pcu_ext(struct vty *vty) +{ + return CMD_SUCCESS; +} diff --git a/src/pcu_vty_functions.h b/src/pcu_vty_functions.h new file mode 100644 index 00000000..15006355 --- /dev/null +++ b/src/pcu_vty_functions.h @@ -0,0 +1,33 @@ +/* pcu_vty_functions.h + * + * Copyright (C) 2015 by Sysmocom s.f.m.c. GmbH + * Author: Jacob Erlbeck <jerlbeck@sysmocom.de> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +struct vty; + +int pcu_vty_config_write_pcu_ext(struct vty *vty); + +#ifdef __cplusplus +} +#endif |