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

base-modem: use new `MMGpsSerialPort' type for the raw GPS port

Browse Source
This commit is contained in:
Aleksander Morgado
2012-03-27 11:24:06 +02:00
parent a0b3663274
commit 1cfab89719
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/mm-base-modem.c
View File

@@ -29,8 +29,6 @@
#include "mm-log.h" #include "mm-log.h"
#include "mm-serial-enums-types.h" #include "mm-serial-enums-types.h"
#include "mm-at-serial-port.h"
#include "mm-qcdm-serial-port.h"
#include "mm-serial-parsers.h" #include "mm-serial-parsers.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
@@ -83,7 +81,7 @@ struct _MMBaseModemPrivate {
/* GPS-enabled modems will have an AT port for control, and a raw serial /* GPS-enabled modems will have an AT port for control, and a raw serial
* port to receive all GPS traces */ * port to receive all GPS traces */
MMAtSerialPort *gps_control; MMAtSerialPort *gps_control;
MMSerialPort *gps; MMGpsSerialPort *gps;
}; };
static gchar * static gchar *
@@ -204,7 +202,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
mm_at_serial_port_set_flags (MM_AT_SERIAL_PORT (port), at_pflags); mm_at_serial_port_set_flags (MM_AT_SERIAL_PORT (port), at_pflags);
} else if (ptype == MM_PORT_TYPE_GPS) { } else if (ptype == MM_PORT_TYPE_GPS) {
/* Raw GPS port */ /* Raw GPS port */
port = MM_PORT (mm_serial_port_new (name, MM_PORT_TYPE_GPS)); port = MM_PORT (mm_gps_serial_port_new (name));
} else { } else {
g_set_error (error, g_set_error (error,
MM_CORE_ERROR, MM_CORE_ERROR,
@@ -471,7 +469,7 @@ mm_base_modem_peek_port_gps_control (MMBaseModem *self)
return self->priv->gps_control; return self->priv->gps_control;
} }
MMSerialPort * MMGpsSerialPort *
mm_base_modem_get_port_gps (MMBaseModem *self) mm_base_modem_get_port_gps (MMBaseModem *self)
{ {
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL); g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
@@ -479,7 +477,7 @@ mm_base_modem_get_port_gps (MMBaseModem *self)
return (self->priv->gps ? g_object_ref (self->priv->gps) : NULL); return (self->priv->gps ? g_object_ref (self->priv->gps) : NULL);
} }
MMSerialPort * MMGpsSerialPort *
mm_base_modem_peek_port_gps (MMBaseModem *self) mm_base_modem_peek_port_gps (MMBaseModem *self)
{ {
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL); g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
@@ -611,7 +609,7 @@ mm_base_modem_organize_ports (MMBaseModem *self,
MMAtSerialPort *backup_secondary = NULL; MMAtSerialPort *backup_secondary = NULL;
MMQcdmSerialPort *qcdm = NULL; MMQcdmSerialPort *qcdm = NULL;
MMAtSerialPort *gps_control = NULL; MMAtSerialPort *gps_control = NULL;
MMSerialPort *gps = NULL; MMGpsSerialPort *gps = NULL;
MMPort *data = NULL; MMPort *data = NULL;
g_return_val_if_fail (MM_IS_BASE_MODEM (self), FALSE); g_return_val_if_fail (MM_IS_BASE_MODEM (self), FALSE);
@@ -676,8 +674,9 @@ mm_base_modem_organize_ports (MMBaseModem *self,
break; break;
case MM_PORT_TYPE_GPS: case MM_PORT_TYPE_GPS:
g_assert (MM_IS_GPS_SERIAL_PORT (candidate));
if (!gps) if (!gps)
gps = MM_SERIAL_PORT (candidate); gps = MM_GPS_SERIAL_PORT (candidate);
break; break;
default: default:

5
src/mm-base-modem.h
View File

@@ -27,6 +27,7 @@
#include "mm-port.h" #include "mm-port.h"
#include "mm-at-serial-port.h" #include "mm-at-serial-port.h"
#include "mm-qcdm-serial-port.h" #include "mm-qcdm-serial-port.h"
#include "mm-gps-serial-port.h"
#define MM_TYPE_BASE_MODEM (mm_base_modem_get_type ()) #define MM_TYPE_BASE_MODEM (mm_base_modem_get_type ())
#define MM_BASE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_MODEM, MMBaseModem)) #define MM_BASE_MODEM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_BASE_MODEM, MMBaseModem))
@@ -114,7 +115,7 @@ MMAtSerialPort *mm_base_modem_peek_port_primary (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_peek_port_secondary (MMBaseModem *self); MMAtSerialPort *mm_base_modem_peek_port_secondary (MMBaseModem *self);
MMQcdmSerialPort *mm_base_modem_peek_port_qcdm (MMBaseModem *self); MMQcdmSerialPort *mm_base_modem_peek_port_qcdm (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_peek_port_gps_control (MMBaseModem *self); MMAtSerialPort *mm_base_modem_peek_port_gps_control (MMBaseModem *self);
MMSerialPort *mm_base_modem_peek_port_gps (MMBaseModem *self); MMGpsSerialPort *mm_base_modem_peek_port_gps (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_peek_best_at_port (MMBaseModem *self, GError **error); MMAtSerialPort *mm_base_modem_peek_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_peek_best_data_port (MMBaseModem *self); MMPort *mm_base_modem_peek_best_data_port (MMBaseModem *self);
@@ -122,7 +123,7 @@ MMAtSerialPort *mm_base_modem_get_port_primary (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_port_secondary (MMBaseModem *self); MMAtSerialPort *mm_base_modem_get_port_secondary (MMBaseModem *self);
MMQcdmSerialPort *mm_base_modem_get_port_qcdm (MMBaseModem *self); MMQcdmSerialPort *mm_base_modem_get_port_qcdm (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_port_gps_control (MMBaseModem *self); MMAtSerialPort *mm_base_modem_get_port_gps_control (MMBaseModem *self);
MMSerialPort *mm_base_modem_get_port_gps (MMBaseModem *self); MMGpsSerialPort *mm_base_modem_get_port_gps (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_best_at_port (MMBaseModem *self, GError **error); MMAtSerialPort *mm_base_modem_get_best_at_port (MMBaseModem *self, GError **error);
MMPort *mm_base_modem_get_best_data_port (MMBaseModem *self); MMPort *mm_base_modem_get_best_data_port (MMBaseModem *self);