[RFC v2 3/7] STE-plugin: STE modem driver definition

[sjur . brandeland]

Updates after review: Removed overriding of functions.
---
 drivers/stemodem/stemodem.c |   53 +++
 drivers/stemodem/stemodem.h |   29 +++
 2 files changed, 82 insertions(+), 0 deletions(-)
 create mode 100644 drivers/stemodem/stemodem.c
 create mode 100644 drivers/stemodem/stemodem.h

diff --git a/drivers/stemodem/stemodem.c b/drivers/stemodem/stemodem.c
new file mode 100644
index 000..cbf4895
--- /dev/null
+++ b/drivers/stemodem/stemodem.c
@@ -0,0 +1,53 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2010 ST-Ericsson AB.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include config.h
+#endif
+
+#include glib.h
+#include gatchat.h
+
+#define OFONO_API_SUBJECT_TO_CHANGE
+#include ofono/plugin.h
+#include ofono/types.h
+
+#include stemodem.h
+
+static int stemodem_init(void)
+{
+   ste_voicecall_init();
+   ste_gprs_context_init();
+
+   return 0;
+}
+
+static void stemodem_exit(void)
+{
+   ste_voicecall_exit();
+   ste_gprs_context_exit();
+}
+
+OFONO_PLUGIN_DEFINE(stemodem, STE modem driver, VERSION,
+   OFONO_PLUGIN_PRIORITY_DEFAULT,
+   stemodem_init, stemodem_exit)
diff --git a/drivers/stemodem/stemodem.h b/drivers/stemodem/stemodem.h
new file mode 100644
index 000..c34067d
--- /dev/null
+++ b/drivers/stemodem/stemodem.h
@@ -0,0 +1,29 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2009  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2010 ST-Ericsson AB.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+#include drivers/atmodem/atutil.h
+
+extern void ste_voicecall_init();
+extern void ste_voicecall_exit();
+
+extern void ste_gprs_context_init();
+extern void ste_gprs_context_exit();
-- 
1.6.0.4

___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono

Re: [RFC v2 3/7] STE-plugin: STE modem driver definition

[Marcel Holtmann]

Hi Sjur,

 Updates after review: Removed overriding of functions.
 ---

snip

 +
 +#ifdef HAVE_CONFIG_H
 +#include config.h
 +#endif
 +
 +#include glib.h
 +#include gatchat.h

What are these two includes for?

 +#define OFONO_API_SUBJECT_TO_CHANGE
 +#include ofono/plugin.h
 +#include ofono/types.h

Why do you need the ofono/types.h include. Seems like some leftovers.

 +#include stemodem.h
 +
 +static int stemodem_init(void)
 +{
 + ste_voicecall_init();
 + ste_gprs_context_init();
 +
 + return 0;
 +}

As I explained in the introductory reply. You have to keep the order
properly. So this patch either has to come last or the modem init needs
to be empty. You don't have the voicecall or GPRS init function merged
at this point.

If you wanna merge the stemodem.c and the configure option at some
point, I am perfectly fine with that. Just make it an empty stub here so
we are not breaking git bisect.

Together with the other two patches, I would apply that right away.

Regards

Marcel


___
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono