Open Source Telephony
 help / color / mirror / Atom feed
From: Sjur =?unknown-8bit?q?Br=C3=A6ndeland?= <sjurbren@gmail.com>
To: ofono@ofono.org
Subject: [PATCH v3 4/7] stemodem: Add Radio Settings to STE Modem
Date: Mon, 16 Aug 2010 22:35:46 +0200	[thread overview]
Message-ID: <1281990950-21705-4-git-send-email-sjurbren@gmail.com> (raw)
In-Reply-To: <1281990950-21705-3-git-send-email-sjurbren@gmail.com>

[-- Attachment #1: Type: text/plain, Size: 7758 bytes --]

From: Sjur Brændeland <sjur.brandeland@stericsson.com>

---
 Makefile.am                       |    3 +-
 drivers/stemodem/radio-settings.c |  225 +++++++++++++++++++++++++++++++++++++
 drivers/stemodem/stemodem.c       |    2 +
 drivers/stemodem/stemodem.h       |    2 +
 4 files changed, 231 insertions(+), 1 deletions(-)
 create mode 100644 drivers/stemodem/radio-settings.c

diff --git a/Makefile.am b/Makefile.am
index 16a3a3d..9462743 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,7 +204,8 @@ builtin_sources += drivers/atmodem/atutil.h \
 			drivers/stemodem/voicecall.c \
 			drivers/stemodem/gprs-context.c \
 			drivers/stemodem/caif_socket.h \
-			drivers/stemodem/if_caif.h
+			drivers/stemodem/if_caif.h \
+			drivers/stemodem/radio-settings.c
 
 builtin_modules += phonesim
 builtin_sources += plugins/phonesim.c
diff --git a/drivers/stemodem/radio-settings.c b/drivers/stemodem/radio-settings.c
new file mode 100644
index 0000000..49a7906
--- /dev/null
+++ b/drivers/stemodem/radio-settings.c
@@ -0,0 +1,225 @@
+/*
+ *
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2008-2010  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
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/radio-settings.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "stemodem.h"
+
+static const char *none_prefix[] = { NULL };
+static const char *cfun_prefix[] = { "+CFUN:", NULL };
+
+struct radio_settings_data {
+	GAtChat *chat;
+};
+
+enum ste_radio_mode {
+	STE_RADIO_OFF = 0,
+	STE_RADIO_ON = 1,
+	STE_RADIO_FLIGHT_MODE = 4,
+	STE_RADIO_GSM_ONLY = 5,
+	STE_RADIO_WCDMA_ONLY = 6
+};
+
+static gboolean ste_mode_to_ofono_mode(enum ste_radio_mode stemode,
+				enum ofono_radio_access_mode *mode)
+{
+	switch (stemode) {
+	case STE_RADIO_ON:
+		*mode = OFONO_RADIO_ACCESS_MODE_ANY;
+		return TRUE;
+	case STE_RADIO_GSM_ONLY:
+		*mode = OFONO_RADIO_ACCESS_MODE_GSM;
+		return TRUE;
+	case STE_RADIO_WCDMA_ONLY:
+		*mode = OFONO_RADIO_ACCESS_MODE_UMTS;
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+static gboolean ofono_mode_to_ste_mode(enum ofono_radio_access_mode mode,
+				enum ste_radio_mode *stemode)
+{
+	switch (mode) {
+	case OFONO_RADIO_ACCESS_MODE_ANY:
+		*stemode = STE_RADIO_ON;
+		return TRUE;
+	case OFONO_RADIO_ACCESS_MODE_GSM:
+		*stemode = STE_RADIO_GSM_ONLY;
+		return TRUE;
+
+	case OFONO_RADIO_ACCESS_MODE_UMTS:
+		*stemode = STE_RADIO_WCDMA_ONLY;
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+static void sterat_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_rat_mode_query_cb_t cb = cbd->cb;
+	enum ofono_radio_access_mode mode;
+	struct ofono_error error;
+	GAtResultIter iter;
+	int value;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, -1, cbd->data);
+		return;
+	}
+
+	g_at_result_iter_init(&iter, result);
+
+	if (!g_at_result_iter_next(&iter, "+CFUN:"))
+		goto err;
+
+	if (!g_at_result_iter_next_number(&iter, &value))
+		goto err;
+
+	if (!ste_mode_to_ofono_mode(value, &mode))
+		goto err;
+
+	CALLBACK_WITH_SUCCESS(cb, mode, cbd->data);
+
+	return;
+
+err:
+	CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
+}
+
+static void ste_query_rat_mode(struct ofono_radio_settings *rs,
+				ofono_radio_settings_rat_mode_query_cb_t cb,
+				void *data)
+{
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, data);
+
+	if (g_at_chat_send(rsd->chat, "AT+CFUN?", cfun_prefix,
+					sterat_query_cb, cbd, g_free) == 0) {
+		CALLBACK_WITH_FAILURE(cb, -1, data);
+		g_free(cbd);
+	}
+}
+
+static void sterat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+	struct cb_data *cbd = user_data;
+	ofono_radio_settings_rat_mode_set_cb_t cb = cbd->cb;
+	struct ofono_error error;
+
+	decode_at_error(&error, g_at_result_final_response(result));
+
+	if (!ok) {
+		cb(&error, cbd->data);
+		return;
+	}
+
+	CALLBACK_WITH_SUCCESS(cb, cbd->data);
+}
+
+static void ste_set_rat_mode(struct ofono_radio_settings *rs,
+				enum ofono_radio_access_mode mode,
+				ofono_radio_settings_rat_mode_set_cb_t cb,
+				void *data)
+{
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+	struct cb_data *cbd = cb_data_new(cb, data);
+	char buf[20];
+	enum ste_radio_mode value;
+
+	if (!ofono_mode_to_ste_mode(mode, &value)) {
+		CALLBACK_WITH_FAILURE(cb, data);
+		g_free(cbd);
+		return;
+	}
+
+	snprintf(buf, sizeof(buf), "AT+CFUN=%u", value);
+
+	if (g_at_chat_send(rsd->chat, buf, none_prefix,
+					sterat_modify_cb, cbd, g_free) == 0) {
+		CALLBACK_WITH_FAILURE(cb, data);
+		g_free(cbd);
+	}
+}
+
+static int ste_radio_settings_probe(struct ofono_radio_settings *rs,
+					unsigned int vendor, void *data)
+{
+	GAtChat *chat = data;
+	struct radio_settings_data *rsd;
+	rsd = g_try_new0(struct radio_settings_data, 1);
+	if (!rsd)
+		return -ENOMEM;
+
+	rsd->chat = chat;
+
+	ofono_radio_settings_set_data(rs, rsd);
+	ofono_radio_settings_register(rs);
+
+	return 0;
+}
+
+static void ste_radio_settings_remove(struct ofono_radio_settings *rs)
+{
+	struct radio_settings_data *rsd = ofono_radio_settings_get_data(rs);
+	ofono_radio_settings_set_data(rs, NULL);
+	g_free(rsd);
+}
+
+static struct ofono_radio_settings_driver driver = {
+	.name			= "stemodem",
+	.probe			= ste_radio_settings_probe,
+	.remove		= ste_radio_settings_remove,
+	.query_rat_mode	= ste_query_rat_mode,
+	.set_rat_mode		= ste_set_rat_mode
+};
+
+void ste_radio_settings_init()
+{
+	ofono_radio_settings_driver_register(&driver);
+}
+
+void ste_radio_settings_exit()
+{
+	ofono_radio_settings_driver_unregister(&driver);
+}
diff --git a/drivers/stemodem/stemodem.c b/drivers/stemodem/stemodem.c
index c18a8b5..ebc1c70 100644
--- a/drivers/stemodem/stemodem.c
+++ b/drivers/stemodem/stemodem.c
@@ -38,6 +38,7 @@ static int stemodem_init(void)
 {
 	ste_voicecall_init();
 	ste_gprs_context_init();
+	ste_radio_settings_init();
 
 	return 0;
 }
@@ -46,6 +47,7 @@ static void stemodem_exit(void)
 {
 	ste_voicecall_exit();
 	ste_gprs_context_exit();
+	ste_radio_settings_exit();
 }
 
 OFONO_PLUGIN_DEFINE(stemodem, "STE modem driver", VERSION,
diff --git a/drivers/stemodem/stemodem.h b/drivers/stemodem/stemodem.h
index 267e001..b1691a2 100644
--- a/drivers/stemodem/stemodem.h
+++ b/drivers/stemodem/stemodem.h
@@ -28,3 +28,5 @@ extern void ste_gprs_context_exit();
 extern void ste_voicecall_init();
 extern void ste_voicecall_exit();
 
+extern void ste_radio_settings_init();
+extern void ste_radio_settings_exit();
-- 
1.6.3.3


  reply	other threads:[~2010-08-16 20:35 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-16 13:54 [PATCHv2 0/7] Resubmitting STE Driver patches Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 13:54 ` [PATCHv2 1/7] stemodem: Add support for STK by including MBM implementation Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 14:01   ` Marcel Holtmann
2010-08-16 16:21     ` Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 13:54 ` [PATCHv2 2/7] atmodem: Enable STE usage of AT*EPEV and AT*EPEE for PIN handling Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 14:03   ` Marcel Holtmann
2010-08-16 13:54 ` [PATCHv2 3/7] stemodem: Add polling for SIM ready Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 13:54 ` [PATCHv2 4/7] stemodem: Add Radio Settings to STE Modem Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 14:05   ` Marcel Holtmann
2010-08-16 16:29     ` Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 16:36       ` Marcel Holtmann
2010-08-16 13:54 ` [PATCHv2 5/7] plugins/ste: Add Radio-Settings Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 13:54 ` [PATCHv2 6/7] stemodem: Use RTNL for creating CAIF interface Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 13:54 ` [PATCHv2 7/7] plugins/ste: Use SOCK_STREAM for CAIF and enable interface specification Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35 ` [PATCH v3 1/7] plugins/ste: Include STK support from MBM driver Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35   ` [PATCH v3 2/7] plugins/ste: SIM - STE registers as MBM to utilize mbm quirks Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35     ` [PATCH v3 3/7] stemodem: Add polling for SIM ready Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35       ` Sjur =?unknown-8bit?q?Br=C3=A6ndeland?= [this message]
2010-08-16 20:35         ` [PATCH v3 5/7] plugins/ste: Add Radio-Settings Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35           ` [PATCH v3 6/7] stemodem: Use RTNL for creating CAIF interface Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:35             ` [PATCH v3 7/7] plugins/ste: Use SOCK_STREAM for CAIF and enable interface specification Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 20:45     ` [PATCH v3 2/7] plugins/ste: SIM - STE registers as MBM to utilize mbm quirks Marcel Holtmann
2010-08-16 20:44   ` [PATCH v3 1/7] plugins/ste: Include STK support from MBM driver Marcel Holtmann
2010-08-16 21:12 ` [PATCH v4 " Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12   ` [PATCH v4 2/7] plugins/ste: SIM - STE registers as MBM to utilize mbm quirks Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12     ` [PATCH v4 3/7] stemodem: Add polling for SIM ready Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12       ` [PATCH v4 4/7] stemodem: Add Radio Settings to STE Modem Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12         ` [PATCH v4 5/7] plugins/ste: Add Radio-Settings Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12           ` [PATCH v4 6/7] stemodem: Use RTNL for creating CAIF interface Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 21:12             ` [PATCH v4 7/7] plugins/ste: Use SOCK_STREAM for CAIF and enable interface specification Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-16 22:12               ` Marcel Holtmann
2010-08-16 22:11             ` [PATCH v4 6/7] stemodem: Use RTNL for creating CAIF interface Marcel Holtmann
2010-08-16 22:05         ` [PATCH v4 4/7] stemodem: Add Radio Settings to STE Modem Marcel Holtmann
2010-08-16 22:08       ` [PATCH v4 3/7] stemodem: Add polling for SIM ready Marcel Holtmann
2010-08-16 22:06     ` [PATCH v4 2/7] plugins/ste: SIM - STE registers as MBM to utilize mbm quirks Marcel Holtmann
2010-08-16 21:58   ` [PATCH v4 1/7] plugins/ste: Include STK support from MBM driver Marcel Holtmann
2010-08-17 12:22 ` [PATCH v5 0/8] Resubmitting STE Driver Patches Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:22   ` [PATCH v5 1/8] plugins/ste: SIM - STE registers as MBM to utilize mbm quirks Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:43     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 2/8] stemodem: Add polling for SIM ready Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:58     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 3/8] plugins/ste: Add AT Channel configurations Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:43     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 4/7] stemodem: Add Radio Settings to STE Modem Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:43     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 5/8] plugins/ste: Add Radio-Settings Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:43     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 6/8] plugins/modemconf.c add support for Interface for STE plugin Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:51     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 7/8] plugins/ste: Use SOCK_STREAM for CAIF and enable interface specification Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:46     ` Marcel Holtmann
2010-08-17 12:22   ` [PATCH v5 8/8] plugins: Add STE sample to modem.conf Sjur =?unknown-8bit?q?Br=C3=A6ndeland?=
2010-08-17 12:51     ` Marcel Holtmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1281990950-21705-4-git-send-email-sjurbren@gmail.com \
    --to=sjurbren@gmail.com \
    --cc=ofono@ofono.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox