From: Denis Kenzior <denkenz@gmail.com>
To: ofono@ofono.org
Subject: Re: [PATCH] SIMCOM SIM900 module support
Date: Tue, 27 Dec 2011 17:03:26 -0600 [thread overview]
Message-ID: <4EFA4EBE.8080102@gmail.com> (raw)
In-Reply-To: <1324906731-24968-1-git-send-email-r.r.zaripov@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 12575 bytes --]
Hi Renat,
On 12/26/2011 07:38 AM, r.r.zaripov(a)gmail.com wrote:
> From: Renat Zaripov <r.r.zaripov@gmail.com>
>
> This patch add support for SIM900 GSM module
> http://wm.sim.com/Sim/FrontShow_en/wireless/detail.aspx?cid=6&nid=770
> ---
> Makefile.am | 3 +
> plugins/sim900.c | 310 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
> plugins/udev.c | 15 +++
> 3 files changed, 328 insertions(+), 0 deletions(-)
> create mode 100644 plugins/sim900.c
>
Can you please separate it into two patches, one for sim900.c plugin +
Makefile changes and the other for udev detection code.
> diff --git a/Makefile.am b/Makefile.am
> index 337aeb7..291d5e5 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -357,6 +357,9 @@ builtin_sources += plugins/speedupcdma.c
> builtin_modules += samsung
> builtin_sources += plugins/samsung.c
>
> +builtin_modules += sim900
> +builtin_sources += plugins/sim900.c
> +
> if BLUETOOTH
> builtin_modules += bluetooth
> builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
> diff --git a/plugins/sim900.c b/plugins/sim900.c
> new file mode 100644
> index 0000000..65b42ee
> --- /dev/null
> +++ b/plugins/sim900.c
> @@ -0,0 +1,310 @@
> +/*
> + *
> + * 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
> +
> +#include <errno.h>
> +#include <stdlib.h>
> +
> +#include <glib.h>
> +#include <gatchat.h>
> +#include <gattty.h>
> +
> +#define OFONO_API_SUBJECT_TO_CHANGE
> +#include <ofono/plugin.h>
> +#include <ofono/modem.h>
> +#include <ofono/devinfo.h>
> +#include <ofono/netreg.h>
> +#include <ofono/sim.h>
> +#include <ofono/sms.h>
> +#include <ofono/ussd.h>
> +#include <ofono/gprs.h>
> +#include <ofono/gprs-context.h>
> +#include <ofono/phonebook.h>
> +#include <ofono/history.h>
> +#include <ofono/log.h>
> +
> +#include <drivers/atmodem/vendor.h>
> +
> +static const char *none_prefix[] = { NULL };
> +
> +struct sim900_data {
> + GAtChat *modem;
> + GAtChat *aux;
> +};
> +
> +static int sim900_probe(struct ofono_modem *modem)
> +{
> + struct sim900_data *data;
> +
> + DBG("%p", modem);
> +
> + data = g_try_new0(struct sim900_data, 1);
> + if (data == NULL)
> + return -ENOMEM;
> +
> + ofono_modem_set_data(modem, data);
> +
> + return 0;
> +}
> +
> +static void sim900_remove(struct ofono_modem *modem)
> +{
> + struct sim900_data *data = ofono_modem_get_data(modem);
> +
> + DBG("%p", modem);
> +
> + ofono_modem_set_data(modem, NULL);
> +
> + /* Cleanup after hot-unplug */
> + g_at_chat_unref(data->aux);
And what about data->modem?
> +
> + g_free(data);
> +}
> +
> +static void sim900_debug(const char *str, void *user_data)
> +{
> + const char *prefix = user_data;
> +
> + ofono_info("%s%s", prefix, str);
> +}
> +
> +static GAtChat *open_device(struct ofono_modem *modem,
> + const char *key, char *debug)
> +{
> + const char *device;
> + GAtSyntax *syntax;
> + GIOChannel *channel;
> + GAtChat *chat;
> + GHashTable *options;
> +
> + device = ofono_modem_get_string(modem, key);
> + if (device == NULL)
> + return NULL;
> +
> + DBG("%s %s", key, device);
> +
> + options = g_hash_table_new(g_str_hash, g_str_equal);
> + if (options == NULL)
> + return NULL;
> +
> + g_hash_table_insert(options, "Baud", "115200");
> + g_hash_table_insert(options, "Parity", "none");
> + g_hash_table_insert(options, "StopBits", "1");
> + g_hash_table_insert(options, "DataBits", "8");
> + g_hash_table_insert(options, "XonXoff", "off");
> + g_hash_table_insert(options, "Local", "off");
> + g_hash_table_insert(options, "RtsCts", "off");
> +
> + channel = g_at_tty_open(device, options);
> + if (channel == NULL)
> + {
> + DBG("channel == NULL");
> + return NULL;
> + }
> +
oFono uses Linux kernel coding style, so please re-format your
submissions to be in-line with that style. e.g. opening curly brace
should be on the same line as the if statement. See
doc/coding-style.txt for additional rules above the common Linux kernel
coding style guidelines.
> + syntax = g_at_syntax_new_gsm_permissive();
> + chat = g_at_chat_new(channel, syntax);
> + g_at_syntax_unref(syntax);
> +
> + g_io_channel_unref(channel);
> +
> + if (chat == NULL)
> + {
> + DBG("chat == NULL");
> + return NULL;
> + }
> +
> + //if (getenv("OFONO_AT_DEBUG"))
Please clean up the commented out areas, for example I'm pretty sure you
want this if statement not to be commented out.
> + g_at_chat_set_debug(chat, sim900_debug, debug);
> +
> + return chat;
> +}
> +
> +static void cfun_enable(gboolean ok, GAtResult *result, gpointer user_data)
> +{
> + struct ofono_modem *modem = user_data;
> + struct sim900_data *data = ofono_modem_get_data(modem);
> +
> + DBG("");
> +
> + if (!ok) {
> + g_at_chat_unref(data->modem);
> + data->modem = NULL;
> +
> + g_at_chat_unref(data->aux);
> + data->aux = NULL;
> + }
> +
> + ofono_modem_set_powered(modem, ok);
> +}
> +
> +static int sim900_enable(struct ofono_modem *modem)
> +{
> + struct sim900_data *data = ofono_modem_get_data(modem);
> +
> + DBG("%p", modem);
> +
> + data->modem = open_device(modem, "Device", "Device: ");
> + if (data->modem == NULL)
> + {
> + DBG("return -EINVAL");
> + return -EINVAL;
We use tabs for indentation, there are no exceptions.
> + }
> +
> +// data->aux = open_device(modem, "Aux", "Aux: ");
> +// if (data->aux == NULL)
> +// {
> +// g_at_chat_unref(data->modem);
> +// data->modem = NULL;
> +// DBG("return -EIO");
> +// return -EIO;
> +// }
> +
> + g_at_chat_send(data->modem, "ATE0", NULL,
> + NULL, NULL, NULL);
> +
> + g_at_chat_send(data->modem, "AT+CMGF=0", NULL,
> + NULL, NULL, NULL);
> +
> + // for obtain correct sms service number
> + g_at_chat_send(data->modem, "AT+CSCS=\"GSM\"", NULL,
> + NULL, NULL, NULL);
> +
> + g_at_chat_send(data->modem, "AT+CNMI=2,2,0,0,0", none_prefix,
> + cfun_enable, modem, NULL);
> +
> + DBG("return -EINPROGRESS");
> + return -EINPROGRESS;
> +}
> +
> +//static void cfun_disable(gboolean ok, GAtResult *result, gpointer user_data)
> +//{
> +// struct ofono_modem *modem = user_data;
> +// struct sim900_data *data = ofono_modem_get_data(modem);
> +
> +// DBG("");
> +
> +// //g_at_chat_unref(data->aux);
> +// data->aux = NULL;
> +
> +// if (ok)
> +// ofono_modem_set_powered(modem, FALSE);
> +//}
> +
> +static int sim900_disable(struct ofono_modem *modem)
> +{
> + struct sim900_data *data = ofono_modem_get_data(modem);
> +
> + DBG("%p", modem);
> +
> + g_at_chat_cancel_all(data->modem);
> + g_at_chat_unregister_all(data->modem);
> +
> + g_at_chat_unref(data->modem);
> + data->modem = NULL;
> +
> + //g_at_chat_cancel_all(data->aux);
> + //g_at_chat_unregister_all(data->aux);
> +
> + //g_at_chat_send(data->aux, "AT+CFUN=4", none_prefix,
> + // cfun_disable, modem, NULL);
> +
> + return -EINPROGRESS;
> +}
> +
> +static void sim900_pre_sim(struct ofono_modem *modem)
> +{
> + struct sim900_data *data = ofono_modem_get_data(modem);
> + struct ofono_sim *sim;
> +
> + DBG("%p", modem);
> +
> + ofono_devinfo_create(modem, 0, "atmodem", data->modem);
> + sim = ofono_sim_create(modem, 0, "atmodem", data->modem);
> +
> + if (sim)
> + ofono_sim_inserted_notify(sim, TRUE);
> +}
> +
> +static void sim900_post_sim(struct ofono_modem *modem)
> +{
> + //struct sim900_data *data = ofono_modem_get_data(modem);
> + struct sim900_data *data = ofono_modem_get_data(modem);
> + //struct ofono_history_driver *hdrv;
> + //struct ofono_gprs *gprs;
> + //struct ofono_gprs_context *gc;
> +
> + DBG("%p", modem);
> +
> + ofono_phonebook_create(modem, 0, "atmodem", data->modem);
> +
> + ofono_sms_create(modem, 0, "atmodem", data->modem);
> +
> + ofono_netreg_create(modem, OFONO_VENDOR_NOKIA, "atmodem", data->modem);
> +
> + //ofono_h
> +
> + //ofono_history_driver_register(hdrv);
> +
> + //gprs = ofono_gprs_create(modem, OFONO_VENDOR_NOKIA,
> + // "atmodem", data->aux);
> + //gc = ofono_gprs_context_create(modem, 0, "atmodem", data->modem);
> +
> + //if (gprs && gc)
> + // ofono_gprs_add_context(gprs, gc);
> +}
> +
> +static void sim900_post_online(struct ofono_modem *modem)
> +{
> +
> +
Why this double empty line?
> + DBG("%p", modem);
> +
> + //ofono_ussd_create(modem, OFONO_VENDOR_QUALCOMM_MSM,
> + // "atmodem", data->aux);
> +}
> +
> +static struct ofono_modem_driver sim900_driver = {
> + .name = "sim900",
> + .probe = sim900_probe,
> + .remove = sim900_remove,
> + .enable = sim900_enable,
> + .disable = sim900_disable,
> + .pre_sim = sim900_pre_sim,
> + .post_sim = sim900_post_sim,
> + .post_online = sim900_post_online,
> +};
> +
> +static int sim900_init(void)
> +{
> + return ofono_modem_driver_register(&sim900_driver);
> +}
> +
> +static void sim900_exit(void)
> +{
> + ofono_modem_driver_unregister(&sim900_driver);
> +}
> +
> +OFONO_PLUGIN_DEFINE(sim900, "SIM900 driver for i-Tetra", VERSION,
> + OFONO_PLUGIN_PRIORITY_DEFAULT, sim900_init, sim900_exit)
> diff --git a/plugins/udev.c b/plugins/udev.c
> index d0673f7..f05af48 100644
> --- a/plugins/udev.c
> +++ b/plugins/udev.c
> @@ -193,6 +193,19 @@ static void add_nokiacdma(struct ofono_modem *modem,
> ofono_modem_register(modem);
> }
>
> +static void add_sim900(struct ofono_modem *modem,
> + struct udev_device *udev_device)
> +{
> + const char *devnode;
> +
> + DBG("modem %p", modem);
> +
> + devnode = udev_device_get_devnode(udev_device);
> + ofono_modem_set_string(modem, "Device", devnode);
> +
> + ofono_modem_register(modem);
> +}
> +
> static void add_modem(struct udev_device *udev_device)
> {
> struct ofono_modem *modem;
> @@ -271,6 +284,8 @@ done:
> add_tc65(modem, udev_device);
> else if (g_strcmp0(driver, "nokiacdma") == 0)
> add_nokiacdma(modem, udev_device);
> + else if (g_strcmp0(driver, "sim900") == 0)
> + add_sim900(modem, udev_device);
> }
>
> static gboolean devpath_remove(gpointer key, gpointer value, gpointer user_data)
And do you have a patch to plugins/ofono.rules to share as well?
Regards,
-Denis
next prev parent reply other threads:[~2011-12-27 23:03 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-26 13:38 [PATCH] SIMCOM SIM900 module support r.r.zaripov
2011-12-27 23:03 ` Denis Kenzior [this message]
2011-12-29 12:06 ` [PATCH v3 1/3] " r.r.zaripov
2011-12-28 15:54 ` Denis Kenzior
2012-01-11 13:59 ` [PATCH v4 " r.r.zaripov
2012-01-11 13:59 ` [PATCH v4 2/3] Add SIM900 detection support r.r.zaripov
2012-01-11 14:54 ` Marcel Holtmann
2012-01-12 10:11 ` Renat Zaripov
2012-01-11 13:59 ` [PATCH v4 3/3] Adding a short description for usage of SIM900 plugin r.r.zaripov
2012-01-11 14:52 ` [PATCH v4 1/3] SIMCOM SIM900 module support Marcel Holtmann
2012-01-11 11:21 ` Denis Kenzior
2012-01-11 15:24 ` Marcel Holtmann
2012-01-11 11:41 ` Denis Kenzior
2012-01-12 10:55 ` Renat Zaripov
2012-01-12 11:52 ` Marcel Holtmann
2012-01-12 12:32 ` [PATCH v5 1/4] This patch add support for SIM900 GSM module r.r.zaripov
2012-01-12 5:52 ` Denis Kenzior
2012-01-12 12:32 ` [PATCH v5 2/4] Add SIM900 detection support r.r.zaripov
2012-01-12 12:32 ` [PATCH v5 3/4] SIM900 driver usage documentation r.r.zaripov
2012-01-12 12:32 ` [PATCH v5 4/4] SIM900 vendor quirk r.r.zaripov
2011-12-29 12:06 ` [PATCH v3 2/3] Add SIM900 detection support r.r.zaripov
2011-12-29 12:06 ` [PATCH v3 3/3] SIM900 driver usage documentation r.r.zaripov
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=4EFA4EBE.8080102@gmail.com \
--to=denkenz@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 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.