* [PATCH 2/3] cdmamodem: Add CDMA devinfo support
@ 2011-01-11 21:45 Dara Spieker-Doyle
2011-01-13 6:03 ` Denis Kenzior
0 siblings, 1 reply; 3+ messages in thread
From: Dara Spieker-Doyle @ 2011-01-11 21:45 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 5946 bytes --]
---
Makefile.am | 3 +-
drivers/cdmamodem/cdmamodem.c | 2 +
drivers/cdmamodem/cdmamodem.h | 2 +
drivers/cdmamodem/devinfo.c | 169 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 175 insertions(+), 1 deletions(-)
create mode 100644 drivers/cdmamodem/devinfo.c
diff --git a/Makefile.am b/Makefile.am
index 5c9445f..da57645 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -249,7 +249,8 @@ if CDMAMODEM
builtin_modules += cdmamodem
builtin_sources += drivers/cdmamodem/cdmamodem.h \
drivers/cdmamodem/cdmamodem.c \
- drivers/cdmamodem/voicecall.c
+ drivers/cdmamodem/voicecall.c \
+ drivers/cdmamodem/devinfo.c
endif
builtin_modules += g1
diff --git a/drivers/cdmamodem/cdmamodem.c b/drivers/cdmamodem/cdmamodem.c
index 1c15da0..0ed8414 100644
--- a/drivers/cdmamodem/cdmamodem.c
+++ b/drivers/cdmamodem/cdmamodem.c
@@ -35,6 +35,7 @@
static int cdmamodem_init(void)
{
cdma_at_voicecall_init();
+ cdma_at_devinfo_init();
return 0;
}
@@ -42,6 +43,7 @@ static int cdmamodem_init(void)
static void cdmamodem_exit(void)
{
cdma_at_voicecall_exit();
+ cdma_at_devinfo_exit();
}
OFONO_PLUGIN_DEFINE(cdmamodem, "CDMA AT modem driver", VERSION,
diff --git a/drivers/cdmamodem/cdmamodem.h b/drivers/cdmamodem/cdmamodem.h
index a5991cf..ef4fad3 100644
--- a/drivers/cdmamodem/cdmamodem.h
+++ b/drivers/cdmamodem/cdmamodem.h
@@ -23,3 +23,5 @@
extern void cdma_at_voicecall_init();
extern void cdma_at_voicecall_exit();
+extern void cdma_at_devinfo_init();
+extern void cdma_at_devinfo_exit();
diff --git a/drivers/cdmamodem/devinfo.c b/drivers/cdmamodem/devinfo.c
new file mode 100644
index 0000000..efa140a
--- /dev/null
+++ b/drivers/cdmamodem/devinfo.c
@@ -0,0 +1,169 @@
+/*
+ *
+ * oFono - Open Source Telephony
+ *
+ * Copyright (C) 2008-2010 Intel Corporation. All rights reserved.
+ * Copyright (C) 2011 Nokia 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 <string.h>
+#include <glib.h>
+
+#include <ofono/log.h>
+#include <ofono/modem.h>
+#include <ofono/devinfo.h>
+
+#include "gatchat.h"
+#include "gatresult.h"
+
+#include "cdmamodem.h"
+
+static void cdma_at_query_manufacturer(struct ofono_devinfo *info,
+ ofono_devinfo_query_cb_t cb, void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ GAtChat *chat = ofono_devinfo_get_data(info);
+
+ if (cbd == NULL)
+ goto error;
+
+ cbd->user = "AT+GMI";
+
+ if (g_at_chat_send(chat, "AT+GMI", NULL,
+ at_util_attr_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, NULL, data);
+}
+
+static void cdma_at_query_model(struct ofono_devinfo *info,
+ ofono_devinfo_query_cb_t cb, void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ GAtChat *chat = ofono_devinfo_get_data(info);
+
+ if (cbd == NULL)
+ goto error;
+
+ cbd->user = "AT+GMM";
+
+ if (g_at_chat_send(chat, "AT+GMM", NULL,
+ at_util_attr_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, NULL, data);
+}
+
+static void cdma_at_query_revision(struct ofono_devinfo *info,
+ ofono_devinfo_query_cb_t cb, void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ GAtChat *chat = ofono_devinfo_get_data(info);
+
+ if (cbd == NULL)
+ goto error;
+
+ cbd->user = "AT+GMR";
+
+ if (g_at_chat_send(chat, "AT+GMR", NULL,
+ at_util_attr_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, NULL, data);
+}
+
+static void cdma_at_query_serial(struct ofono_devinfo *info,
+ ofono_devinfo_query_cb_t cb, void *data)
+{
+ struct cb_data *cbd = cb_data_new(cb, data);
+ GAtChat *chat = ofono_devinfo_get_data(info);
+
+ if (cbd == NULL)
+ goto error;
+
+ cbd->user = "AT+GSN";
+
+ if (g_at_chat_send(chat, "AT+GSN", NULL,
+ at_util_attr_cb, cbd, g_free) > 0)
+ return;
+
+error:
+ g_free(cbd);
+
+ CALLBACK_WITH_FAILURE(cb, NULL, data);
+}
+
+static gboolean cdma_at_devinfo_register(gpointer user_data)
+{
+ struct ofono_devinfo *info = user_data;
+
+ ofono_devinfo_register(info);
+
+ return FALSE;
+}
+
+static int cdma_at_devinfo_probe(struct ofono_devinfo *info,
+ unsigned int vendor, void *data)
+{
+ GAtChat *chat = data;
+
+ ofono_devinfo_set_data(info, g_at_chat_clone(chat));
+ g_idle_add(cdma_at_devinfo_register, info);
+
+ return 0;
+}
+
+static void cdma_at_devinfo_remove(struct ofono_devinfo *info)
+{
+ GAtChat *chat = ofono_devinfo_get_data(info);
+
+ g_at_chat_unref(chat);
+ ofono_devinfo_set_data(info, NULL);
+}
+
+static struct ofono_devinfo_driver driver = {
+ .name = "cdmamodem",
+ .probe = cdma_at_devinfo_probe,
+ .remove = cdma_at_devinfo_remove,
+ .query_manufacturer = cdma_at_query_manufacturer,
+ .query_model = cdma_at_query_model,
+ .query_revision = cdma_at_query_revision,
+ .query_serial = cdma_at_query_serial
+};
+
+void cdma_at_devinfo_init(void)
+{
+ ofono_devinfo_driver_register(&driver);
+}
+
+void cdma_at_devinfo_exit(void)
+{
+ ofono_devinfo_driver_unregister(&driver);
+}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/3] cdmamodem: Add CDMA devinfo support
2011-01-11 21:45 [PATCH 2/3] cdmamodem: Add CDMA devinfo support Dara Spieker-Doyle
@ 2011-01-13 6:03 ` Denis Kenzior
2011-01-13 18:20 ` Dara Spieker-Doyle
0 siblings, 1 reply; 3+ messages in thread
From: Denis Kenzior @ 2011-01-13 6:03 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1354 bytes --]
Hi Dara,
On 01/11/2011 03:45 PM, Dara Spieker-Doyle wrote:
> ---
> Makefile.am | 3 +-
> drivers/cdmamodem/cdmamodem.c | 2 +
> drivers/cdmamodem/cdmamodem.h | 2 +
> drivers/cdmamodem/devinfo.c | 169 +++++++++++++++++++++++++++++++++++++++++
> 4 files changed, 175 insertions(+), 1 deletions(-)
> create mode 100644 drivers/cdmamodem/devinfo.c
>
Can you please rebase and resubmit this patch? Further comments below:
> diff --git a/drivers/cdmamodem/cdmamodem.h b/drivers/cdmamodem/cdmamodem.h
> index a5991cf..ef4fad3 100644
> --- a/drivers/cdmamodem/cdmamodem.h
> +++ b/drivers/cdmamodem/cdmamodem.h
> @@ -23,3 +23,5 @@
>
> extern void cdma_at_voicecall_init();
> extern void cdma_at_voicecall_exit();
> +extern void cdma_at_devinfo_init();
> +extern void cdma_at_devinfo_exit();
Please name this cdma_devinfo_init/exit
<snip>
> +static struct ofono_devinfo_driver driver = {
> + .name = "cdmamodem",
> + .probe = cdma_at_devinfo_probe,
> + .remove = cdma_at_devinfo_remove,
> + .query_manufacturer = cdma_at_query_manufacturer,
> + .query_model = cdma_at_query_model,
> + .query_revision = cdma_at_query_revision,
> + .query_serial = cdma_at_query_serial
Please drop the 'at' from these. Use cdma_devinfo_probe, etc.
> +};
> +
Regards,
-Denis
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/3] cdmamodem: Add CDMA devinfo support
2011-01-13 6:03 ` Denis Kenzior
@ 2011-01-13 18:20 ` Dara Spieker-Doyle
0 siblings, 0 replies; 3+ messages in thread
From: Dara Spieker-Doyle @ 2011-01-13 18:20 UTC (permalink / raw)
To: ofono
[-- Attachment #1: Type: text/plain, Size: 1540 bytes --]
Hi Denis
On 01/12/2011 10:03 PM, ext Denis Kenzior wrote:
> Hi Dara,
>
> On 01/11/2011 03:45 PM, Dara Spieker-Doyle wrote:
>> ---
>> Makefile.am | 3 +-
>> drivers/cdmamodem/cdmamodem.c | 2 +
>> drivers/cdmamodem/cdmamodem.h | 2 +
>> drivers/cdmamodem/devinfo.c | 169 +++++++++++++++++++++++++++++++++++++++++
>> 4 files changed, 175 insertions(+), 1 deletions(-)
>> create mode 100644 drivers/cdmamodem/devinfo.c
>>
>
> Can you please rebase and resubmit this patch? Further comments below:
>
>> diff --git a/drivers/cdmamodem/cdmamodem.h b/drivers/cdmamodem/cdmamodem.h
>> index a5991cf..ef4fad3 100644
>> --- a/drivers/cdmamodem/cdmamodem.h
>> +++ b/drivers/cdmamodem/cdmamodem.h
>> @@ -23,3 +23,5 @@
>>
>> extern void cdma_at_voicecall_init();
>> extern void cdma_at_voicecall_exit();
>> +extern void cdma_at_devinfo_init();
>> +extern void cdma_at_devinfo_exit();
>
> Please name this cdma_devinfo_init/exit
>
>
> <snip>
>
>> +static struct ofono_devinfo_driver driver = {
>> + .name = "cdmamodem",
>> + .probe = cdma_at_devinfo_probe,
>> + .remove = cdma_at_devinfo_remove,
>> + .query_manufacturer = cdma_at_query_manufacturer,
>> + .query_model = cdma_at_query_model,
>> + .query_revision = cdma_at_query_revision,
>> + .query_serial = cdma_at_query_serial
>
> Please drop the 'at' from these. Use cdma_devinfo_probe, etc.
>
>> +};
>> +
>
> Regards,
> -Denis
Yes, I will fix up and resubmit today.
Thank you
Dara
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-01-13 18:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-11 21:45 [PATCH 2/3] cdmamodem: Add CDMA devinfo support Dara Spieker-Doyle
2011-01-13 6:03 ` Denis Kenzior
2011-01-13 18:20 ` Dara Spieker-Doyle
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.