[PATCH 3/4] libabis: add init function for emulated ipaccess/HSL emulated E1 input

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/OpenBSC@lists.osmocom.org/.

pablo at gnumonks.org pablo at gnumonks.org
Sat May 14 11:57:50 UTC 2011


From: Pablo Neira Ayuso <pablo at gnumonks.org>

This patch is a cleanup. It adds an init function for the ipaccess
and HSL emulated E1 input drivers.
---
 openbsc/src/libabis/e1_input.c       |    4 ++++
 openbsc/src/libabis/input/hsl.c      |   11 +++++------
 openbsc/src/libabis/input/ipaccess.c |   11 +++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/openbsc/src/libabis/e1_input.c b/openbsc/src/libabis/e1_input.c
index 089d544..97dcd33 100644
--- a/openbsc/src/libabis/e1_input.c
+++ b/openbsc/src/libabis/e1_input.c
@@ -634,6 +634,8 @@ static int e1i_sig_cb(unsigned int subsys, unsigned int signal,
 
 void e1inp_misdn_init(void);
 void e1inp_dahdi_init(void);
+void e1inp_ipaccess_init(void);
+void e1inp_hsl_init(void);
 
 void e1inp_init(void)
 {
@@ -645,4 +647,6 @@ void e1inp_init(void)
 #ifdef HAVE_DAHDI_USER_H
 	e1inp_dahdi_init();
 #endif
+	e1inp_ipaccess_init();
+	e1inp_hsl_init();
 }
diff --git a/openbsc/src/libabis/input/hsl.c b/openbsc/src/libabis/input/hsl.c
index e842f0d..c98a22c 100644
--- a/openbsc/src/libabis/input/hsl.c
+++ b/openbsc/src/libabis/input/hsl.c
@@ -437,12 +437,6 @@ int hsl_setup(struct gsm_network *gsmnet)
 {
 	int ret;
 
-	/* register the driver with the core */
-	/* FIXME: do this in the plugin initializer function */
-	ret = e1inp_driver_register(&hsl_driver);
-	if (ret)
-		return ret;
-
 	e1h = talloc_zero(tall_bsc_ctx, struct hsl_e1_handle);
 	if (!e1h)
 		return -ENOMEM;
@@ -457,3 +451,8 @@ int hsl_setup(struct gsm_network *gsmnet)
 
 	return 0;
 }
+
+void e1inp_hsl_init(void)
+{
+	e1inp_driver_register(&hsl_driver);
+}
diff --git a/openbsc/src/libabis/input/ipaccess.c b/openbsc/src/libabis/input/ipaccess.c
index 8080129..1427118 100644
--- a/openbsc/src/libabis/input/ipaccess.c
+++ b/openbsc/src/libabis/input/ipaccess.c
@@ -812,12 +812,6 @@ int ipaccess_setup(struct gsm_network *gsmnet)
 {
 	int ret;
 
-	/* register the driver with the core */
-	/* FIXME: do this in the plugin initializer function */
-	ret = e1inp_driver_register(&ipaccess_driver);
-	if (ret)
-		return ret;
-
 	e1h = talloc_zero(tall_bsc_ctx, struct ia_e1_handle);
 	if (!e1h)
 		return -ENOMEM;
@@ -838,3 +832,8 @@ int ipaccess_setup(struct gsm_network *gsmnet)
 
 	return ret;
 }
+
+void e1inp_ipaccess_init(void)
+{
+	e1inp_driver_register(&ipaccess_driver);
+}
-- 
1.7.2.3





More information about the OpenBSC mailing list