Support weird modem in Motorola Droid 4
PATCH v3 1/1 Support weird modem in Motorola Droid 4
This is basic support for modem in Droid 4, accessed over ttyUSB4. That interface is unfortunately quite broken, so we need to force very specific SMS mode.
---
Resent.
Best regards,
Pavel
Makefile.am +3 -0
@@ -603,6 +603,9 @@ builtin_sources += plugins/ublox.c builtin_modules += xmm7xxx builtin_sources += plugins/xmm7xxx.c +builtin_modules += droid +builtin_sources += plugins/droid.c + if BLUETOOTH if BLUEZ4 builtin_modules += sap
drivers/atmodem/sim.c +1 -0
@@ -199,6 +199,7 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid,case OFONO_VENDOR_SPEEDUP :case OFONO_VENDOR_QUALCOMM_MSM :case OFONO_VENDOR_SIMCOM : +case OFONO_VENDOR_DROID :/* Maximum possible length */ len +=sprintf (buf + len,",0,0,255" );break ;
drivers/atmodem/sms.c +22 -5
@@ -349,8 +349,15 @@ static inline void at_ack_delivery(struct ofono_sms *sms)break ; } }else { -/* Should be a safe fallback */ -snprintf (buf,sizeof (buf),"AT+CNMA=0" ); +switch (data->vendor) { +case OFONO_VENDOR_DROID : +snprintf (buf,sizeof (buf),"AT" ); +break ; +default : +/* Should be a safe fallback */ +snprintf (buf,sizeof (buf),"AT+CNMA=0" ); +break ; + } }g_at_chat_send (data->chat, buf, none_prefix, at_cnma_cb,NULL ,NULL );
@@ -845,6 +852,7 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts,case OFONO_VENDOR_ZTE :case OFONO_VENDOR_SIMCOM :case OFONO_VENDOR_QUECTEL : +case OFONO_VENDOR_DROID :/* MSM devices advertise support for mode 2, but return an * error if we attempt to actually use it. */ mode ="1" ;
@@ -858,9 +866,14 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts,if (!append_cnmi_element (buf, &len, cnmi_opts[0 ], mode, FALSE))return FALSE; + mode ="21" ; +if (!data->cnma_enabled) + mode ="1" ; +if (data->vendor ==OFONO_VENDOR_DROID ) + mode ="2" ; +/* Prefer to deliver SMS via +CMT if CNMA is supported */ -if (!append_cnmi_element (buf, &len, cnmi_opts[1 ], - data->cnma_enabled ?"21" :"1" , FALSE)) +if (!append_cnmi_element (buf, &len, cnmi_opts[1 ], mode, FALSE))return FALSE;switch (data->vendor) {
@@ -1243,7 +1256,9 @@ static void at_csms_status_cb(gboolean ok, GAtResult *result, goto out;if (service ==1 || service ==128 ) - data->cnma_enabled = TRUE; +if (data->vendor !=OFONO_VENDOR_DROID ) { + data->cnma_enabled = TRUE; + }if (mt ==1 && mo ==1 ) supported = TRUE;
@@ -1290,6 +1305,8 @@ static void at_csms_query_cb(gboolean ok, GAtResult *result, goto out;switch (data->vendor) { +case OFONO_VENDOR_DROID : +break ;case OFONO_VENDOR_QUECTEL_SERIAL :g_at_result_iter_next_number (&iter, &status_min);g_at_result_iter_next_number (&iter, &status_max);
drivers/atmodem/vendor.h +1 -0
@@ -27,6 +27,7 @@ enum ofono_vendor {OFONO_VENDOR_MBM ,OFONO_VENDOR_GOBI ,OFONO_VENDOR_QUALCOMM_MSM , +OFONO_VENDOR_DROID ,OFONO_VENDOR_OPTION_HSO ,OFONO_VENDOR_ZTE , OFONO_VENDOR_HUAWEI,
drivers/atmodem/voicecall.c +4 -0
@@ -160,6 +160,10 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data) poll_again = TRUE; goto poll_again; } +if (vd->vendor ==OFONO_VENDOR_DROID ) { + poll_again = TRUE; + goto poll_again; + }ofono_error ("We are polling CLCC and received an error" );ofono_error ("All bets are off for call management" );
plugins/droid.c new file +226 -0
226 lines not on this page · raw message
plugins/udevng.c +31 -0
@@ -712,6 +712,34 @@ static gboolean setup_telitqmi(struct modem_info *modem)return TRUE; } +static gboolean setup_droid (struct modem_info *modem) +{ +const char *at =NULL ; +GSList *list; + +DBG ("%s" , modem->syspath); + +for (list = modem->devices; list; list = list->next) { +struct device_info *info = list->data; + +DBG ("%s %s %s %s %s" , info->devnode, info->interface, + info->number, info->label, info->subsystem); + +if (g_strcmp0 (info->interface,"255/255/255" ) ==0 && +g_strcmp0 (info->number,"04" ) ==0 ) { + at = info->devnode; + } + } + +if (at ==NULL ) +return FALSE; + +ofono_modem_set_string (modem->modem,"Device" , at); +ofono_modem_set_driver (modem->modem,"droid" ); + +return TRUE; +} +/* TODO: Not used as we have no simcom driver */ static gboolean setup_simcom (struct modem_info *modem) {
@@ -1401,6 +1429,7 @@ static struct { { "gemalto", setup_gemalto }, { "xmm7xxx", setup_xmm7xxx }, { "mbim", setup_mbim }, + { "droid", setup_droid },/* Following are non-USB modems */ { "ifx", setup_ifx }, { "u8500", setup_isi_serial },
@@ -1786,6 +1815,8 @@ static struct { { "telit", "cdc_acm", "1bc7", "0021" }, { "telitqmi", "qmi_wwan", "1bc7", "1201" }, { "telitqmi", "option", "1bc7", "1201" }, + { "droid", "qmi_wwan", "22b8", "2a70" }, + { "droid", "option", "22b8", "2a70" }, { "nokia", "option", "0421", "060e" }, { "nokia", "option", "0421", "0623" }, { "samsung", "option", "04e8", "6889" },
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi Pavel,
Quoted 4 lines · Pavel Machek
This is basic support for modem in Droid 4, accessed over ttyUSB4. That interface is unfortunately quite broken, so we need to force very specific SMS mode.
Can you separate this into at least a couple of patches per our patch submission guidelines? See HACKING, 'Submitting Patches' section.
1 - atmodem / vendor quirks
2 - plugins/droid.c + build changes
Quoted 42 lines
---
Resent.
Best regards,
PavelMakefile.am +3
-0@@ -603,6 +603,9 @@ builtin_sources += plugins/ublox.c builtin_modules += xmm7xxx builtin_sources += plugins/xmm7xxx.c +builtin_modules += droid +builtin_sources += plugins/droid.c + if BLUETOOTH if BLUEZ4 builtin_modules += sapdrivers/atmodem/sim.c +1
-0@@ -199,6 +199,7 @@ static void at_sim_read_info(struct ofono_sim *sim, int fileid,case OFONO_VENDOR_SPEEDUP :case OFONO_VENDOR_QUALCOMM_MSM :case OFONO_VENDOR_SIMCOM : +case OFONO_VENDOR_DROID :/* Maximum possible length */ len +=sprintf (buf + len,",0,0,255" );break ;drivers/atmodem/sms.c +0
-1@@ -349,8 +349,15 @@ static inline void at_ack_delivery(struct ofono_sms *sms)break ; } }else { -/* Should be a safe fallback */
drivers/atmodem/sms.c static inline void at_ack_delivery(struct ofono_sms *sms) · line 360
Quoted 10 lines
drivers/atmodem/sms.c +9
-1-snprintf (buf,sizeof (buf),"AT+CNMA=0" ); +switch (data->vendor) { +case OFONO_VENDOR_DROID : +snprintf (buf,sizeof (buf),"AT" ); +break ; +default : +/* Should be a safe fallback */ +snprintf (buf,sizeof (buf),"AT+CNMA=0" ); +break ; + }
I'd rather you just not call at_ack_delivery at all in the case of DROID. In fact, I don't think this function gets invoked at all if cnma_enabled is false...
Quoted 12 lines
drivers/atmodem/sms.c +1
-0}g_at_chat_send (data->chat, buf, none_prefix, at_cnma_cb,NULL ,NULL );@@ -845,6 +852,7 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts,case OFONO_VENDOR_ZTE :case OFONO_VENDOR_SIMCOM :case OFONO_VENDOR_QUECTEL : +case OFONO_VENDOR_DROID :/* MSM devices advertise support for mode 2, but return an * error if we attempt to actually use it. */ mode ="1" ;
drivers/atmodem/sms.c static gboolean build_cnmi_string(char *buf, int *cnmi_opts, · line 874
Quoted 9 lines
drivers/atmodem/sms.c +6
-0@@ -858,9 +866,14 @@ static gboolean build_cnmi_string(char *buf, int *cnmi_opts,if (!append_cnmi_element (buf, &len, cnmi_opts[0 ], mode, FALSE))return FALSE; + mode ="21" ; +if (!data->cnma_enabled) + mode ="1" ; +if (data->vendor ==OFONO_VENDOR_DROID ) + mode ="2" ; +
So you want to deliver via +CMT but not do CNMA acks. Ok I guess...
Quoted 8 lines
drivers/atmodem/sms.c +1
-2/* Prefer to deliver SMS via +CMT if CNMA is supported */ -if (!append_cnmi_element (buf, &len, cnmi_opts[1 ], - data->cnma_enabled ?"21" :"1" , FALSE)) +if (!append_cnmi_element (buf, &len, cnmi_opts[1 ], mode, FALSE))return FALSE;switch (data->vendor) {
drivers/atmodem/sms.c static void at_csms_status_cb(gboolean ok, GAtResult *result, · line 1261
Quoted 7 lines
drivers/atmodem/sms.c +3
-1@@ -1243,7 +1256,9 @@ static void at_csms_status_cb(gboolean ok, GAtResult *result, goto out;if (service ==1 || service ==128 ) - data->cnma_enabled = TRUE; +if (data->vendor !=OFONO_VENDOR_DROID ) { + data->cnma_enabled = TRUE; + }
<continued from at_ack_delivery discussion>
...which should be false on DROID...? Also, no need for {}. See doc/coding-style.txt for details.
Quoted 153 lines
drivers/atmodem/sms.c +2
-0if (mt ==1 && mo ==1 ) supported = TRUE;@@ -1290,6 +1305,8 @@ static void at_csms_query_cb(gboolean ok, GAtResult *result, goto out;switch (data->vendor) { +case OFONO_VENDOR_DROID : +break ;case OFONO_VENDOR_QUECTEL_SERIAL :g_at_result_iter_next_number (&iter, &status_min);g_at_result_iter_next_number (&iter, &status_max);drivers/atmodem/vendor.h +1
-0@@ -27,6 +27,7 @@ enum ofono_vendor {OFONO_VENDOR_MBM ,OFONO_VENDOR_GOBI ,OFONO_VENDOR_QUALCOMM_MSM , +OFONO_VENDOR_DROID ,OFONO_VENDOR_OPTION_HSO ,OFONO_VENDOR_ZTE , OFONO_VENDOR_HUAWEI,drivers/atmodem/voicecall.c +4
-0@@ -160,6 +160,10 @@ static void clcc_poll_cb(gboolean ok, GAtResult *result, gpointer user_data) poll_again = TRUE; goto poll_again; } +if (vd->vendor ==OFONO_VENDOR_DROID ) { + poll_again = TRUE; + goto poll_again; + }ofono_error ("We are polling CLCC and received an error" );ofono_error ("All bets are off for call management" );plugins/droid.c new file +108
-0@@ -0,0 +1,226 @@ +/* +* +* oFono - Open Source Telephony +* +* Copyright (C) 2008-2011 Intel Corporation. All rights reserved. +* Copyright (C) 2009 Collabora Ltd. All rights reserved. +* Copyright (C) 2020 Pavel Machek. 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 <stdlib.h> +#include <errno.h> + +#include <glib.h> +#include <gatchat.h> +#include <gattty.h> + +#define OFONO_API_SUBJECT_TO_CHANGE +#include <ofono/plugin.h> +#include <ofono/log.h> +#include <ofono/modem.h> +#include <ofono/call-barring.h> +#include <ofono/call-forwarding.h> +#include <ofono/call-meter.h> +#include <ofono/call-settings.h> +#include <ofono/devinfo.h> +#include <ofono/message-waiting.h> +#include <ofono/netreg.h> +#include <ofono/phonebook.h> +#include <ofono/sim.h> +#include <ofono/sms.h> +#include <ofono/ussd.h> +#include <ofono/voicecall.h> + +#include <drivers/atmodem/vendor.h> + +static void droid_debug (const char *str,void *user_data) +{ +const char *prefix = user_data; + +ofono_info ("%s%s" , prefix, str); +} + +/* Detect hardware, and initialize if found */ +static int droid_probe (struct ofono_modem *modem) +{ +DBG ("" ); + +return 0 ; +} + +static void droid_remove (struct ofono_modem *modem) +{ +GAtChat *chat =ofono_modem_get_data (modem); + +DBG ("" ); + +if (chat) { +g_at_chat_unref (chat); +ofono_modem_set_data (modem,NULL ); + } +} + +static void cfun_set_on_cb (gboolean ok,GAtResult *result,gpointer user_data) +{ +struct ofono_modem *modem = user_data; + +DBG ("" ); + +if (ok) +ofono_modem_set_powered (modem, TRUE); +} + +/* power up hardware */ +static int droid_enable (struct ofono_modem *modem) +{ +GAtSyntax *syntax; +GIOChannel *channel; +GAtChat *chat; +const char *device; + +DBG ("" ); + + device =ofono_modem_get_string (modem,"Device" ); +if (device ==NULL ) +return -EINVAL ; + + channel =g_at_tty_open (device,NULL ); +if (channel ==NULL ) +return -EIO ; +
plugins/droid.c line 118
Quoted 10 lines
plugins/droid.c new file +10
-0+ syntax =g_at_syntax_new_gsm_permissive (); + chat =g_at_chat_new (channel, syntax); +g_io_channel_unref (channel); +g_at_syntax_unref (syntax); + +if (chat ==NULL ) +return -EIO ; + +if (getenv ("OFONO_AT_DEBUG" )) +g_at_chat_set_debug (chat, droid_debug,"" );
Maybe use at_util_open_device()?
plugins/droid.c line 130
Quoted 12 lines
plugins/droid.c new file +12
-0+ +ofono_modem_set_data (modem, chat); + +/* ensure modem is in a known state; verbose on, echo/quiet off */ +g_at_chat_send (chat,"ATE0Q0V1" ,NULL ,NULL ,NULL ,NULL ); + +/* power up modem */ +g_at_chat_send (chat,"AT+CFUN=1" ,NULL , cfun_set_on_cb, modem,NULL ); + +return 0 ; +} +
Rest looks OK.
Regards,
-Denis
Hi!
Quoted 10 lines
Quoted 4 lines
This is basic support for modem in Droid 4, accessed over ttyUSB4. That interface is unfortunately quite broken, so we need to force very specific SMS mode.
Can you separate this into at least a couple of patches per our patch submission guidelines? See HACKING, 'Submitting Patches' section.
1 - atmodem / vendor quirks
2 -plugins/droid.c+ build changes
Ok, will make it into two patches.
Quoted 9 lines
drivers/atmodem/sms.c static inline void at_ack_delivery(struct ofono_sms *sms) · line 360
Quoted 5 lines
drivers/atmodem/sms.c +5
-0+default : +/* Should be a safe fallback */ +snprintf (buf,sizeof (buf),"AT+CNMA=0" ); +break ; + }I'd rather you just not call
at_ack_deliveryat all in the case of DROID. In fact, I don't think this function gets invoked at all ifcnma_enabledis false...
Let me see if I can get that to work.
Quoted 4 lines
plugins/droid.c line 118
Quoted 2 lines
plugins/droid.c new file +2
-0+if (getenv ("OFONO_AT_DEBUG" )) +g_at_chat_set_debug (chat, droid_debug,"" );Maybe use
at_util_open_device()?
Let me take a look.
Thanks a lot for the review!
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Hi!
Quoted 11 lines · Pavel Machek
Quoted 4 lines
This is basic support for modem in Droid 4, accessed over ttyUSB4. That interface is unfortunately quite broken, so we need to force very specific SMS mode.
Can you separate this into at least a couple of patches per our patch submission guidelines? See HACKING, 'Submitting Patches' section.
1 - atmodem / vendor quirks
2 -plugins/droid.c+ build changes
Would it be okay to do them in the other order? droid.c + build changes already gives modem usable for voice calls...
Best regards,
Pavel
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html