10:13 p.m.
Already v9, cause of some issues.
Changelog from v8 is:
- Remove struct cdma_netreg_data creating compilation issue
- Use correct name "DataStrength" for data signal
Bertrand Aygon (4):
huaweicdma: create a dedicated netreg atom.
huaweicdma: register to CDMA netreg atom.
huaweicdma: register to ^RSSILVL to update signal strength.
cdmamodem: add data strength to CDMA netreg atom.
Makefile.am | 3 +-
drivers/huaweicdmamodem/huaweicdmamodem.c | 3 +
drivers/huaweicdmamodem/huaweicdmamodem.h | 3 +
drivers/huaweicdmamodem/network-registration.c | 199 ++++++++++++++++++++++++
plugins/huaweicdma.c | 3 +
src/cdma-netreg.c | 54 +++++--
6 files changed, 254 insertions(+), 11 deletions(-)
create mode 100644 drivers/huaweicdmamodem/network-registration.c
10:13 p.m.
New subject: [PATCH_v9 1/4] huaweicdma: create a dedicated netreg atom.
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
Makefile.am | 3 +-
drivers/huaweicdmamodem/huaweicdmamodem.c | 3 +
drivers/huaweicdmamodem/huaweicdmamodem.h | 3 +
drivers/huaweicdmamodem/network-registration.c | 171 ++++++++++++++++++++++++
4 files changed, 179 insertions(+), 1 deletions(-)
create mode 100644 drivers/huaweicdmamodem/network-registration.c
diff --git a/Makefile.am b/Makefile.am
index 62174db..e11f627 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -283,7 +283,8 @@ builtin_sources += drivers/cdmamodem/cdmamodem.h \
builtin_modules += huaweicdmamodem
builtin_sources += drivers/huaweicdmamodem/huaweicdmamodem.h \
- drivers/huaweicdmamodem/huaweicdmamodem.c
+ drivers/huaweicdmamodem/huaweicdmamodem.c \
+ drivers/huaweicdmamodem/network-registration.c
endif
diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.c
b/drivers/huaweicdmamodem/huaweicdmamodem.c
index d9e7943..4e9c400 100644
--- a/drivers/huaweicdmamodem/huaweicdmamodem.c
+++ b/drivers/huaweicdmamodem/huaweicdmamodem.c
@@ -30,11 +30,14 @@
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,
diff --git a/drivers/huaweicdmamodem/huaweicdmamodem.h
b/drivers/huaweicdmamodem/huaweicdmamodem.h
index d11ddd9..799d3a8 100644
--- a/drivers/huaweicdmamodem/huaweicdmamodem.h
+++ b/drivers/huaweicdmamodem/huaweicdmamodem.h
@@ -18,3 +18,6 @@
* 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
new file mode 100644
index 0000000..e430c41
--- /dev/null
+++ b/drivers/huaweicdmamodem/network-registration.c
@@ -0,0 +1,171 @@
+/*
+ *
+ * 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 int 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 -1;
+
+ if (!g_at_result_iter_next_number(&iter, &srv_status))
+ return -1;
+
+ if (!g_at_result_iter_next_number(&iter, &srv_domain))
+ return -1;
+
+ if (!g_at_result_iter_next_number(&iter, &roaming_status))
+ return -1;
+
+ 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 0;
+}
+
+static void sysinfo_cb(gboolean ok, GAtResult *result, gpointer user_data)
+{
+ struct ofono_cdma_netreg *netreg = user_data;
+ int status;
+
+ if (!ok)
+ return;
+
+ status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
+
+ if (parse_sysinfo(result, &status) < 0)
+ ofono_error("Invalid SYSINFO values");
+
+ 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 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);
+
+ 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
4:31 a.m.
New subject: [PATCH_v9 1/4] huaweicdma: create a dedicated netreg atom.
Hi Guillaume,
On 08/08/2011 07:13 AM, Guillaume Zajac wrote:
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
Makefile.am | 3 +-
drivers/huaweicdmamodem/huaweicdmamodem.c | 3 +
drivers/huaweicdmamodem/huaweicdmamodem.h | 3 +
drivers/huaweicdmamodem/network-registration.c | 171 ++++++++++++++++++++++++
4 files changed, 179 insertions(+), 1 deletions(-)
create mode 100644 drivers/huaweicdmamodem/network-registration.c
I applied this patch but refactored it slightly afterwards. Please
review and make sure I didn't break anything.
Regards,
-Denis
1:04 a.m.
New subject: [PATCH_v9 1/4] huaweicdma: create a dedicated netreg atom.
Hi Denis,
I did a test with a Huawei EC152 cdma dongle in India with this patch.
Please find below the oFono logs.
It appears that the service domain is reported in the ^SYSINFO answer as
'CDMA not supported' whereas the cdma data connection could be
established successfully.
ofonod[11013]: Modem: > AT^SYSINFO\r
ofonod[11013]: Modem: < \r\n^SYSINFO:0,255,0,0,0\r\n\r\nOK\r\n
ofonod[11013]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 0, 255, 0
The issue is that the switch case in the function 'parse_sysinfo' is
overiding the status returned by the field srv_status by the status
returned by the field srv_domain. Therefore, the status returned by the
function 'parse_sysinfo' is always
"CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED'.
In practice, I don't think we need to handle the srv_domain field.
Perhaps, do you have some background here you can share?
I need also to raise another issue which is more likely a timing issue.
Until now, the cdma connection could be initiated as soon as the
cdma.ConnectionManager interface was registered in ofono.org.
For cdma, as only few AT commands are exchanged, this can happen quite
immediately and is likely to fail since we are not registered to the
network.
Now that the cdma netreg atom is available, could we think indeed to
register ConMann to the cdma netreg status change but also to trigger
the cdma cellular network creation once the status becomes 'registered'?
That said, I don't know if this status is sufficiently representative
like the 'Attached' state for gprs.
For gprs precisely, can we think to adopt the same mechanism ? I mean,
add the cellular networks (corresponding to the gprs contexts) only once
gprs is attached ? This could be helpful in case of automatic
reconnection after plug-in the 3G dongle (it avoids to perform the
automatic connection too early).
Regards,
Philippe.
ofonod[11596]: src/modem.c:ofono_modem_create() name: (null), type:
huaweicdma
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
Path
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
Registered
ofonod[11596]: plugins/udev.c:add_modem()
/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.1/ttyUSB1/tty/ttyUSB1
(huaweicdma)
ofonod[11596]: plugins/udev.c:add_huawei() modem 0x9a88078
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
ModemRegistered
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
PcuiRegistered
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
Path
ofonod[11596]: plugins/udev.c:add_modem()
/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.2/ttyUSB2/tty/ttyUSB2
(huaweicdma)
ofonod[11596]: plugins/udev.c:add_huawei() modem 0x9a88078
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
ModemRegistered
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
PcuiRegistered
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
Pcui
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
PcuiRegistered
ofonod[11596]: plugins/udev.c:add_huawei() /dev/ttyUSB2 PCui
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
Path
ofonod[11596]: plugins/udev.c:add_modem()
/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.3/2-1.3:1.0/ttyUSB0/tty/ttyUSB0
(huaweicdma)
ofonod[11596]: plugins/udev.c:add_huawei() modem 0x9a88078
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
ModemRegistered
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
PcuiRegistered
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
Modem
ofonod[11596]: src/modem.c:set_modem_property() modem 0x9a88078 property
ModemRegistered
ofonod[11596]: plugins/udev.c:add_huawei() /dev/ttyUSB0 Modem
ofonod[11596]: plugins/huaweicdma.c:huaweicdma_probe() 0x9a88078
ofonod[11596]: plugins/hfp_ag.c:modem_watch() modem: 0x9a88078, added: 1
ofonod[11596]: plugins/dun_gw.c:modem_watch() modem: 0x9a88078, added: 1
ofonod[11596]: examples/emulator.c:modem_watch() modem: 0x9a88078, added: 1
ofonod[11596]: plugins/smart-messaging.c:modem_watch() modem: 0x9a88078,
added: 1
ofonod[11596]: plugins/push-notification.c:modem_watch() modem:
0x9a88078, added: 1
ofonod[11596]: plugins/huaweicdma.c:huaweicdma_enable()
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
Modem
ofonod[11596]: plugins/huaweicdma.c:open_device() Modem /dev/ttyUSB0
ofonod[11596]: src/modem.c:get_modem_property() modem 0x9a88078 property
Pcui
ofonod[11596]: plugins/huaweicdma.c:open_device() Pcui /dev/ttyUSB2
ofonod[11596]: Modem: > ATE0 &C0 +CMEE=1\r
ofonod[11596]: PCUI: > ATE0 &C0 +CMEE=1\r
ofonod[11596]: Modem: < \r\nOK\r\n
ofonod[11596]: PCUI: < ATE0 &C0 +CMEE=1\r\r\nOK\r\n
ofonod[11596]: PCUI: > AT+CFUN=1\r
ofonod[11596]: PCUI: < \r\nOK\r\n
ofonod[11596]: plugins/huaweicdma.c:cfun_enable()
ofonod[11596]: examples/emulator.c:powered_watch() Adding modem
0x9a88078 to the list
ofonod[11596]: src/modem.c:modem_change_state() old state: 0, new state: 1
ofonod[11596]: plugins/huaweicdma.c:huaweicdma_pre_sim() 0x9a88078
ofonod[11596]: src/modem.c:modem_change_state() old state: 1, new state: 2
ofonod[11596]: plugins/huaweicdma.c:huaweicdma_post_sim() 0x9a88078
ofonod[11596]: Example History Probe for modem: 0x9a88078
ofonod[11596]: Example Network Time Probe for modem: 0x9a88078
ofonod[11596]: src/modem.c:set_online() modem->online change 1
ofonod[11596]: src/modem.c:set_online() ofono_dbus_signal_property_changed
ofonod[11596]: src/modem.c:modem_change_state() old state: 2, new state: 3
ofonod[11596]: plugins/huaweicdma.c:huaweicdma_post_online() 0x9a88078
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_create()
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:huaweicdma_netreg_probe()
ofonod[11596]: src/cdma-connman.c:ofono_cdma_connman_create()
ofonod[11596]: drivers/cdmamodem/connman.c:cdma_connman_probe()
ofonod[11596]: PCUI: > AT+GCAP\r
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^SYSINFO:0,255,0,0,0\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 0, 255, 0
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: PCUI: < \r\n+GCAP: +CIS707-A,CIS-856-A,+MS, +ES, +DS,
+FCLASS\r\n\r\nOK\r\n
ofonod[11596]: Modem: > AT&C0\r
ofonod[11596]: PCUI: > AT+GMI\r
ofonod[11596]: Modem: < \r\nOK\r\n
ofonod[11596]: drivers/cdmamodem/connman.c:at_c0_cb() ok 1
ofonod[11596]: src/cdma-connman.c:ofono_cdma_connman_register()
ofonod[11596]: PCUI: < \r\n+GMI: HUAWEI TECHNOLOGIES CO., LTD\r\n\r\nOK\r\n
ofonod[11596]: PCUI: > AT+GMM\r
ofonod[11596]: PCUI: < \r\nERROR\r\n
ofonod[11596]: PCUI: > AT+GMR\r
ofonod[11596]: PCUI: < \r\nTCPU_HWEC152DT01\r\n\r\nOK\r\n
ofonod[11596]: PCUI: > AT+GSN\r
ofonod[11596]: PCUI: < \r\n+GSN:80e75f34\r\n\r\nOK\r\n
ofonod[11596]: Modem: < \r\n^SIMST:240\r\n
ofonod[11596]: PCUI: < \r\n^SIMST:240\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n
ofonod[11596]: Modem: < \r\n^MODE:
2\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:0\r\n
ofonod[11596]: PCUI: < \r\n^MODE:
2\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:0\r\n
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^SYSINFO:2,255,0,2,240\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 2, 255, 0
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: Modem: < \r\n^RSSILVL:20\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:20\r\n
ofonod[11596]: Modem: <
\r\n^RSSILVL:80\r\n\r\n^HRSSILVL:20\r\n\r\n^MODE:
8\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:40\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n\r\n^HRSSILVL:20\r\n
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^HRSSILVL:40\r\n
ofonod[11596]: PCUI: < \r\n^MODE:
8\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:40\r\n
ofonod[11596]: Modem: < \r\n^SYSINFO:2,255,0,8,240\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 2, 255, 0
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: PCUI: < \r\n^HRSSILVL:40\r\n
ofonod[11596]: Modem: < \r\n^HRSSILVL:60\r\n
ofonod[11596]: PCUI: < \r\n^HRSSILVL:60\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:20\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:20\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:80\r\n\r\n^HRSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n\r\n^HRSSILVL:80\r\n
ofonod[11596]: Modem: < \r\n^MODE:
4\r\r\n\r\r\n^RSSILVL:0\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^MODE:
4\r\r\n\r\r\n^RSSILVL:0\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^SYSINFO:2,255,0,4,240\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 2, 255, 0
fonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: Modem: < \r\n^MODE:
4\r\r\n\r\r\n^RSSILVL:0\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^MODE:
4\r\r\n\r\r\n^RSSILVL:0\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^SYSINFO:2,255,0,4,240\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 2, 255, 0
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: Modem: < \r\n^RSSILVL:80\r\n\r\n^MODE:
8\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n\r\n^MODE:
8\r\r\n\r\r\n^RSSILVL:80\r\r\n\r\r\n^HRSSILVL:80\r\n
ofonod[11596]: Modem: > AT^SYSINFO\r
ofonod[11596]: Modem: < \r\n^SYSINFO:2,255,0,8,240\r\n\r\nOK\r\n
ofonod[11596]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 2, 255, 0
ofonod[11596]: src/cdma-netreg.c:ofono_cdma_netreg_status_notify()
ofonod[11596]: Modem: < \r\n^RSSILVL:60\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:60\r\n
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: drivers/cdmamodem/connman.c:cdma_connman_activate()
ofonod[11596]: Modem: > ATD#777\r
ofonod[11596]: Modem: < \r\nCONNECT\r\n
ofonod[11596]: drivers/cdmamodem/connman.c:atd_cb() ok 1
ofonod[11596]: drivers/cdmamodem/connman.c:setup_ppp()
ofonod[11596]: PCUI: < \r\nCONNECT\r\n
ofonod[11596]: drivers/cdmamodem/connman.c:ppp_connect()
ofonod[11596]: IP: 14.96.204.15
ofonod[11596]: DNS: 4.2.2.2, 4.2.2.3
ofonod[11596]: src/cdma-connman.c:activate_callback() 0x9a88880 ppp0
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_update()
ofonod[11596]: src/cdma-connman.c:cdma_connman_ifupdown()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_signal()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_append_variant()
ofonod[11596]: src/cdma-connman.c:cdma_connman_set_property()
ofonod[11596]: drivers/cdmamodem/connman.c:cdma_connman_deactivate()
ofonod[11596]: plugins/udev.c:remove_modem() /devices/virtual/net/ppp0
ofonod[11596]: PCUI: < \r\nNO CARRIER\r\n
ofonod[11596]: drivers/cdmamodem/connman.c:ppp_disconnect()
ofonod[11596]: src/cdma-connman.c:deactivate_callback()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_reset()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_free()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_signal()
ofonod[11596]: src/cdma-connman.c:cdma_connman_settings_append_variant()
ofonod[11596]: src/cdma-connman.c:cdma_connman_ifupdown()
ofonod[11596]: Modem: < \r\n^RSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:60\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:60\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:80\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:80\r\n
ofonod[11596]: Modem: < \r\n^RSSILVL:60\r\n
ofonod[11596]: PCUI: < \r\n^RSSILVL:60\r\n
On 08/09/2011 08:31 PM, Denis Kenzior wrote:
Hi Guillaume,
On 08/08/2011 07:13 AM, Guillaume Zajac wrote:
> From: Bertrand Aygon<bertrand.aygon(a)intel.com>
>
> ---
> Makefile.am | 3 +-
> drivers/huaweicdmamodem/huaweicdmamodem.c | 3 +
> drivers/huaweicdmamodem/huaweicdmamodem.h | 3 +
> drivers/huaweicdmamodem/network-registration.c | 171 ++++++++++++++++++++++++
> 4 files changed, 179 insertions(+), 1 deletions(-)
> create mode 100644 drivers/huaweicdmamodem/network-registration.c
>
I applied this patch but refactored it slightly afterwards. Please
review and make sure I didn't break anything.
Regards,
-Denis
_______________________________________________
ofono mailing list
ofono(a)ofono.org
http://lists.ofono.org/listinfo/ofono
3:38 p.m.
New subject: [PATCH_v9 1/4] huaweicdma: create a dedicated netreg atom.
Hi Philippe,
This is a gentle reminder not to top-post on this mailing list.
On 08/11/2011 10:04 AM, Philippe Nunes wrote:
Hi Denis,
I did a test with a Huawei EC152 cdma dongle in India with this patch.
Please find below the oFono logs.
It appears that the service domain is reported in the ^SYSINFO answer as
'CDMA not supported' whereas the cdma data connection could be
established successfully.
ofonod[11013]: Modem: > AT^SYSINFO\r
ofonod[11013]: Modem: < \r\n^SYSINFO:0,255,0,0,0\r\n\r\nOK\r\n
ofonod[11013]:
drivers/huaweicdmamodem/network-registration.c:sysinfo_cb() 0, 255, 0
If you're getting to this point then it isn't related to the refactoring
I've done.
The issue is that the switch case in the function 'parse_sysinfo' is
overiding the status returned by the field srv_status by the status
returned by the field srv_domain. Therefore, the status returned by the
function 'parse_sysinfo' is always
"CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED'.
In practice, I don't think we need to handle the srv_domain field.
Perhaps, do you have some background here you can share?
Bertrand or Guillaume might be better suited to answer this question.
I need also to raise another issue which is more likely a timing
issue.
Until now, the cdma connection could be initiated as soon as the
cdma.ConnectionManager interface was registered in ofono.org.
For cdma, as only few AT commands are exchanged, this can happen quite
immediately and is likely to fail since we are not registered to the
network.
Now that the cdma netreg atom is available, could we think indeed to
register ConMann to the cdma netreg status change but also to trigger
the cdma cellular network creation once the status becomes 'registered'?
That said, I don't know if this status is sufficiently representative
like the 'Attached' state for gprs.
We should not succeed in setting Powered=True unless the cdma_netreg
atom has indicated it is registered to a network.
For gprs precisely, can we think to adopt the same mechanism ? I mean,
add the cellular networks (corresponding to the gprs contexts) only once
gprs is attached ? This could be helpful in case of automatic
reconnection after plug-in the 3G dongle (it avoids to perform the
automatic connection too early).
I'm confused, gprs? Are you talking about CDMA or GSM? There are no
contexts in CDMA, this is why the API looks the way it does.
For CDMA, ConnMan should handle automatic reconnection, it is up to the
ofono plugin in ConnMan to do the right thing (e.g. listen to
cdma_netreg state changes and attempt setting Powered then)
Regards,
-Denis
10:13 p.m.
New subject: [PATCH_v9 2/4] huaweicdma: register to CDMA netreg atom.
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
plugins/huaweicdma.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/plugins/huaweicdma.c b/plugins/huaweicdma.c
index 75aacb2..4c83114 100644
--- a/plugins/huaweicdma.c
+++ b/plugins/huaweicdma.c
@@ -34,6 +34,7 @@
#include <ofono/plugin.h>
#include <ofono/modem.h>
#include <ofono/devinfo.h>
+#include <ofono/cdma-netreg.h>
#include <ofono/cdma-connman.h>
#include <ofono/log.h>
@@ -210,6 +211,8 @@ static void huaweicdma_post_online(struct ofono_modem *modem)
DBG("%p", modem);
+ ofono_cdma_netreg_create(modem, 0, "huaweicdmamodem", data->modem);
+
ofono_cdma_connman_create(modem, 0, "cdmamodem", data->modem);
}
--
1.7.1
4:31 a.m.
New subject: [PATCH_v9 2/4] huaweicdma: register to CDMA netreg atom.
Hi Guillaume,
On 08/08/2011 07:13 AM, Guillaume Zajac wrote:
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
plugins/huaweicdma.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Patch has been applied, thanks.
Regards,
-Denis
10:13 p.m.
New subject: [PATCH_v9 3/4] huaweicdma: register to ^RSSILVL to update signal strength.
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
drivers/huaweicdmamodem/network-registration.c | 28 ++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/drivers/huaweicdmamodem/network-registration.c
b/drivers/huaweicdmamodem/network-registration.c
index e430c41..dcaeb72 100644
--- a/drivers/huaweicdmamodem/network-registration.c
+++ b/drivers/huaweicdmamodem/network-registration.c
@@ -116,6 +116,31 @@ static void mode_notify(GAtResult *result, gpointer user_data)
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;
@@ -129,6 +154,9 @@ static void probe_cb(gboolean ok, GAtResult *result, gpointer
user_data)
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);
}
--
1.7.1
4:32 a.m.
New subject: [PATCH_v9 3/4] huaweicdma: register to ^RSSILVL to update signal strength.
Hi Guillaume,
On 08/08/2011 07:13 AM, Guillaume Zajac wrote:
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
drivers/huaweicdmamodem/network-registration.c | 28 ++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
Patch has been applied, thanks.
Regards,
-Denis
10:13 p.m.
New subject: [PATCH_v9 4/4] cdmamodem: add data strength to CDMA netreg atom.
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
src/cdma-netreg.c | 54 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/cdma-netreg.c b/src/cdma-netreg.c
index 12ddd23..3f08d1e 100644
--- a/src/cdma-netreg.c
+++ b/src/cdma-netreg.c
@@ -34,6 +34,7 @@ static GSList *g_drivers;
struct ofono_cdma_netreg {
enum cdma_netreg_status status;
int strength;
+ int data_strength;
const struct ofono_cdma_netreg_driver *driver;
void *driver_data;
struct ofono_atom *atom;
@@ -82,6 +83,13 @@ static DBusMessage *network_get_properties(DBusConnection *conn,
&strength);
}
+ if (cdma_netreg->data_strength != -1) {
+ unsigned char data_strength = cdma_netreg->data_strength;
+
+ ofono_dbus_dict_append(&dict, "DataStrength", DBUS_TYPE_BYTE,
+ &data_strength);
+ }
+
dbus_message_iter_close_container(&iter, &dict);
return reply;
@@ -121,15 +129,10 @@ void ofono_cdma_netreg_status_notify(struct ofono_cdma_netreg
*cdma_netreg,
set_registration_status(cdma_netreg, status);
}
-void ofono_cdma_netreg_strength_notify(struct ofono_cdma_netreg *netreg,
- int strength)
+static void set_signal_strength(struct ofono_cdma_netreg *netreg,
+ int strength, gboolean is_data_type)
{
- if (netreg == NULL)
- return;
-
- if (netreg->strength == strength)
- return;
-
+ const char *strengh_name;
/*
* Theoretically we can get signal strength even when not registered
* to any network. However, what do we do with it in that case?
@@ -137,7 +140,13 @@ void ofono_cdma_netreg_strength_notify(struct ofono_cdma_netreg
*netreg,
if (netreg->status == CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED)
return;
- netreg->strength = strength;
+ if (is_data_type == TRUE) {
+ strengh_name = "DataStrength";
+ netreg->data_strength = strength;
+ } else {
+ strengh_name = "Strength";
+ netreg->strength = strength;
+ }
if (strength != -1) {
DBusConnection *conn = ofono_dbus_get_connection();
@@ -146,11 +155,35 @@ void ofono_cdma_netreg_strength_notify(struct ofono_cdma_netreg
*netreg,
ofono_dbus_signal_property_changed(conn, path,
OFONO_CDMA_NETWORK_REGISTRATION_INTERFACE,
- "Strength", DBUS_TYPE_BYTE,
+ strengh_name, DBUS_TYPE_BYTE,
&strength);
}
}
+void ofono_cdma_netreg_strength_notify(struct ofono_cdma_netreg *netreg,
+ int strength)
+{
+ if (netreg == NULL)
+ return;
+
+ if (netreg->strength == strength)
+ return;
+
+ set_signal_strength(netreg, strength, FALSE);
+}
+
+void ofono_cdma_netreg_data_strength_notify(struct ofono_cdma_netreg *netreg,
+ int data_strength)
+{
+ if (netreg == NULL)
+ return;
+
+ if (netreg->data_strength == data_strength)
+ return;
+
+ set_signal_strength(netreg, data_strength, TRUE);
+}
+
int ofono_cdma_netreg_driver_register(const struct ofono_cdma_netreg_driver *d)
{
DBG("driver: %p, name: %s", d, d->name);
@@ -216,6 +249,7 @@ struct ofono_cdma_netreg *ofono_cdma_netreg_create(struct ofono_modem
*modem,
cdma_netreg->status = CDMA_NETWORK_REGISTRATION_STATUS_NOT_REGISTERED;
cdma_netreg->strength = -1;
+ cdma_netreg->data_strength = -1;
cdma_netreg->atom = __ofono_modem_add_atom(modem,
OFONO_ATOM_TYPE_CDMA_NETREG,
--
1.7.1
4:35 a.m.
New subject: [PATCH_v9 4/4] cdmamodem: add data strength to CDMA netreg atom.
Hi Guillaume,
On 08/08/2011 07:13 AM, Guillaume Zajac wrote:
From: Bertrand Aygon <bertrand.aygon(a)intel.com>
---
src/cdma-netreg.c | 54 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 10 deletions(-)
I pushed my own version of this patch. Please let me know of any problems.
Regards,
-Denis
10:42 p.m.
Hi,
It should have been v8 and not v9 sorry for the mistake.
Kind regards,
Guillaume
On 08/08/2011 14:13, Guillaume Zajac wrote:
Already v9, cause of some issues.
Changelog from v8 is:
- Remove struct cdma_netreg_data creating compilation issue
- Use correct name "DataStrength" for data signal
Bertrand Aygon (4):
huaweicdma: create a dedicated netreg atom.
huaweicdma: register to CDMA netreg atom.
huaweicdma: register to ^RSSILVL to update signal strength.
cdmamodem: add data strength to CDMA netreg atom.
Makefile.am | 3 +-
drivers/huaweicdmamodem/huaweicdmamodem.c | 3 +
drivers/huaweicdmamodem/huaweicdmamodem.h | 3 +
drivers/huaweicdmamodem/network-registration.c | 199 ++++++++++++++++++++++++
plugins/huaweicdma.c | 3 +
src/cdma-netreg.c | 54 +++++--
6 files changed, 254 insertions(+), 11 deletions(-)
create mode 100644 drivers/huaweicdmamodem/network-registration.c
_______________________________________________
ofono mailing list
ofono(a)ofono.org
http://lists.ofono.org/listinfo/ofono
4056
days inactive
4059
days old
11 comments
3 participants
participants (3)
-
Denis Kenzior -
Guillaume Zajac -
Philippe Nunes