Re: [PATCH_v2 1/2] modem: Change to online state when serial is set

[Denis Kenzior <denkenz@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 3417 bytes --]

Hi Guillaume,

On 08/11/2011 11:02 AM, Guillaume Zajac wrote:
> For modems with no sim atom, we wait for serial reply to proceed post_sim.
> Add API to get serial devinfo like it is done for imsi.
> ---
>  include/devinfo.h |    2 ++
>  src/modem.c       |   23 ++++++++++++++++++++---
>  2 files changed, 22 insertions(+), 3 deletions(-)
> 
> diff --git a/include/devinfo.h b/include/devinfo.h
> index 5df1316..db1db67 100644
> --- a/include/devinfo.h
> +++ b/include/devinfo.h
> @@ -61,6 +61,8 @@ void ofono_devinfo_remove(struct ofono_devinfo *info);
>  void ofono_devinfo_set_data(struct ofono_devinfo *info, void *data);
>  void *ofono_devinfo_get_data(struct ofono_devinfo *info);
>  
> +const char *ofono_devinfo_get_serial(struct ofono_devinfo *info);
> +
>  #ifdef __cplusplus
>  }
>  #endif
> diff --git a/src/modem.c b/src/modem.c
> index 14c7a20..aa6b1c6 100644
> --- a/src/modem.c
> +++ b/src/modem.c
> @@ -72,6 +72,7 @@ struct ofono_modem {
>  	ofono_bool_t		powered_pending;
>  	ofono_bool_t		get_online;
>  	ofono_bool_t		lockdown;
> +	ofono_bool_t		pending_post_sim;
>  	char			*lock_owner;
>  	guint			lock_watch;
>  	guint			timeout;
> @@ -1093,9 +1094,14 @@ static DBusMessage *modem_set_property(DBusConnection *conn,
>  		if (powered) {
>  			modem_change_state(modem, MODEM_STATE_PRE_SIM);
>  
> -			/* Force SIM Ready for devies with no sim atom */
> +			/*
> +			 * Force SIM Ready for devices with no sim atom
> +			 * Pratically, it concerns CDMA modems. We need to
> +			 * check if their serial is set before proceeding
> +			 * post_sim.
> +			 */

This comment is not true, this behavior is mostly for HFP_HF devices,
not CDMA devices, and these don't even have a devinfo atom.  So you are
breaking these now.

>  			if (modem_has_sim(modem) == FALSE)
> -				sim_state_watch(OFONO_SIM_STATE_READY, modem);
> +				modem->pending_post_sim = TRUE;
>  		} else {
>  			set_online(modem, FALSE);
>  			modem_change_state(modem, MODEM_STATE_POWER_OFF);
> @@ -1175,7 +1181,7 @@ void ofono_modem_set_powered(struct ofono_modem *modem, ofono_bool_t powered)
>  
>  		/* Force SIM Ready for devices with no sim atom */
>  		if (modem_has_sim(modem) == FALSE)
> -			sim_state_watch(OFONO_SIM_STATE_READY, modem);
> +			modem->pending_post_sim = TRUE;
>  	} else {
>  		set_online(modem, FALSE);
>  
> @@ -1315,18 +1321,29 @@ void ofono_modem_remove_interface(struct ofono_modem *modem,
>  	modem->interface_update = g_idle_add(trigger_interface_update, modem);
>  }
>  
> +const char *ofono_devinfo_get_serial(struct ofono_devinfo *info)
> +{
> +	return info->serial;
> +}
> +
>  static void query_serial_cb(const struct ofono_error *error,
>  				const char *serial, void *user)
>  {
>  	struct ofono_devinfo *info = user;
>  	DBusConnection *conn = ofono_dbus_get_connection();
>  	const char *path = __ofono_atom_get_path(info->atom);
> +	struct ofono_modem *modem = __ofono_atom_get_modem(info->atom);
>  
>  	if (error->type != OFONO_ERROR_TYPE_NO_ERROR)
>  		return;
>  
>  	info->serial = g_strdup(serial);
>  
> +	if (modem->pending_post_sim == TRUE) {
> +		modem->pending_post_sim = FALSE;
> +		sim_state_watch(OFONO_SIM_STATE_READY, modem);
> +	}
> +
>  	ofono_dbus_signal_property_changed(conn, path,
>  						OFONO_MODEM_INTERFACE,
>  						"Serial", DBUS_TYPE_STRING,

Regards,
-Denis