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

serial-port: forcing to close a port is an internal operation

Browse Source 
Ports being forced to get closed will only happen when we get a HUP error
in the serial port (e.g. device got disconnected).
This commit is contained in:
Aleksander Morgado
2012-03-07 17:17:59 +01:00
parent 4f59a696fc
commit 48285dcfdf
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mm-serial-port.c
View File

@@ -35,6 +35,7 @@
#include "mm-log.h" #include "mm-log.h"
static gboolean mm_serial_port_queue_process (gpointer data); 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) 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); g_clear_object (&priv->cancellable);
} }
void static void
mm_serial_port_close_force (MMSerialPort *self) mm_serial_port_close_force (MMSerialPort *self)
{ {
MMSerialPortPrivate *priv; MMSerialPortPrivate *priv;
@@ -1527,7 +1528,6 @@ dispose (GObject *object)
priv->timeout_id = 0; 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)); mm_serial_port_flash_cancel (MM_SERIAL_PORT (object));

2
src/mm-serial-port.h
View File

@@ -117,8 +117,6 @@ gboolean mm_serial_port_open (MMSerialPort *self,
void mm_serial_port_close (MMSerialPort *self); void mm_serial_port_close (MMSerialPort *self);
void mm_serial_port_close_force (MMSerialPort *self);
gboolean mm_serial_port_flash (MMSerialPort *self, gboolean mm_serial_port_flash (MMSerialPort *self,
guint32 flash_time, guint32 flash_time,
gboolean ignore_errors, gboolean ignore_errors,