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

port: remove 'carrier-detect' property

Browse Source 
It is no longer used since commit 736aa0d2d.
This commit is contained in:
Aleksander Morgado
2013-11-15 17:25:33 +01:00
parent 3d4c143b40
commit 85d5d96824
7 changed files with 4 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samsung/mm-broadband-modem-samsung.c
-1
View File
@@ -53,7 +53,6 @@ setup_ports (MMBroadbandModem *self)
continue;
g_object_set (ports[i],
MM_PORT_CARRIER_DETECT, FALSE,
MM_SERIAL_PORT_SEND_DELAY, (guint64) 0,
NULL);
}
plugins/sierra/mm-common-sierra.c
-4
View File
@@ -281,10 +281,6 @@ mm_common_sierra_setup_ports (MMBroadbandModem *self)
if (!ports[i])
continue;
g_object_set (ports[i],
MM_PORT_CARRIER_DETECT, FALSE,
NULL);
if (i == 1) {
/* Built-in echo removal conflicts with the APP1 port's limited AT
* parser, which doesn't always prefix responses with <CR><LF>.
plugins/zte/mm-broadband-modem-zte-icera.c
-16
View File
@@ -139,25 +139,9 @@ modem_3gpp_cleanup_unsolicited_events (MMIfaceModem3gpp *self,
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
guint i;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_zte_icera_parent_class)->setup_ports (self);
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
/* Configure AT ports */
for (i = 0; i < 2; i++) {
if (!ports[i])
continue;
g_object_set (ports[i],
MM_PORT_CARRIER_DETECT, FALSE,
NULL);
}
/* Now reset the unsolicited messages we'll handle when enabled */
mm_common_zte_set_unsolicited_events_handlers (MM_BROADBAND_MODEM (self),
MM_BROADBAND_MODEM_ZTE_ICERA (self)->priv->unsolicited_setup,
plugins/zte/mm-broadband-modem-zte.c
-16
View File
@@ -704,25 +704,9 @@ modem_3gpp_cleanup_unsolicited_events (MMIfaceModem3gpp *self,
static void
setup_ports (MMBroadbandModem *self)
{
MMAtSerialPort *ports[2];
guint i;
/* Call parent's setup ports first always */
MM_BROADBAND_MODEM_CLASS (mm_broadband_modem_zte_parent_class)->setup_ports (self);
ports[0] = mm_base_modem_peek_port_primary (MM_BASE_MODEM (self));
ports[1] = mm_base_modem_peek_port_secondary (MM_BASE_MODEM (self));
/* Configure AT ports */
for (i = 0; i < 2; i++) {
if (!ports[i])
continue;
g_object_set (ports[i],
MM_PORT_CARRIER_DETECT, FALSE,
NULL);
}
/* Now reset the unsolicited messages we'll handle when enabled */
mm_common_zte_set_unsolicited_events_handlers (MM_BROADBAND_MODEM (self),
MM_BROADBAND_MODEM_ZTE (self)->priv->unsolicited_setup,
src/mm-port-probe.c
-1
View File
@@ -1146,7 +1146,6 @@ serial_open_at (MMPortProbe *self)
MM_SERIAL_PORT_SEND_DELAY, task->at_send_delay,
MM_AT_SERIAL_PORT_REMOVE_ECHO, task->at_remove_echo,
MM_AT_SERIAL_PORT_SEND_LF, task->at_send_lf,
MM_PORT_CARRIER_DETECT, FALSE,
MM_SERIAL_PORT_SPEW_CONTROL, TRUE,
NULL);
src/mm-port.c
-25
View File
@@ -28,7 +28,6 @@ enum {
PROP_DEVICE,
PROP_SUBSYS,
PROP_TYPE,
PROP_CARRIER_DETECT,
PROP_CONNECTED,
LAST_PROP
@@ -40,7 +39,6 @@ typedef struct {
char *device;
MMPortSubsys subsys;
MMPortType ptype;
gboolean carrier_detect;
gboolean connected;
} MMPortPrivate;
@@ -113,15 +111,6 @@ mm_port_get_port_type (MMPort *self)
return MM_PORT_GET_PRIVATE (self)->ptype;
}
gboolean
mm_port_get_carrier_detect (MMPort *self)
{
g_return_val_if_fail (self != NULL, MM_PORT_TYPE_UNKNOWN);
g_return_val_if_fail (MM_IS_PORT (self), MM_PORT_TYPE_UNKNOWN);
return MM_PORT_GET_PRIVATE (self)->carrier_detect;
}
gboolean
mm_port_get_connected (MMPort *self)
{
@@ -176,9 +165,6 @@ set_property (GObject *object, guint prop_id,
/* Construct only */
priv->ptype = g_value_get_uint (value);
break;
case PROP_CARRIER_DETECT:
priv->carrier_detect = g_value_get_boolean (value);
break;
case PROP_CONNECTED:
priv->connected = g_value_get_boolean (value);
break;
@@ -204,9 +190,6 @@ get_property (GObject *object, guint prop_id,
case PROP_TYPE:
g_value_set_uint (value, priv->ptype);
break;
case PROP_CARRIER_DETECT:
g_value_set_boolean (value, priv->carrier_detect);
break;
case PROP_CONNECTED:
g_value_set_boolean (value, priv->connected);
break;
@@ -267,14 +250,6 @@ mm_port_class_init (MMPortClass *klass)
MM_PORT_TYPE_UNKNOWN,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_CARRIER_DETECT,
g_param_spec_boolean (MM_PORT_CARRIER_DETECT,
"Carrier Detect",
"Has Carrier Detect",
TRUE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
g_object_class_install_property
(object_class, PROP_CONNECTED,
g_param_spec_boolean (MM_PORT_CONNECTED,
src/mm-port.h
+4 -7
View File
@@ -48,11 +48,10 @@ typedef enum { /*< underscore_name=mm_port_type >*/
#define MM_IS_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PORT))
#define MM_PORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PORT, MMPortClass))
#define MM_PORT_DEVICE "device"
#define MM_PORT_SUBSYS "subsys"
#define MM_PORT_TYPE "type"
#define MM_PORT_CARRIER_DETECT "carrier-detect"
#define MM_PORT_CONNECTED "connected"
#define MM_PORT_DEVICE "device"
#define MM_PORT_SUBSYS "subsys"
#define MM_PORT_TYPE "type"
#define MM_PORT_CONNECTED "connected"
typedef struct _MMPort MMPort;
typedef struct _MMPortClass MMPortClass;
@@ -73,8 +72,6 @@ MMPortSubsys mm_port_get_subsys (MMPort *self);
MMPortType mm_port_get_port_type (MMPort *self);
gboolean mm_port_get_carrier_detect (MMPort *self);
gboolean mm_port_get_connected (MMPort *self);
void mm_port_set_connected (MMPort *self, gboolean connected);