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

ports: rename 'MMQcdmSerialPort' to 'MMPortSerialQcdm'

Browse Source
This commit is contained in:
Aleksander Morgado
2013-11-20 15:38:34 +01:00
parent e505ea0a58
commit 0d1602bf0f
10 changed files with 123 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/novatel/mm-broadband-modem-novatel.c
View File

@@ -406,7 +406,7 @@ typedef struct {
typedef struct { typedef struct {
MMBaseModem *self; MMBaseModem *self;
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
GSimpleAsyncResult *simple; GSimpleAsyncResult *simple;
MMModemAccessTechnology generic_act; MMModemAccessTechnology generic_act;
guint mask; guint mask;
@@ -451,7 +451,7 @@ snapshot_context_complete_and_free (SnapshotContext *ctx, guint hdr_revision)
} }
static void static void
nw_snapshot_old_cb (MMQcdmSerialPort *port, nw_snapshot_old_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
@@ -479,7 +479,7 @@ nw_snapshot_old_cb (MMQcdmSerialPort *port,
} }
static void static void
nw_snapshot_new_cb (MMQcdmSerialPort *port, nw_snapshot_new_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
@@ -510,7 +510,7 @@ nw_snapshot_new_cb (MMQcdmSerialPort *port,
nwsnap = g_byte_array_sized_new (25); nwsnap = g_byte_array_sized_new (25);
nwsnap->len = qcdm_cmd_nw_subsys_modem_snapshot_cdma_new ((char *) nwsnap->data, 25, QCDM_NW_CHIPSET_6500); nwsnap->len = qcdm_cmd_nw_subsys_modem_snapshot_cdma_new ((char *) nwsnap->data, 25, QCDM_NW_CHIPSET_6500);
g_assert (nwsnap->len); g_assert (nwsnap->len);
mm_qcdm_serial_port_queue_command (port, nwsnap, 3, NULL, nw_snapshot_old_cb, ctx); mm_port_serial_qcdm_queue_command (port, nwsnap, 3, NULL, nw_snapshot_old_cb, ctx);
} }
static gboolean static gboolean
@@ -521,7 +521,7 @@ get_nw_modem_snapshot (MMBaseModem *self,
{ {
SnapshotContext *ctx; SnapshotContext *ctx;
GByteArray *nwsnap; GByteArray *nwsnap;
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
port = mm_base_modem_peek_port_qcdm (self); port = mm_base_modem_peek_port_qcdm (self);
if (!port) if (!port)
@@ -539,7 +539,7 @@ get_nw_modem_snapshot (MMBaseModem *self,
nwsnap = g_byte_array_sized_new (25); nwsnap = g_byte_array_sized_new (25);
nwsnap->len = qcdm_cmd_nw_subsys_modem_snapshot_cdma_new ((char *) nwsnap->data, 25, QCDM_NW_CHIPSET_6800); nwsnap->len = qcdm_cmd_nw_subsys_modem_snapshot_cdma_new ((char *) nwsnap->data, 25, QCDM_NW_CHIPSET_6800);
g_assert (nwsnap->len); g_assert (nwsnap->len);
mm_qcdm_serial_port_queue_command (port, nwsnap, 3, NULL, nw_snapshot_new_cb, ctx); mm_port_serial_qcdm_queue_command (port, nwsnap, 3, NULL, nw_snapshot_new_cb, ctx);
return TRUE; return TRUE;
} }
@@ -966,7 +966,7 @@ parse_modem_eri (DetailedRegistrationStateContext *ctx, QcdmResult *result)
} }
static void static void
reg_eri_6500_cb (MMQcdmSerialPort *port, reg_eri_6500_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
@@ -992,7 +992,7 @@ reg_eri_6500_cb (MMQcdmSerialPort *port,
} }
static void static void
reg_eri_6800_cb (MMQcdmSerialPort *port, reg_eri_6800_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
@@ -1016,7 +1016,7 @@ reg_eri_6800_cb (MMQcdmSerialPort *port,
nweri = g_byte_array_sized_new (25); nweri = g_byte_array_sized_new (25);
nweri->len = qcdm_cmd_nw_subsys_eri_new ((char *) nweri->data, 25, QCDM_NW_CHIPSET_6500); nweri->len = qcdm_cmd_nw_subsys_eri_new ((char *) nweri->data, 25, QCDM_NW_CHIPSET_6500);
g_assert (nweri->len); g_assert (nweri->len);
mm_qcdm_serial_port_queue_command (port, nweri, 3, NULL, reg_eri_6500_cb, ctx); mm_port_serial_qcdm_queue_command (port, nweri, 3, NULL, reg_eri_6500_cb, ctx);
return; return;
} }
} }
@@ -1035,7 +1035,7 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self,
{ {
DetailedRegistrationStateContext *ctx; DetailedRegistrationStateContext *ctx;
GByteArray *nweri; GByteArray *nweri;
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
/* Setup context */ /* Setup context */
ctx = g_new0 (DetailedRegistrationStateContext, 1); ctx = g_new0 (DetailedRegistrationStateContext, 1);
@@ -1053,7 +1053,7 @@ modem_cdma_get_detailed_registration_state (MMIfaceModemCdma *self,
nweri = g_byte_array_sized_new (25); nweri = g_byte_array_sized_new (25);
nweri->len = qcdm_cmd_nw_subsys_eri_new ((char *) nweri->data, 25, QCDM_NW_CHIPSET_6800); nweri->len = qcdm_cmd_nw_subsys_eri_new ((char *) nweri->data, 25, QCDM_NW_CHIPSET_6800);
g_assert (nweri->len); g_assert (nweri->len);
mm_qcdm_serial_port_queue_command (port, nweri, 3, NULL, reg_eri_6800_cb, ctx); mm_port_serial_qcdm_queue_command (port, nweri, 3, NULL, reg_eri_6800_cb, ctx);
} }
/*****************************************************************************/ /*****************************************************************************/

4
src/Makefile.am
View File

@@ -90,8 +90,8 @@ libserial_la_SOURCES = \
mm-port-serial.h \ mm-port-serial.h \
mm-at-serial-port.c \ mm-at-serial-port.c \
mm-at-serial-port.h \ mm-at-serial-port.h \
mm-qcdm-serial-port.c \ mm-port-serial-qcdm.c \
mm-qcdm-serial-port.h \ mm-port-serial-qcdm.h \
mm-port-serial-gps.c \ mm-port-serial-gps.c \
mm-port-serial-gps.h mm-port-serial-gps.h

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

@@ -79,7 +79,7 @@ struct _MMBaseModemPrivate {
GHashTable *ports; GHashTable *ports;
MMAtSerialPort *primary; MMAtSerialPort *primary;
MMAtSerialPort *secondary; MMAtSerialPort *secondary;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
GList *data; GList *data;
/* 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
@@ -203,7 +203,7 @@ mm_base_modem_grab_port (MMBaseModem *self,
if (g_str_equal (subsys, "tty")) { if (g_str_equal (subsys, "tty")) {
if (ptype == MM_PORT_TYPE_QCDM) if (ptype == MM_PORT_TYPE_QCDM)
/* QCDM port */ /* QCDM port */
port = MM_PORT (mm_qcdm_serial_port_new (name)); port = MM_PORT (mm_port_serial_qcdm_new (name));
else if (ptype == MM_PORT_TYPE_AT) { else if (ptype == MM_PORT_TYPE_AT) {
/* AT port */ /* AT port */
port = MM_PORT (mm_at_serial_port_new (name)); port = MM_PORT (mm_at_serial_port_new (name));
@@ -519,7 +519,7 @@ mm_base_modem_peek_port_secondary (MMBaseModem *self)
return self->priv->secondary; return self->priv->secondary;
} }
MMQcdmSerialPort * MMPortSerialQcdm *
mm_base_modem_get_port_qcdm (MMBaseModem *self) mm_base_modem_get_port_qcdm (MMBaseModem *self)
{ {
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL); g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
@@ -527,7 +527,7 @@ mm_base_modem_get_port_qcdm (MMBaseModem *self)
return (self->priv->qcdm ? g_object_ref (self->priv->qcdm) : NULL); return (self->priv->qcdm ? g_object_ref (self->priv->qcdm) : NULL);
} }
MMQcdmSerialPort * MMPortSerialQcdm *
mm_base_modem_peek_port_qcdm (MMBaseModem *self) mm_base_modem_peek_port_qcdm (MMBaseModem *self)
{ {
g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL); g_return_val_if_fail (MM_IS_BASE_MODEM (self), NULL);
@@ -1069,7 +1069,7 @@ mm_base_modem_organize_ports (MMBaseModem *self,
MMAtSerialPort *primary = NULL; MMAtSerialPort *primary = NULL;
MMAtSerialPort *secondary = NULL; MMAtSerialPort *secondary = NULL;
MMAtSerialPort *backup_secondary = NULL; MMAtSerialPort *backup_secondary = NULL;
MMQcdmSerialPort *qcdm = NULL; MMPortSerialQcdm *qcdm = NULL;
MMAtSerialPort *gps_control = NULL; MMAtSerialPort *gps_control = NULL;
MMPortSerialGps *gps = NULL; MMPortSerialGps *gps = NULL;
MMPort *data_primary = NULL; MMPort *data_primary = NULL;
@@ -1138,9 +1138,9 @@ mm_base_modem_organize_ports (MMBaseModem *self,
break; break;
case MM_PORT_TYPE_QCDM: case MM_PORT_TYPE_QCDM:
g_assert (MM_IS_QCDM_SERIAL_PORT (candidate)); g_assert (MM_IS_PORT_SERIAL_QCDM (candidate));
if (!qcdm) if (!qcdm)
qcdm = MM_QCDM_SERIAL_PORT (candidate); qcdm = MM_PORT_SERIAL_QCDM (candidate);
break; break;
case MM_PORT_TYPE_NET: case MM_PORT_TYPE_NET:

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

@@ -31,7 +31,7 @@
#include "mm-auth.h" #include "mm-auth.h"
#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-port-serial-qcdm.h"
#include "mm-port-serial-gps.h" #include "mm-port-serial-gps.h"
#if defined WITH_QMI #if defined WITH_QMI
@@ -126,7 +126,7 @@ gboolean mm_base_modem_organize_ports (MMBaseModem *self,
MMAtSerialPort *mm_base_modem_peek_port_primary (MMBaseModem *self); 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); MMPortSerialQcdm *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);
MMPortSerialGps *mm_base_modem_peek_port_gps (MMBaseModem *self); MMPortSerialGps *mm_base_modem_peek_port_gps (MMBaseModem *self);
#if defined WITH_QMI #if defined WITH_QMI
@@ -143,7 +143,7 @@ GList *mm_base_modem_peek_data_ports (MMBaseModem *self);
MMAtSerialPort *mm_base_modem_get_port_primary (MMBaseModem *self); 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); MMPortSerialQcdm *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);
MMPortSerialGps *mm_base_modem_get_port_gps (MMBaseModem *self); MMPortSerialGps *mm_base_modem_get_port_gps (MMBaseModem *self);
#if defined WITH_QMI #if defined WITH_QMI

80
src/mm-broadband-modem.c
View File

@@ -47,7 +47,7 @@
#include "mm-log.h" #include "mm-log.h"
#include "mm-modem-helpers.h" #include "mm-modem-helpers.h"
#include "mm-error-helpers.h" #include "mm-error-helpers.h"
#include "mm-qcdm-serial-port.h" #include "mm-port-serial-qcdm.h"
#include "libqcdm/src/errors.h" #include "libqcdm/src/errors.h"
#include "libqcdm/src/commands.h" #include "libqcdm/src/commands.h"
@@ -321,7 +321,7 @@ typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMModemCapability caps; MMModemCapability caps;
MMQcdmSerialPort *qcdm_port; MMPortSerialQcdm *qcdm_port;
} LoadCapabilitiesContext; } LoadCapabilitiesContext;
static void static void
@@ -580,7 +580,7 @@ load_current_capabilities_at (LoadCapabilitiesContext *ctx)
} }
static void static void
mode_pref_qcdm_ready (MMQcdmSerialPort *port, mode_pref_qcdm_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
LoadCapabilitiesContext *ctx) LoadCapabilitiesContext *ctx)
@@ -677,11 +677,11 @@ load_current_capabilities_qcdm (LoadCapabilitiesContext *ctx)
cmd->len = qcdm_cmd_nv_get_mode_pref_new ((char *) cmd->data, 300, 0); cmd->len = qcdm_cmd_nv_get_mode_pref_new ((char *) cmd->data, 300, 0);
g_assert (cmd->len); g_assert (cmd->len);
mm_qcdm_serial_port_queue_command (ctx->qcdm_port, mm_port_serial_qcdm_queue_command (ctx->qcdm_port,
cmd, cmd,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn) mode_pref_qcdm_ready, (MMPortSerialQcdmResponseFn) mode_pref_qcdm_ready,
ctx); ctx);
} }
@@ -997,7 +997,7 @@ modem_load_device_identifier (MMIfaceModem *self,
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
} OwnNumbersContext; } OwnNumbersContext;
static void static void
@@ -1025,7 +1025,7 @@ modem_load_own_numbers_finish (MMIfaceModem *self,
} }
static void static void
mdn_qcdm_ready (MMQcdmSerialPort *port, mdn_qcdm_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
OwnNumbersContext *ctx) OwnNumbersContext *ctx)
@@ -1112,11 +1112,11 @@ modem_load_own_numbers_done (MMIfaceModem *self,
mdn->len = qcdm_cmd_nv_get_mdn_new ((char *) mdn->data, 200, 0); mdn->len = qcdm_cmd_nv_get_mdn_new ((char *) mdn->data, 200, 0);
g_assert (mdn->len); g_assert (mdn->len);
mm_qcdm_serial_port_queue_command (ctx->qcdm, mm_port_serial_qcdm_queue_command (ctx->qcdm,
mdn, mdn,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)mdn_qcdm_ready, (MMPortSerialQcdmResponseFn)mdn_qcdm_ready,
ctx); ctx);
return; return;
} }
@@ -1888,7 +1888,7 @@ signal_quality_cind (SignalQualityContext *ctx)
} }
static void static void
signal_quality_qcdm_ready (MMQcdmSerialPort *port, signal_quality_qcdm_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
SignalQualityContext *ctx) SignalQualityContext *ctx)
@@ -1961,11 +1961,11 @@ signal_quality_qcdm (SignalQualityContext *ctx)
pilot_sets->len = qcdm_cmd_pilot_sets_new ((char *) pilot_sets->data, 25); pilot_sets->len = qcdm_cmd_pilot_sets_new ((char *) pilot_sets->data, 25);
g_assert (pilot_sets->len); g_assert (pilot_sets->len);
mm_qcdm_serial_port_queue_command (MM_QCDM_SERIAL_PORT (ctx->port), mm_port_serial_qcdm_queue_command (MM_PORT_SERIAL_QCDM (ctx->port),
pilot_sets, pilot_sets,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)signal_quality_qcdm_ready, (MMPortSerialQcdmResponseFn)signal_quality_qcdm_ready,
ctx); ctx);
} }
@@ -2040,7 +2040,7 @@ modem_load_access_technologies_finish (MMIfaceModem *self,
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
guint32 opmode; guint32 opmode;
guint32 sysmode; guint32 sysmode;
@@ -2135,7 +2135,7 @@ done:
} }
static void static void
access_tech_qcdm_wcdma_ready (MMQcdmSerialPort *port, access_tech_qcdm_wcdma_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
AccessTechContext *ctx) AccessTechContext *ctx)
@@ -2167,7 +2167,7 @@ access_tech_qcdm_wcdma_ready (MMQcdmSerialPort *port,
} }
static void static void
access_tech_qcdm_gsm_ready (MMQcdmSerialPort *port, access_tech_qcdm_gsm_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
AccessTechContext *ctx) AccessTechContext *ctx)
@@ -2208,16 +2208,16 @@ access_tech_qcdm_gsm_ready (MMQcdmSerialPort *port,
cmd->len = qcdm_cmd_wcdma_subsys_state_info_new ((char *) cmd->data, 50); cmd->len = qcdm_cmd_wcdma_subsys_state_info_new ((char *) cmd->data, 50);
g_assert (cmd->len); g_assert (cmd->len);
mm_qcdm_serial_port_queue_command (port, mm_port_serial_qcdm_queue_command (port,
cmd, cmd,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn) access_tech_qcdm_wcdma_ready, (MMPortSerialQcdmResponseFn) access_tech_qcdm_wcdma_ready,
ctx); ctx);
} }
static void static void
access_tech_qcdm_hdr_ready (MMQcdmSerialPort *port, access_tech_qcdm_hdr_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
AccessTechContext *ctx) AccessTechContext *ctx)
@@ -2251,7 +2251,7 @@ access_tech_qcdm_hdr_ready (MMQcdmSerialPort *port,
} }
static void static void
access_tech_qcdm_cdma_ready (MMQcdmSerialPort *port, access_tech_qcdm_cdma_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
AccessTechContext *ctx) AccessTechContext *ctx)
@@ -2291,11 +2291,11 @@ access_tech_qcdm_cdma_ready (MMQcdmSerialPort *port,
cmd->len = qcdm_cmd_hdr_subsys_state_info_new ((char *) cmd->data, 50); cmd->len = qcdm_cmd_hdr_subsys_state_info_new ((char *) cmd->data, 50);
g_assert (cmd->len); g_assert (cmd->len);
mm_qcdm_serial_port_queue_command (port, mm_port_serial_qcdm_queue_command (port,
cmd, cmd,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn) access_tech_qcdm_hdr_ready, (MMPortSerialQcdmResponseFn) access_tech_qcdm_hdr_ready,
ctx); ctx);
} }
@@ -2373,22 +2373,22 @@ modem_load_access_technologies (MMIfaceModem *self,
cmd->len = qcdm_cmd_gsm_subsys_state_info_new ((char *) cmd->data, 50); cmd->len = qcdm_cmd_gsm_subsys_state_info_new ((char *) cmd->data, 50);
g_assert (cmd->len); g_assert (cmd->len);
mm_qcdm_serial_port_queue_command (ctx->port, mm_port_serial_qcdm_queue_command (ctx->port,
cmd, cmd,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn) access_tech_qcdm_gsm_ready, (MMPortSerialQcdmResponseFn) access_tech_qcdm_gsm_ready,
ctx); ctx);
} else if (mm_iface_modem_is_cdma (self)) { } else if (mm_iface_modem_is_cdma (self)) {
cmd = g_byte_array_sized_new (50); cmd = g_byte_array_sized_new (50);
cmd->len = qcdm_cmd_cm_subsys_state_info_new ((char *) cmd->data, 50); cmd->len = qcdm_cmd_cm_subsys_state_info_new ((char *) cmd->data, 50);
g_assert (cmd->len); g_assert (cmd->len);
mm_qcdm_serial_port_queue_command (ctx->port, mm_port_serial_qcdm_queue_command (ctx->port,
cmd, cmd,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn) access_tech_qcdm_cdma_ready, (MMPortSerialQcdmResponseFn) access_tech_qcdm_cdma_ready,
ctx); ctx);
} else } else
g_assert_not_reached (); g_assert_not_reached ();
@@ -6257,7 +6257,7 @@ typedef struct {
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
} HdrStateContext; } HdrStateContext;
static void static void
@@ -6291,7 +6291,7 @@ modem_cdma_get_hdr_state_finish (MMIfaceModemCdma *self,
} }
static void static void
hdr_subsys_state_info_ready (MMQcdmSerialPort *port, hdr_subsys_state_info_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
HdrStateContext *ctx) HdrStateContext *ctx)
@@ -6338,7 +6338,7 @@ modem_cdma_get_hdr_state (MMIfaceModemCdma *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
HdrStateContext *ctx; HdrStateContext *ctx;
GByteArray *hdrstate; GByteArray *hdrstate;
@@ -6367,11 +6367,11 @@ modem_cdma_get_hdr_state (MMIfaceModemCdma *self,
hdrstate->len = qcdm_cmd_hdr_subsys_state_info_new ((gchar *) hdrstate->data, 25); hdrstate->len = qcdm_cmd_hdr_subsys_state_info_new ((gchar *) hdrstate->data, 25);
g_assert (hdrstate->len); g_assert (hdrstate->len);
mm_qcdm_serial_port_queue_command (ctx->qcdm, mm_port_serial_qcdm_queue_command (ctx->qcdm,
hdrstate, hdrstate,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)hdr_subsys_state_info_ready, (MMPortSerialQcdmResponseFn)hdr_subsys_state_info_ready,
ctx); ctx);
} }
@@ -6386,7 +6386,7 @@ typedef struct {
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
} CallManagerStateContext; } CallManagerStateContext;
static void static void
@@ -6418,7 +6418,7 @@ modem_cdma_get_call_manager_state_finish (MMIfaceModemCdma *self,
} }
static void static void
cm_subsys_state_info_ready (MMQcdmSerialPort *port, cm_subsys_state_info_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
CallManagerStateContext *ctx) CallManagerStateContext *ctx)
@@ -6462,7 +6462,7 @@ modem_cdma_get_call_manager_state (MMIfaceModemCdma *self,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
{ {
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
CallManagerStateContext *ctx; CallManagerStateContext *ctx;
GByteArray *cmstate; GByteArray *cmstate;
@@ -6491,11 +6491,11 @@ modem_cdma_get_call_manager_state (MMIfaceModemCdma *self,
cmstate->len = qcdm_cmd_cm_subsys_state_info_new ((gchar *) cmstate->data, 25); cmstate->len = qcdm_cmd_cm_subsys_state_info_new ((gchar *) cmstate->data, 25);
g_assert (cmstate->len); g_assert (cmstate->len);
mm_qcdm_serial_port_queue_command (ctx->qcdm, mm_port_serial_qcdm_queue_command (ctx->qcdm,
cmstate, cmstate,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)cm_subsys_state_info_ready, (MMPortSerialQcdmResponseFn)cm_subsys_state_info_ready,
ctx); ctx);
} }
@@ -6512,7 +6512,7 @@ typedef struct {
typedef struct { typedef struct {
MMBroadbandModem *self; MMBroadbandModem *self;
GSimpleAsyncResult *result; GSimpleAsyncResult *result;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
} Cdma1xServingSystemContext; } Cdma1xServingSystemContext;
static void static void
@@ -6686,7 +6686,7 @@ css_query_ready (MMIfaceModemCdma *self,
} }
static void static void
qcdm_cdma_status_ready (MMQcdmSerialPort *port, qcdm_cdma_status_ready (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
Cdma1xServingSystemContext *ctx) Cdma1xServingSystemContext *ctx)
@@ -6764,11 +6764,11 @@ modem_cdma_get_cdma1x_serving_system (MMIfaceModemCdma *self,
cdma_status = g_byte_array_sized_new (25); cdma_status = g_byte_array_sized_new (25);
cdma_status->len = qcdm_cmd_cdma_status_new ((char *) cdma_status->data, 25); cdma_status->len = qcdm_cmd_cdma_status_new ((char *) cdma_status->data, 25);
g_assert (cdma_status->len); g_assert (cdma_status->len);
mm_qcdm_serial_port_queue_command (ctx->qcdm, mm_port_serial_qcdm_queue_command (ctx->qcdm,
cdma_status, cdma_status,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)qcdm_cdma_status_ready, (MMPortSerialQcdmResponseFn)qcdm_cdma_status_ready,
ctx); ctx);
return; return;
} }
@@ -7582,7 +7582,7 @@ struct _PortsContext {
gboolean primary_open; gboolean primary_open;
MMAtSerialPort *secondary; MMAtSerialPort *secondary;
gboolean secondary_open; gboolean secondary_open;
MMQcdmSerialPort *qcdm; MMPortSerialQcdm *qcdm;
gboolean qcdm_open; gboolean qcdm_open;
}; };

2
src/mm-plugin.c
View File

@@ -31,7 +31,7 @@
#include "mm-plugin.h" #include "mm-plugin.h"
#include "mm-device.h" #include "mm-device.h"
#include "mm-at-serial-port.h" #include "mm-at-serial-port.h"
#include "mm-qcdm-serial-port.h" #include "mm-port-serial-qcdm.h"
#include "mm-serial-parsers.h" #include "mm-serial-parsers.h"
#include "mm-private-boxed-types.h" #include "mm-private-boxed-types.h"
#include "mm-log.h" #include "mm-log.h"

14
src/mm-port-probe.c
View File

@@ -33,7 +33,7 @@
#include "libqcdm/src/commands.h" #include "libqcdm/src/commands.h"
#include "libqcdm/src/utils.h" #include "libqcdm/src/utils.h"
#include "libqcdm/src/errors.h" #include "libqcdm/src/errors.h"
#include "mm-qcdm-serial-port.h" #include "mm-port-serial-qcdm.h"
#include "mm-daemon-enums-types.h" #include "mm-daemon-enums-types.h"
#if defined WITH_QMI #if defined WITH_QMI
@@ -575,7 +575,7 @@ wdm_probe (MMPortProbe *self)
/* QCDM */ /* QCDM */
static void static void
serial_probe_qcdm_parse_response (MMQcdmSerialPort *port, serial_probe_qcdm_parse_response (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
MMPortProbe *self) MMPortProbe *self)
@@ -619,11 +619,11 @@ serial_probe_qcdm_parse_response (MMQcdmSerialPort *port,
cmd2 = g_object_steal_data (G_OBJECT (self), "cmd2"); cmd2 = g_object_steal_data (G_OBJECT (self), "cmd2");
if (cmd2) { if (cmd2) {
/* second try */ /* second try */
mm_qcdm_serial_port_queue_command (MM_QCDM_SERIAL_PORT (task->serial), mm_port_serial_qcdm_queue_command (MM_PORT_SERIAL_QCDM (task->serial),
cmd2, cmd2,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)serial_probe_qcdm_parse_response, (MMPortSerialQcdmResponseFn)serial_probe_qcdm_parse_response,
self); self);
return; return;
} }
@@ -670,7 +670,7 @@ serial_probe_qcdm (MMPortProbe *self)
} }
/* Open the QCDM port */ /* Open the QCDM port */
task->serial = MM_PORT_SERIAL (mm_qcdm_serial_port_new (g_udev_device_get_name (self->priv->port))); task->serial = MM_PORT_SERIAL (mm_port_serial_qcdm_new (g_udev_device_get_name (self->priv->port)));
if (!task->serial) { if (!task->serial) {
port_probe_run_task_complete ( port_probe_run_task_complete (
task, task,
@@ -725,11 +725,11 @@ serial_probe_qcdm (MMPortProbe *self)
g_byte_array_append (verinfo2, verinfo->data, verinfo->len); g_byte_array_append (verinfo2, verinfo->data, verinfo->len);
g_object_set_data_full (G_OBJECT (self), "cmd2", verinfo2, (GDestroyNotify) g_byte_array_unref); g_object_set_data_full (G_OBJECT (self), "cmd2", verinfo2, (GDestroyNotify) g_byte_array_unref);
mm_qcdm_serial_port_queue_command (MM_QCDM_SERIAL_PORT (task->serial), mm_port_serial_qcdm_queue_command (MM_PORT_SERIAL_QCDM (task->serial),
verinfo, verinfo,
3, 3,
NULL, NULL,
(MMQcdmSerialResponseFn)serial_probe_qcdm_parse_response, (MMPortSerialQcdmResponseFn)serial_probe_qcdm_parse_response,
self); self);
return FALSE; return FALSE;

46
src/mm-qcdm-serial-port.c → src/mm-port-serial-qcdm.c
View File

@@ -22,19 +22,19 @@
#include <ModemManager.h> #include <ModemManager.h>
#include <mm-errors-types.h> #include <mm-errors-types.h>
#include "mm-qcdm-serial-port.h" #include "mm-port-serial-qcdm.h"
#include "libqcdm/src/com.h" #include "libqcdm/src/com.h"
#include "libqcdm/src/utils.h" #include "libqcdm/src/utils.h"
#include "libqcdm/src/errors.h" #include "libqcdm/src/errors.h"
#include "mm-log.h" #include "mm-log.h"
G_DEFINE_TYPE (MMQcdmSerialPort, mm_qcdm_serial_port, MM_TYPE_PORT_SERIAL) G_DEFINE_TYPE (MMPortSerialQcdm, mm_port_serial_qcdm, MM_TYPE_PORT_SERIAL)
#define MM_QCDM_SERIAL_PORT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_QCDM_SERIAL_PORT, MMQcdmSerialPortPrivate)) #define MM_PORT_SERIAL_QCDM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), MM_TYPE_PORT_SERIAL_QCDM, MMPortSerialQcdmPrivate))
typedef struct { typedef struct {
gboolean foo; gboolean foo;
} MMQcdmSerialPortPrivate; } MMPortSerialQcdmPrivate;
/*****************************************************************************/ /*****************************************************************************/
@@ -79,7 +79,7 @@ handle_response (MMPortSerial *port,
GCallback callback, GCallback callback,
gpointer callback_data) gpointer callback_data)
{ {
MMQcdmSerialResponseFn response_callback = (MMQcdmSerialResponseFn) callback; MMPortSerialQcdmResponseFn response_callback = (MMPortSerialQcdmResponseFn) callback;
GByteArray *unescaped = NULL; GByteArray *unescaped = NULL;
guint8 *unescaped_buffer; guint8 *unescaped_buffer;
GError *dm_error = NULL; GError *dm_error = NULL;
@@ -130,7 +130,7 @@ handle_response (MMPortSerial *port,
} }
callback: callback:
response_callback (MM_QCDM_SERIAL_PORT (port), response_callback (MM_PORT_SERIAL_QCDM (port),
unescaped, unescaped,
dm_error ? dm_error : error, dm_error ? dm_error : error,
callback_data); callback_data);
@@ -145,15 +145,15 @@ callback:
/*****************************************************************************/ /*****************************************************************************/
void void
mm_qcdm_serial_port_queue_command (MMQcdmSerialPort *self, mm_port_serial_qcdm_queue_command (MMPortSerialQcdm *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
GCancellable *cancellable, GCancellable *cancellable,
MMQcdmSerialResponseFn callback, MMPortSerialQcdmResponseFn callback,
gpointer user_data) gpointer user_data)
{ {
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);
g_return_if_fail (MM_IS_QCDM_SERIAL_PORT (self)); g_return_if_fail (MM_IS_PORT_SERIAL_QCDM (self));
g_return_if_fail (command != NULL); g_return_if_fail (command != NULL);
/* 'command' is expected to be already CRC-ed and escaped */ /* 'command' is expected to be already CRC-ed and escaped */
@@ -167,15 +167,15 @@ mm_qcdm_serial_port_queue_command (MMQcdmSerialPort *self,
} }
void void
mm_qcdm_serial_port_queue_command_cached (MMQcdmSerialPort *self, mm_port_serial_qcdm_queue_command_cached (MMPortSerialQcdm *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
GCancellable *cancellable, GCancellable *cancellable,
MMQcdmSerialResponseFn callback, MMPortSerialQcdmResponseFn callback,
gpointer user_data) gpointer user_data)
{ {
g_return_if_fail (self != NULL); g_return_if_fail (self != NULL);
g_return_if_fail (MM_IS_QCDM_SERIAL_PORT (self)); g_return_if_fail (MM_IS_PORT_SERIAL_QCDM (self));
g_return_if_fail (command != NULL); g_return_if_fail (command != NULL);
/* 'command' is expected to be already CRC-ed and escaped */ /* 'command' is expected to be already CRC-ed and escaped */
@@ -224,10 +224,10 @@ config_fd (MMPortSerial *port, int fd, GError **error)
/*****************************************************************************/ /*****************************************************************************/
MMQcdmSerialPort * MMPortSerialQcdm *
mm_qcdm_serial_port_new (const char *name) mm_port_serial_qcdm_new (const char *name)
{ {
return MM_QCDM_SERIAL_PORT (g_object_new (MM_TYPE_QCDM_SERIAL_PORT, return MM_PORT_SERIAL_QCDM (g_object_new (MM_TYPE_PORT_SERIAL_QCDM,
MM_PORT_DEVICE, name, MM_PORT_DEVICE, name,
MM_PORT_SUBSYS, MM_PORT_SUBSYS_TTY, MM_PORT_SUBSYS, MM_PORT_SUBSYS_TTY,
MM_PORT_TYPE, MM_PORT_TYPE_QCDM, MM_PORT_TYPE, MM_PORT_TYPE_QCDM,
@@ -235,14 +235,14 @@ mm_qcdm_serial_port_new (const char *name)
NULL)); NULL));
} }
MMQcdmSerialPort * MMPortSerialQcdm *
mm_qcdm_serial_port_new_fd (int fd) mm_port_serial_qcdm_new_fd (int fd)
{ {
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
char *name; char *name;
name = g_strdup_printf ("port%d", fd); name = g_strdup_printf ("port%d", fd);
port = MM_QCDM_SERIAL_PORT (g_object_new (MM_TYPE_QCDM_SERIAL_PORT, port = MM_PORT_SERIAL_QCDM (g_object_new (MM_TYPE_PORT_SERIAL_QCDM,
MM_PORT_DEVICE, name, MM_PORT_DEVICE, name,
MM_PORT_SUBSYS, MM_PORT_SUBSYS_TTY, MM_PORT_SUBSYS, MM_PORT_SUBSYS_TTY,
MM_PORT_TYPE, MM_PORT_TYPE_QCDM, MM_PORT_TYPE, MM_PORT_TYPE_QCDM,
@@ -254,23 +254,23 @@ mm_qcdm_serial_port_new_fd (int fd)
} }
static void static void
mm_qcdm_serial_port_init (MMQcdmSerialPort *self) mm_port_serial_qcdm_init (MMPortSerialQcdm *self)
{ {
} }
static void static void
finalize (GObject *object) finalize (GObject *object)
{ {
G_OBJECT_CLASS (mm_qcdm_serial_port_parent_class)->finalize (object); G_OBJECT_CLASS (mm_port_serial_qcdm_parent_class)->finalize (object);
} }
static void static void
mm_qcdm_serial_port_class_init (MMQcdmSerialPortClass *klass) mm_port_serial_qcdm_class_init (MMPortSerialQcdmClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
MMPortSerialClass *port_class = MM_PORT_SERIAL_CLASS (klass); MMPortSerialClass *port_class = MM_PORT_SERIAL_CLASS (klass);
g_type_class_add_private (object_class, sizeof (MMQcdmSerialPortPrivate)); g_type_class_add_private (object_class, sizeof (MMPortSerialQcdmPrivate));
/* Virtual methods */ /* Virtual methods */
object_class->finalize = finalize; object_class->finalize = finalize;

43
src/mm-qcdm-serial-port.h → src/mm-port-serial-qcdm.h
View File

@@ -14,55 +14,54 @@
* Copyright (C) 2009 - 2010 Red Hat, Inc. * Copyright (C) 2009 - 2010 Red Hat, Inc.
*/ */
#ifndef MM_QCDM_SERIAL_PORT_H #ifndef MM_PORT_SERIAL_QCDM_H
#define MM_QCDM_SERIAL_PORT_H #define MM_PORT_SERIAL_QCDM_H
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include "mm-port-serial.h" #include "mm-port-serial.h"
#define MM_TYPE_QCDM_SERIAL_PORT (mm_qcdm_serial_port_get_type ()) #define MM_TYPE_PORT_SERIAL_QCDM (mm_port_serial_qcdm_get_type ())
#define MM_QCDM_SERIAL_PORT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_QCDM_SERIAL_PORT, MMQcdmSerialPort)) #define MM_PORT_SERIAL_QCDM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PORT_SERIAL_QCDM, MMPortSerialQcdm))
#define MM_QCDM_SERIAL_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_QCDM_SERIAL_PORT, MMQcdmSerialPortClass)) #define MM_PORT_SERIAL_QCDM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PORT_SERIAL_QCDM, MMPortSerialQcdmClass))
#define MM_IS_QCDM_SERIAL_PORT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_QCDM_SERIAL_PORT)) #define MM_IS_PORT_SERIAL_QCDM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PORT_SERIAL_QCDM))
#define MM_IS_QCDM_SERIAL_PORT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_QCDM_SERIAL_PORT)) #define MM_IS_PORT_SERIAL_QCDM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PORT_SERIAL_QCDM))
#define MM_QCDM_SERIAL_PORT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_QCDM_SERIAL_PORT, MMQcdmSerialPortClass)) #define MM_PORT_SERIAL_QCDM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PORT_SERIAL_QCDM, MMPortSerialQcdmClass))
typedef struct _MMQcdmSerialPort MMQcdmSerialPort; typedef struct _MMPortSerialQcdm MMPortSerialQcdm;
typedef struct _MMQcdmSerialPortClass MMQcdmSerialPortClass; typedef struct _MMPortSerialQcdmClass MMPortSerialQcdmClass;
typedef void (*MMQcdmSerialResponseFn) (MMQcdmSerialPort *port, typedef void (*MMPortSerialQcdmResponseFn) (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data); gpointer user_data);
struct _MMQcdmSerialPort { struct _MMPortSerialQcdm {
MMPortSerial parent; MMPortSerial parent;
}; };
struct _MMQcdmSerialPortClass { struct _MMPortSerialQcdmClass {
MMPortSerialClass parent; MMPortSerialClass parent;
}; };
GType mm_qcdm_serial_port_get_type (void); GType mm_port_serial_qcdm_get_type (void);
MMQcdmSerialPort *mm_qcdm_serial_port_new (const char *name); MMPortSerialQcdm *mm_port_serial_qcdm_new (const char *name);
MMPortSerialQcdm *mm_port_serial_qcdm_new_fd (int fd);
MMQcdmSerialPort *mm_qcdm_serial_port_new_fd (int fd); void mm_port_serial_qcdm_queue_command (MMPortSerialQcdm *self,
void mm_qcdm_serial_port_queue_command (MMQcdmSerialPort *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
GCancellable *cancellable, GCancellable *cancellable,
MMQcdmSerialResponseFn callback, MMPortSerialQcdmResponseFn callback,
gpointer user_data); gpointer user_data);
void mm_qcdm_serial_port_queue_command_cached (MMQcdmSerialPort *self, void mm_port_serial_qcdm_queue_command_cached (MMPortSerialQcdm *self,
GByteArray *command, GByteArray *command,
guint32 timeout_seconds, guint32 timeout_seconds,
GCancellable *cancellable, GCancellable *cancellable,
MMQcdmSerialResponseFn callback, MMPortSerialQcdmResponseFn callback,
gpointer user_data); gpointer user_data);
#endif /* MM_QCDM_SERIAL_PORT_H */ #endif /* MM_PORT_SERIAL_QCDM_H */

16
src/tests/test-qcdm-serial-port.c
View File

@@ -29,7 +29,7 @@
#include <ModemManager.h> #include <ModemManager.h>
#include <mm-errors-types.h> #include <mm-errors-types.h>
#include "mm-qcdm-serial-port.h" #include "mm-port-serial-qcdm.h"
#include "libqcdm/src/commands.h" #include "libqcdm/src/commands.h"
#include "libqcdm/src/utils.h" #include "libqcdm/src/utils.h"
#include "libqcdm/src/com.h" #include "libqcdm/src/com.h"
@@ -170,13 +170,13 @@ server_wait_request (int fd, char *buf, gsize len)
return decap_len; return decap_len;
} }
typedef void (*VerInfoCb) (MMQcdmSerialPort *port, typedef void (*VerInfoCb) (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data); gpointer user_data);
static void static void
qcdm_verinfo_expect_success_cb (MMQcdmSerialPort *port, qcdm_verinfo_expect_success_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)
@@ -189,7 +189,7 @@ qcdm_verinfo_expect_success_cb (MMQcdmSerialPort *port,
} }
static void static void
qcdm_request_verinfo (MMQcdmSerialPort *port, VerInfoCb cb, GMainLoop *loop) qcdm_request_verinfo (MMPortSerialQcdm *port, VerInfoCb cb, GMainLoop *loop)
{ {
GByteArray *verinfo; GByteArray *verinfo;
gint len; gint len;
@@ -201,13 +201,13 @@ qcdm_request_verinfo (MMQcdmSerialPort *port, VerInfoCb cb, GMainLoop *loop)
g_byte_array_free (verinfo, TRUE); g_byte_array_free (verinfo, TRUE);
verinfo->len = len; verinfo->len = len;
mm_qcdm_serial_port_queue_command (port, verinfo, 3, NULL, cb, loop); mm_port_serial_qcdm_queue_command (port, verinfo, 3, NULL, cb, loop);
} }
static void static void
qcdm_test_child (int fd, VerInfoCb cb) qcdm_test_child (int fd, VerInfoCb cb)
{ {
MMQcdmSerialPort *port; MMPortSerialQcdm *port;
GMainLoop *loop; GMainLoop *loop;
gboolean success; gboolean success;
GError *error = NULL; GError *error = NULL;
@@ -217,7 +217,7 @@ qcdm_test_child (int fd, VerInfoCb cb)
loop = g_main_loop_new (NULL, FALSE); loop = g_main_loop_new (NULL, FALSE);
port = mm_qcdm_serial_port_new_fd (fd); port = mm_port_serial_qcdm_new_fd (fd);
g_assert (port); g_assert (port);
success = mm_port_serial_open (MM_PORT_SERIAL (port), &error); success = mm_port_serial_open (MM_PORT_SERIAL (port), &error);
@@ -270,7 +270,7 @@ test_verinfo (void *f)
} }
static void static void
qcdm_verinfo_expect_fail_cb (MMQcdmSerialPort *port, qcdm_verinfo_expect_fail_cb (MMPortSerialQcdm *port,
GByteArray *response, GByteArray *response,
GError *error, GError *error,
gpointer user_data) gpointer user_data)