From: Philippe Nunes <philippe.nunes@linux.intel.com>
To: ofono@ofono.org
Subject: [PATCH v2 4/6] huaweicdmamodem: Merge this driver with cdmamodem driver
Date: Thu, 17 Nov 2011 17:21:02 +0100 [thread overview]
Message-ID: <1321546864-368-5-git-send-email-philippe.nunes@linux.intel.com> (raw)
In-Reply-To: <1321546864-368-1-git-send-email-philippe.nunes@linux.intel.com>
[-- Attachment #1: Type: text/plain, Size: 8449 bytes --]
---
drivers/huaweicdmamodem/huaweicdmamodem.c | 45 ------
drivers/huaweicdmamodem/huaweicdmamodem.h | 23 ---
drivers/huaweicdmamodem/network-registration.c | 199 ------------------------
3 files changed, 0 insertions(+), 267 deletions(-)
delete mode 100644 drivers/huaweicdmamodem/huaweicdmamodem.c
delete mode 100644 drivers/huaweicdmamodem/huaweicdmamodem.h
delete mode 100644 drivers/huaweicdmamodem/network-registration.c
diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.c b/drivers/huaweicdmamodem/huaweicdmamodem.c
deleted file mode 100644
index 4e9c400..0000000
--- a/drivers/huaweicdmamodem/huaweicdmamodem.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- *
- * oFono - Open Source Telephony
- *
- * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- *
- * 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 OFONO_API_SUBJECT_TO_CHANGE
-#include <ofono/plugin.h>
-
-#include "huaweicdmamodem.h"
-
-static int huaweicdmamodem_init(void)
-{
- huaweicdma_netreg_init();
-
- return 0;
-}
-
-static void huaweicdmamodem_exit(void)
-{
- huaweicdma_netreg_exit();
-}
-
-OFONO_PLUGIN_DEFINE(huaweicdmamodem, "Huawei CDMA modem driver", VERSION,
- OFONO_PLUGIN_PRIORITY_DEFAULT,
- huaweicdmamodem_init, huaweicdmamodem_exit)
diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.h b/drivers/huaweicdmamodem/huaweicdmamodem.h
deleted file mode 100644
index 799d3a8..0000000
--- a/drivers/huaweicdmamodem/huaweicdmamodem.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *
- * oFono - Open Source Telephony
- *
- * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- *
- * 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
- *
- */
-
-extern void huaweicdma_netreg_init(void);
-extern void huaweicdma_netreg_exit(void);
diff --git a/drivers/huaweicdmamodem/network-registration.c b/drivers/huaweicdmamodem/network-registration.c
deleted file mode 100644
index 25c6291..0000000
--- a/drivers/huaweicdmamodem/network-registration.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- *
- * oFono - Open Source Telephony
- *
- * Copyright (C) 2008-2011 Intel Corporation. All rights reserved.
- *
- * 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 <glib.h>
-#include <errno.h>
-
-#include <ofono/log.h>
-#include <ofono/modem.h>
-#include <ofono/cdma-netreg.h>
-
-#include "gatchat.h"
-
-#include "huaweicdmamodem.h"
-
-static const char *sysinfo_prefix[] = { "^SYSINFO:", NULL };
-
-static gboolean parse_sysinfo(GAtResult *result, gint *status)
-{
- GAtResultIter iter;
- gint srv_status;
- gint srv_domain;
- gint roaming_status;
-
- g_at_result_iter_init(&iter, result);
-
- if (!g_at_result_iter_next(&iter, "^SYSINFO:"))
- return FALSE;
-
- if (!g_at_result_iter_next_number(&iter, &srv_status))
- return FALSE;
-
- if (!g_at_result_iter_next_number(&iter, &srv_domain))
- return FALSE;
-
- if (!g_at_result_iter_next_number(&iter, &roaming_status))
- return FALSE;
-
- DBG("%d, %d, %d", srv_status, srv_domain, roaming_status);
-
- switch (srv_status) {
- case 1: /* Restricted service */
- case 2: /* Service valid */
- case 3: /* Restricted region service */
- if (roaming_status)
- *status = CDMA_NETWORK_REGISTRATION_STATUS_ROAMING;
- else
- *status = CDMA_NETWORK_REGISTRATION_STATUS_REGISTERED;
- break;
- case 0: /* No service */
- case 4: /* Not registered */
- default:
- *status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
- break;
- }
-
- switch (srv_domain) {
- case 0: /* No service */
- case 255: /* CDMA not supported */
- *status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
- break;
- case 1: /* Only CS */
- case 2: /* Only PS */
- case 3: /* CS PS */
- case 4: /* CS registered, PS in searching state */
- break;
- }
-
- return TRUE;
-}
-
-static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
- struct ofono_cdma_netreg *netreg = user_data;
- int status;
-
- if (!ok)
- return;
-
- if (parse_sysinfo(result, &status) == FALSE) {
- ofono_error("Invalid SYSINFO values");
- return;
- }
-
- ofono_cdma_netreg_status_notify(netreg, status);
-}
-
-static void mode_notify(GAtResult *result, gpointer user_data)
-{
- struct ofono_cdma_netreg *netreg = user_data;
- GAtChat *chat = ofono_cdma_netreg_get_data(netreg);
-
- g_at_chat_send(chat, "AT^SYSINFO", sysinfo_prefix,
- sysinfo_cb, netreg, NULL);
-}
-
-static void rssilvl_notify(GAtResult *result, gpointer user_data)
-{
- struct ofono_cdma_netreg *netreg = user_data;
- int strength;
- GAtResultIter iter;
-
- g_at_result_iter_init(&iter, result);
-
- if (!g_at_result_iter_next(&iter, "^RSSILVL:"))
- goto error;
-
- if (!g_at_result_iter_next_number(&iter, &strength))
- goto error;
-
- if (strength == 99)
- strength = 100;
-
- ofono_cdma_netreg_strength_notify(netreg, strength);
-
- return;
-
-error:
- ofono_error("Invalid RSSILVL value");
-}
-
-static void probe_cb(gboolean ok, GAtResult *result, gpointer user_data)
-{
- struct ofono_cdma_netreg *netreg = user_data;
- GAtChat *chat = ofono_cdma_netreg_get_data(netreg);
-
- if (!ok) {
- ofono_cdma_netreg_remove(netreg);
- return;
- }
-
- g_at_chat_register(chat, "^MODE:",
- mode_notify, FALSE, netreg, NULL);
-
- g_at_chat_register(chat, "^RSSILVL:",
- rssilvl_notify, FALSE, netreg, NULL);
-
- ofono_cdma_netreg_register(netreg);
-}
-
-static int huaweicdma_netreg_probe(struct ofono_cdma_netreg *netreg,
- unsigned int vendor, void *data)
-{
- GAtChat *chat = g_at_chat_clone(data);
-
- ofono_cdma_netreg_set_data(netreg, chat);
-
- g_at_chat_send(chat, "AT^SYSINFO", sysinfo_prefix,
- probe_cb, netreg, NULL);
-
- return 0;
-}
-
-static void huaweicdma_netreg_remove(struct ofono_cdma_netreg *netreg)
-{
- GAtChat *chat = ofono_cdma_netreg_get_data(netreg);
-
- ofono_cdma_netreg_set_data(netreg, NULL);
-
- g_at_chat_unref(chat);
-}
-
-static struct ofono_cdma_netreg_driver driver = {
- .name = "huaweicdmamodem",
- .probe = huaweicdma_netreg_probe,
- .remove = huaweicdma_netreg_remove,
-};
-
-void huaweicdma_netreg_init(void)
-{
- ofono_cdma_netreg_driver_register(&driver);
-}
-
-void huaweicdma_netreg_exit(void)
-{
- ofono_cdma_netreg_driver_unregister(&driver);
-}
--
1.7.1
next prev parent reply other threads:[~2011-11-17 16:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-17 16:20 [PATCH v2 0/6] Add a parser to retrieve the CDMA network name Philippe Nunes
2011-11-17 16:20 ` [PATCH v2 1/6] mbpi: Add mbpi_lookup_cdma_provider_name API Philippe Nunes
2011-11-16 10:28 ` Denis Kenzior
2011-11-17 16:21 ` [PATCH v2 2/6] tools: Add utility for looking CDMA network name from database Philippe Nunes
2011-11-16 10:28 ` Denis Kenzior
2011-11-17 16:21 ` [PATCH v2 3/6] Huaweicdmamodem: remove this specific driver Philippe Nunes
2011-11-17 16:21 ` Philippe Nunes [this message]
2011-11-17 16:21 ` [PATCH v2 5/6] cdmamodem: Add CDMA network-registration support Philippe Nunes
2011-11-17 16:21 ` [PATCH v2 6/6] cdmamodem: Add serving system identifier support Philippe Nunes
2011-11-16 10:26 ` Denis Kenzior
2011-11-18 13:18 ` Philippe Nunes
2011-11-18 15:18 ` Denis Kenzior
2011-11-24 17:35 ` Philippe Nunes
2011-11-24 7:03 ` Denis Kenzior
2011-11-25 16:31 ` Philippe Nunes
2011-11-24 23:35 ` Denis Kenzior
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=1321546864-368-5-git-send-email-philippe.nunes@linux.intel.com \
--to=philippe.nunes@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.