sierra: implement custom ports setup

This commit is contained in:
Aleksander Morgado
2012-08-22 16:11:19 +02:00
parent 96a6e8923a
commit 79b4c4b47d
4 changed files with 64 additions and 0 deletions

View File

@@ -35,6 +35,18 @@ static void iface_modem_init (MMIfaceModem *iface);
G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSierraIcera, mm_broadband_modem_sierra_icera, MM_TYPE_BROADBAND_MODEM_ICERA, 0, G_DEFINE_TYPE_EXTENDED (MMBroadbandModemSierraIcera, mm_broadband_modem_sierra_icera, MM_TYPE_BROADBAND_MODEM_ICERA, 0,
G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init)) G_IMPLEMENT_INTERFACE (MM_TYPE_IFACE_MODEM, iface_modem_init))
/*****************************************************************************/
/* Setup ports (Broadband modem class) */
static void
setup_ports (MMBroadbandModem *self)
{
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_sierra_icera_parent_class)->setup_ports (self);
mm_common_sierra_setup_ports (self);
}
/*****************************************************************************/ /*****************************************************************************/
MMBroadbandModemSierraIcera * MMBroadbandModemSierraIcera *
@@ -70,4 +82,7 @@ iface_modem_init (MMIfaceModem *iface)
static void static void
mm_broadband_modem_sierra_icera_class_init (MMBroadbandModemSierraIceraClass *klass) mm_broadband_modem_sierra_icera_class_init (MMBroadbandModemSierraIceraClass *klass)
{ {
MMBroadbandModemClass *broadband_modem_class = MM_BROADBAND_MODEM_CLASS (klass);
broadband_modem_class->setup_ports = setup_ports;
} }

View File

@@ -383,6 +383,18 @@ set_allowed_modes (MMIfaceModem *self,
g_free (command); g_free (command);
} }
/*****************************************************************************/
/* Setup ports (Broadband modem class) */
static void
setup_ports (MMBroadbandModem *self)
{
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_sierra_parent_class)->setup_ports (self);
mm_common_sierra_setup_ports (self);
}
/*****************************************************************************/ /*****************************************************************************/
MMBroadbandModemSierra * MMBroadbandModemSierra *
@@ -424,4 +436,7 @@ iface_modem_init (MMIfaceModem *iface)
static void static void
mm_broadband_modem_sierra_class_init (MMBroadbandModemSierraClass *klass) mm_broadband_modem_sierra_class_init (MMBroadbandModemSierraClass *klass)
{ {
MMBroadbandModemClass *broadband_modem_class = MM_BROADBAND_MODEM_CLASS (klass);
broadband_modem_class->setup_ports = setup_ports;
} }

View File

@@ -159,3 +159,35 @@ mm_common_sierra_create_sim (MMIfaceModem *self,
callback, callback,
user_data); user_data);
} }
/*****************************************************************************/
/* Setup ports */
void
mm_common_sierra_setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
guint i;
GRegex *pacsp0_regex;
pacsp0_regex = g_regex_new ("\\r\\n\\+PACSP0\\r\\n", G_REGEX_RAW | G_REGEX_OPTIMIZE, 0, NULL);
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
for (i = 0; i < 2; i++) {
if (!ports[i])
continue;
g_object_set (ports[i],
MM_PORT_CARRIER_DETECT, FALSE,
NULL);
mm_at_serial_port_add_unsolicited_msg_handler (
ports[i],
pacsp0_regex,
NULL, NULL, NULL);
}
g_regex_unref (pacsp0_regex);
}

View File

@@ -35,4 +35,6 @@ MMSim *mm_common_sierra_create_sim_finish (MMIfaceModem *self,
GAsyncResult *res, GAsyncResult *res,
GError **error); GError **error);
void mm_common_sierra_setup_ports (MMBroadbandModem *self);
#endif /* MM_COMMON_SIERRA_H */ #endif /* MM_COMMON_SIERRA_H */