diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-07 17:17:59 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-03-16 14:53:23 +0100 |
| commit | 48285dcfdf04becbe90922ac3f2dd942bc43de53 (patch) | |
| tree | c1eca162703b71860363098f0bff3f2d01b10be9 /src | |
| parent | 4f59a696fc5a01551c9fc53ac5893d429613ff7e (diff) | |
serial-port: forcing to close a port is an internal operation
Ports being forced to get closed will only happen when we get a HUP error
in the serial port (e.g. device got disconnected).
Diffstat (limited to 'src')
| -rw-r--r-- | src/mm-serial-port.c | 6 | ||||
| -rw-r--r-- | src/mm-serial-port.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index d561ab99..33660bf2 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -35,6 +35,7 @@ #include "mm-log.h" static gboolean mm_serial_port_queue_process (gpointer data); +static void mm_serial_port_close_force (MMSerialPort *self); G_DEFINE_TYPE (MMSerialPort, mm_serial_port, MM_TYPE_PORT) @@ -1055,7 +1056,7 @@ mm_serial_port_close (MMSerialPort *self) g_clear_object (&priv->cancellable); } -void +static void mm_serial_port_close_force (MMSerialPort *self) { MMSerialPortPrivate *priv; @@ -1527,8 +1528,7 @@ dispose (GObject *object) priv->timeout_id = 0; } - if (mm_serial_port_is_open (MM_SERIAL_PORT (object))) - mm_serial_port_close_force (MM_SERIAL_PORT (object)); + mm_serial_port_close_force (MM_SERIAL_PORT (object)); mm_serial_port_flash_cancel (MM_SERIAL_PORT (object)); diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h index 843cea8e..77db3219 100644 --- a/src/mm-serial-port.h +++ b/src/mm-serial-port.h @@ -117,8 +117,6 @@ gboolean mm_serial_port_open (MMSerialPort *self, void mm_serial_port_close (MMSerialPort *self); -void mm_serial_port_close_force (MMSerialPort *self); - gboolean mm_serial_port_flash (MMSerialPort *self, guint32 flash_time, gboolean ignore_errors, |