diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-port-probe.c | 1 | ||||
| -rw-r--r-- | src/mm-port.c | 25 | ||||
| -rw-r--r-- | src/mm-port.h | 11 |
3 files changed, 4 insertions, 33 deletions
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c index 8fb5706a..2ea9e060 100644 --- a/src/mm-port-probe.c +++ b/src/mm-port-probe.c @@ -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); diff --git a/src/mm-port.c b/src/mm-port.c index 0d7ce75d..6db4cc37 100644 --- a/src/mm-port.c +++ b/src/mm-port.c @@ -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; @@ -114,15 +112,6 @@ mm_port_get_port_type (MMPort *self) } 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) { g_return_val_if_fail (self != NULL, FALSE); @@ -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; @@ -268,14 +251,6 @@ mm_port_class_init (MMPortClass *klass) 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, "Connected", diff --git a/src/mm-port.h b/src/mm-port.h index e5395b47..6fc38a94 100644 --- a/src/mm-port.h +++ b/src/mm-port.h @@ -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); |