SymbX/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: split generic modem enable/disable operations

Browse Source
This commit is contained in:
Dan Williams
2009-09-23 16:04:25 -07:00
parent f2a3825f9d
commit 3b19a85727
10 changed files with 190 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/mm-modem-hso.c
+31 -23
View File
@@ -234,7 +234,7 @@ mm_hso_modem_authenticate (MMModemHso *self,
/*****************************************************************************/
static void
pin_check_done (MMModem *modem, GError *error, gpointer user_data)
generic_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
@@ -251,49 +251,56 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
} else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "enable")) == FALSE) {
/* Disable, we're done */
mm_callback_info_schedule (info);
} else {
/* HSO needs manual PIN checking */
mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), pin_check_done, info);
mm_generic_gsm_check_pin (MM_GENERIC_GSM (modem), generic_done, info);
}
}
static void
modem_enable_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
enable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMModem *parent_modem_iface;
MMCallbackInfo *info;
info = mm_callback_info_new (modem, callback, user_data);
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (info->modem));
parent_modem_iface->enable (info->modem, parent_enable_done, info);
}
static void
disable_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
MMModem *parent_modem_iface;
/* Do the normal disable stuff */
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (info->modem));
parent_modem_iface->enable (info->modem,
GPOINTER_TO_INT (mm_callback_info_get_data (info, "enable")),
parent_enable_done, info);
parent_modem_iface->enable (info->modem, generic_done, info);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
disable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMCallbackInfo *info;
MMSerialPort *primary;
info = mm_callback_info_new (modem, callback, user_data);
mm_callback_info_set_data (info, "enable", GINT_TO_POINTER (enable), NULL);
mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
info = mm_callback_info_new (modem, callback, user_data);
/* Kill any existing connection */
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
if (do_enable)
modem_enable_done (primary, NULL, NULL, info);
else
mm_serial_port_queue_command (primary, "AT_OWANCALL=1,0,0", 3, modem_enable_done, info);
mm_serial_port_queue_command (primary, "AT_OWANCALL=1,0,0", 3, disable_done, info);
}
static void
@@ -650,6 +657,7 @@ static void
modem_init (MMModem *modem_class)
{
modem_class->enable = enable;
modem_class->disable = disable;
modem_class->connect = do_connect;
modem_class->get_ip4_config = get_ip4_config;
modem_class->disconnect = disconnect;
plugins/mm-modem-mbm.c
+45 -62
View File
@@ -401,57 +401,12 @@ mbm_emrdy_done (MMSerialPort *port,
do_init (port, user_data);
}
static void
enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = user_data;
MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (info->modem);
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
if (priv->have_emrdy) {
/* Modem is ready, no need to check EMRDY */
do_init (port, info);
} else
mm_serial_port_queue_command (port, "*EMRDY?", 5, mbm_emrdy_done, info);
}
static void
disable_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = user_data;
mm_serial_port_close (port);
mm_callback_info_schedule (info);
}
static void
disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_queue_command (port, "+CMER=0", 5, disable_done, user_data);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
MMModemMbmPrivate *priv = MM_MODEM_MBM_GET_PRIVATE (modem);
MMCallbackInfo *info;
MMSerialPort *primary;
@@ -462,22 +417,49 @@ enable (MMModem *modem,
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
if (do_enable) {
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
} else {
mm_serial_port_queue_command (primary, "+CREG=0", 100, NULL, NULL);
mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
if (mm_port_get_connected (MM_PORT (primary)))
mm_serial_port_flash (primary, 1000, disable_flash_done, info);
else
disable_flash_done (primary, NULL, info);
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
if (priv->have_emrdy) {
/* Modem is ready, no need to check EMRDY */
do_init (primary, info);
} else
mm_serial_port_queue_command (primary, "*EMRDY?", 5, mbm_emrdy_done, info);
}
static void
parent_disable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error)
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
}
static void
disable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMModem *parent_modem_iface;
MMCallbackInfo *info;
MMSerialPort *primary;
info = mm_callback_info_new (modem, callback, user_data);
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
/* Random stuff that mbm apparently wants. Are these really needed? */
mm_serial_port_queue_command (primary, "+CREG=0", 5, NULL, NULL);
mm_serial_port_queue_command (primary, "+CMER=0", 5, NULL, NULL);
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
parent_modem_iface->enable (modem, parent_disable_done, info);
}
static void
@@ -596,7 +578,7 @@ e2nap_done (MMSerialPort *port,
mm_callback_info_schedule (info);
} else {
guint32 cid = mm_generic_gsm_get_cid (MM_GENERIC_GSM (info->modem));
command = g_strdup_printf ("AT*ENAP=1,%d",cid);
command = g_strdup_printf ("AT*ENAP=1,%d", cid);
mm_serial_port_queue_command (port, command, 3, NULL, NULL);
g_free (command);
}
@@ -761,6 +743,7 @@ modem_init (MMModem *modem_class)
{
modem_class->grab_port = grab_port;
modem_class->enable = enable;
modem_class->disable = disable;
modem_class->connect = do_connect;
modem_class->disconnect = disconnect;
}
plugins/mm-modem-novatel-gsm.c
+6 -38
View File
@@ -107,33 +107,8 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
mm_serial_port_queue_command (port, "E0 V1", 3, pre_init_done, user_data);
}
static void
disable_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
mm_serial_port_close (port);
mm_callback_info_schedule ((MMCallbackInfo *) user_data);
}
static void
disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_queue_command (port, "+CFUN=0", 5, disable_done, user_data);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -148,20 +123,13 @@ enable (MMModem *modem,
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
if (!do_enable) {
if (mm_port_get_connected (MM_PORT (primary)))
mm_serial_port_flash (primary, 1000, disable_flash_done, info);
else
disable_flash_done (primary, NULL, info);
} else {
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
}
static void
plugins/mm-modem-option.c
+4 -9
View File
@@ -69,21 +69,18 @@ parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error)
if (error) {
info->error = g_error_copy (error);
else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "option-enable"))) {
mm_callback_info_schedule (info);
} else {
/* Option returns OK on +CFUN=1 right away but needs some time
to finish initialization */
g_timeout_add_seconds (10, option_enabled, info);
return;
}
mm_callback_info_schedule (info);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -91,10 +88,8 @@ enable (MMModem *modem,
MMCallbackInfo *info;
info = mm_callback_info_new (modem, callback, user_data);
mm_callback_info_set_data (info, "option-enable", GINT_TO_POINTER (do_enable), NULL);
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
parent_modem_iface->enable (modem, do_enable, parent_enable_done, info);
parent_modem_iface->enable (modem, parent_enable_done, info);
}
static void
plugins/mm-modem-sierra.c
+5 -57
View File
@@ -67,83 +67,31 @@ sierra_enabled (gpointer data)
}
static void
init_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
parent_enable_done (MMModem *modem, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
} else
} else {
/* Sierra returns OK on +CFUN=1 right away but needs some time
to finish initialization */
g_timeout_add_seconds (10, sierra_enabled, info);
}
static void
enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_queue_command (port, "Z E0 V1 X4 &C1 +CMEE=1", 3, init_done, user_data);
}
static void
disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_close (port);
mm_callback_info_schedule (info);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
MMModem *parent_modem_iface;
MMCallbackInfo *info;
MMSerialPort *primary;
/* First, reset the previously used CID */
mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
info = mm_callback_info_new (modem, callback, user_data);
mm_callback_info_set_data (info, "sierra-enable", GINT_TO_POINTER (do_enable), NULL);
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
if (!do_enable) {
if (mm_port_get_connected (MM_PORT (primary)))
mm_serial_port_flash (primary, 1000, disable_flash_done, info);
else
disable_flash_done (primary, NULL, info);
} else {
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
}
parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem));
parent_modem_iface->enable (modem, parent_enable_done, info);
}
static gboolean
plugins/mm-modem-zte.c
+6 -38
View File
@@ -108,33 +108,8 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
mm_serial_port_queue_command (port, "E0 V1", 3, pre_init_done, user_data);
}
static void
disable_done (MMSerialPort *port,
GString *response,
GError *error,
gpointer user_data)
{
mm_serial_port_close (port);
mm_callback_info_schedule ((MMCallbackInfo *) user_data);
}
static void
disable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
{
MMCallbackInfo *info = (MMCallbackInfo *) user_data;
if (error) {
info->error = g_error_copy (error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_queue_command (port, "+CFUN=0", 5, disable_done, user_data);
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -149,20 +124,13 @@ enable (MMModem *modem,
primary = mm_generic_gsm_get_port (MM_GENERIC_GSM (modem), MM_PORT_TYPE_PRIMARY);
g_assert (primary);
if (!do_enable) {
if (mm_port_get_connected (MM_PORT (primary)))
mm_serial_port_flash (primary, 1000, disable_flash_done, info);
else
disable_flash_done (primary, NULL, info);
} else {
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
if (!mm_serial_port_open (primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (primary, 100, enable_flash_done, info);
}
static gboolean
src/mm-generic-cdma.c
+33 -8
View File
@@ -234,7 +234,6 @@ flash_done (MMSerialPort *port, GError *error, gpointer user_data)
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
{
@@ -243,12 +242,6 @@ enable (MMModem *modem,
info = mm_callback_info_new (modem, callback, user_data);
if (!do_enable) {
mm_serial_port_close (priv->primary);
mm_callback_info_schedule (info);
return;
}
if (!mm_serial_port_open (priv->primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
@@ -258,6 +251,37 @@ enable (MMModem *modem,
mm_serial_port_flash (priv->primary, 100, flash_done, info);
}
static void
disable_flash_done (MMSerialPort *port,
GError *error,
gpointer user_data)
{
MMCallbackInfo *info = user_data;
if (error)
info->error = g_error_copy (error);
else
mm_serial_port_close (port);
mm_callback_info_schedule (info);
}
static void
disable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMGenericCdmaPrivate *priv = MM_GENERIC_CDMA_GET_PRIVATE (modem);
MMCallbackInfo *info;
info = mm_callback_info_new (modem, callback, user_data);
if (mm_port_get_connected (MM_PORT (priv->primary)))
mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
else
disable_flash_done (priv->primary, NULL, info);
}
static void
dial_done (MMSerialPort *port,
GString *response,
@@ -657,7 +681,7 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
switch (state) {
case SIMPLE_STATE_BEGIN:
state = SIMPLE_STATE_ENABLE;
mm_modem_enable (modem, TRUE, simple_state_machine, info);
mm_modem_enable (modem, simple_state_machine, info);
break;
case SIMPLE_STATE_ENABLE:
str = simple_get_string_property (info, "number", &info->error);
@@ -769,6 +793,7 @@ modem_init (MMModem *modem_class)
modem_class->grab_port = grab_port;
modem_class->release_port = release_port;
modem_class->enable = enable;
modem_class->disable = disable;
modem_class->connect = connect;
modem_class->disconnect = disconnect;
modem_class->get_info = get_card_info;
src/mm-generic-gsm.c
+33 -22
View File
@@ -385,6 +385,28 @@ enable_flash_done (MMSerialPort *port, GError *error, gpointer user_data)
g_free (cmd);
}
static void
enable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
MMCallbackInfo *info;
/* First, reset the previously used CID */
mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
info = mm_callback_info_new (modem, callback, user_data);
if (!mm_serial_port_open (priv->primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (priv->primary, 100, enable_flash_done, info);
}
static void
disable_done (MMSerialPort *port,
GString *response,
@@ -418,35 +440,23 @@ disable_flash_done (MMSerialPort *port,
}
static void
enable (MMModem *modem,
gboolean do_enable,
MMModemFn callback,
gpointer user_data)
disable (MMModem *modem,
MMModemFn callback,
gpointer user_data)
{
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
MMCallbackInfo *info;
/* First, reset the previously used CID */
/* First, reset the previously used CID and clean up registration */
mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0);
mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
info = mm_callback_info_new (modem, callback, user_data);
if (!do_enable) {
mm_generic_gsm_pending_registration_stop (MM_GENERIC_GSM (modem));
if (mm_port_get_connected (MM_PORT (priv->primary)))
mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
else
disable_flash_done (priv->primary, NULL, info);
} else {
if (!mm_serial_port_open (priv->primary, &info->error)) {
g_assert (info->error);
mm_callback_info_schedule (info);
return;
}
mm_serial_port_flash (priv->primary, 100, enable_flash_done, info);
}
if (mm_port_get_connected (MM_PORT (priv->primary)))
mm_serial_port_flash (priv->primary, 1000, disable_flash_done, info);
else
disable_flash_done (priv->primary, NULL, info);
}
static void
@@ -1542,7 +1552,7 @@ simple_state_machine (MMModem *modem, GError *error, gpointer user_data)
switch (state) {
case SIMPLE_STATE_BEGIN:
state = SIMPLE_STATE_ENABLE;
mm_modem_enable (modem, TRUE, simple_state_machine, info);
mm_modem_enable (modem, simple_state_machine, info);
break;
case SIMPLE_STATE_ENABLE:
state = SIMPLE_STATE_CHECK_PIN;
@@ -1739,6 +1749,7 @@ modem_init (MMModem *modem_class)
modem_class->grab_port = grab_port;
modem_class->release_port = release_port;
modem_class->enable = enable;
modem_class->disable = disable;
modem_class->connect = connect;
modem_class->disconnect = disconnect;
modem_class->get_info = get_card_info;
src/mm-modem.c
+19 -3
View File
@@ -54,7 +54,6 @@ async_call_done (MMModem *modem, GError *error, gpointer user_data)
void
mm_modem_enable (MMModem *self,
gboolean enable,
MMModemFn callback,
gpointer user_data)
{
@@ -62,7 +61,21 @@ mm_modem_enable (MMModem *self,
g_return_if_fail (callback != NULL);
if (MM_MODEM_GET_INTERFACE (self)->enable)
MM_MODEM_GET_INTERFACE (self)->enable (self, enable, callback, user_data);
MM_MODEM_GET_INTERFACE (self)->enable (self, callback, user_data);
else
async_op_not_supported (self, callback, user_data);
}
void
mm_modem_disable (MMModem *self,
MMModemFn callback,
gpointer user_data)
{
g_return_if_fail (MM_IS_MODEM (self));
g_return_if_fail (callback != NULL);
if (MM_MODEM_GET_INTERFACE (self)->disable)
MM_MODEM_GET_INTERFACE (self)->disable (self, callback, user_data);
else
async_op_not_supported (self, callback, user_data);
}
@@ -72,7 +85,10 @@ impl_modem_enable (MMModem *modem,
gboolean enable,
DBusGMethodInvocation *context)
{
mm_modem_enable (modem, enable, async_call_done, context);
if (enable)
mm_modem_enable (modem, async_call_done, context);
else
mm_modem_disable (modem, async_call_done, context);
}
void
src/mm-modem.h
+8 -2
View File
@@ -103,10 +103,13 @@ struct _MMModem {
const char *name);
void (*enable) (MMModem *self,
gboolean enable,
MMModemFn callback,
gpointer user_data);
void (*disable) (MMModem *self,
MMModemFn callback,
gpointer user_data);
void (*connect) (MMModem *self,
const char *number,
MMModemFn callback,
@@ -143,10 +146,13 @@ void mm_modem_release_port (MMModem *self,
const char *name);
void mm_modem_enable (MMModem *self,
gboolean enable,
MMModemFn callback,
gpointer user_data);
void mm_modem_disable (MMModem *self,
MMModemFn callback,
gpointer user_data);
void mm_modem_connect (MMModem *self,
const char *number,
MMModemFn callback,