5:12 p.m.
On Wed, Dec 8, 2010 at 2:17 PM, Denis Kenzior <denkenz(a)gmail.com> wrote:
Hi Lucas,
On 11/30/2010 12:41 PM, Lucas De Marchi wrote:
> ---
> Makefile.am | 3 +-
> drivers/huaweimodem/huaweimodem.c | 2 +
> drivers/huaweimodem/huaweimodem.h | 3 +
> drivers/huaweimodem/radio-settings.c | 212 ++++++++++++++++++++++++++++++++++
> 4 files changed, 219 insertions(+), 1 deletions(-)
> create mode 100644 drivers/huaweimodem/radio-settings.c
>
> diff --git a/Makefile.am b/Makefile.am
> index a4c47e8..5d39c23 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -180,7 +180,8 @@ builtin_sources += drivers/atmodem/atutil.h \
> drivers/huaweimodem/huaweimodem.c \
> drivers/huaweimodem/voicecall.c \
> drivers/huaweimodem/audio-settings.c \
> - drivers/huaweimodem/gprs-context.c
> + drivers/huaweimodem/gprs-context.c \
> + drivers/huaweimodem/radio-settings.c
>
> builtin_modules += calypsomodem
> builtin_sources += drivers/atmodem/atutil.h \
> diff --git a/drivers/huaweimodem/huaweimodem.c b/drivers/huaweimodem/huaweimodem.c
> index c8b6522..8097a9c 100644
> --- a/drivers/huaweimodem/huaweimodem.c
> +++ b/drivers/huaweimodem/huaweimodem.c
> @@ -36,6 +36,7 @@ static int huaweimodem_init(void)
> {
> huawei_voicecall_init();
> huawei_audio_settings_init();
> + huawei_radio_settings_init();
> huawei_gprs_context_init();
>
> return 0;
> @@ -44,6 +45,7 @@ static int huaweimodem_init(void)
> static void huaweimodem_exit(void)
> {
> huawei_gprs_context_exit();
> + huawei_radio_settings_exit();
> huawei_audio_settings_exit();
> huawei_voicecall_exit();
> }
> diff --git a/drivers/huaweimodem/huaweimodem.h b/drivers/huaweimodem/huaweimodem.h
> index 03d52ef..596aa08 100644
> --- a/drivers/huaweimodem/huaweimodem.h
> +++ b/drivers/huaweimodem/huaweimodem.h
> @@ -27,5 +27,8 @@ extern void huawei_voicecall_exit();
> extern void huawei_audio_settings_init();
> extern void huawei_audio_settings_exit();
>
> +extern void huawei_radio_settings_init();
> +extern void huawei_radio_settings_exit();
> +
> extern void huawei_gprs_context_init();
> extern void huawei_gprs_context_exit();
> diff --git a/drivers/huaweimodem/radio-settings.c
b/drivers/huaweimodem/radio-settings.c
> new file mode 100644
> index 0000000..7f0b223
> --- /dev/null
> +++ b/drivers/huaweimodem/radio-settings.c
> @@ -0,0 +1,212 @@
> +/*
> + *
> + * oFono - Open Source Telephony
> + *
> + * Copyright (C) 2010 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 <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 "huaweimodem.h"
> +
> +static const char *none_prefix[] = { NULL };
> +static const char *xrat_prefix[] = { "^SYSCFG:", NULL };
> +
> +struct radio_settings_data {
> + GAtChat *chat;
> +};
> +
> +static void xrat_query_cb(gboolean ok, GAtResult *result, gpointer user_data)
Why is this named xrat query?
Looking at ifxmodem, I thought the prefix had something to do with
radio technology (please don't ask me why the "x" in front of
"rat"
:-) )
As I told through IRC, I'm changing it to syscfg, as this is actually
the command name
> +{
> + 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, "^SYSCFG:") == FALSE)
> + goto error;
> +
> + if (g_at_result_iter_next_number(&iter, &value) == FALSE)
> + goto error;
> +
> + switch (value) {
> + case 2:
> + mode = OFONO_RADIO_ACCESS_MODE_ANY;
> + break;
> + case 13:
> + mode = OFONO_RADIO_ACCESS_MODE_GSM;
> + break;
> + case 14:
> + mode = OFONO_RADIO_ACCESS_MODE_UMTS;
> + break;
> + default:
> + CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
> + return;
> + }
> +
> + cb(&error, mode, cbd->data);
> +
> + return;
> +
> +error:
> + CALLBACK_WITH_FAILURE(cb, -1, cbd->data);
> +}
> +
> +static void huawei_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^SYSCFG?", xrat_prefix,
> + xrat_query_cb, cbd, g_free) == 0) {
And xrat_query here too?
> + CALLBACK_WITH_FAILURE(cb, -1, data);
> + g_free(cbd);
> + }
> +}
> +
> +static void xrat_modify_cb(gboolean ok, GAtResult *result, gpointer user_data)
xrat_modify?
> +{
> + 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));
> + cb(&error, cbd->data);
> +}
> +
> +static void huawei_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[40];
> + int value = 2;
> +
> + switch (mode) {
> + case OFONO_RADIO_ACCESS_MODE_ANY:
> + value = 2;
> + break;
> + case OFONO_RADIO_ACCESS_MODE_GSM:
> + value = 13;
> + break;
> + case OFONO_RADIO_ACCESS_MODE_UMTS:
> + value = 14;
> + break;
> + case OFONO_RADIO_ACCESS_MODE_LTE:
> + goto error;
> + }
> +
> + snprintf(buf, sizeof(buf), "AT^SYSCFG=%u,0,3FFFFFFF,2,4", value);
These values don't seem to be correct. At least not after taking a peek
at some of our competitors ;)
I don't think so after poking other projects and testing with a huawei
E220. The second parameter for SYSCFG command means the acquire order
(https://wiki.archlinux.org/index.php/3G_and_GPRS_modems_with_pppd_alone),
so it's pointless here even if some other competitors explicitly set
to "gsm first" or "umts first" when setting the mode.
Thanks for reviewing.
regards,
Lucas De Marchi