From 8750037fafbf27bd4218b6ea37e17dbc85102dcc Mon Sep 17 00:00:00 2001 From: Tambet Ingo Date: Mon, 2 Mar 2009 10:13:54 +0200 Subject: Implement MMModemNovatelCdma class for Novatel CDMA devices. Rename MMModemNovatel to MMModemNovatelGsm. --- plugins/Makefile.am | 6 +- plugins/mm-modem-novatel-cdma.c | 73 +++++++++++++++++ plugins/mm-modem-novatel-cdma.h | 28 +++++++ plugins/mm-modem-novatel-gsm.c | 173 ++++++++++++++++++++++++++++++++++++++++ plugins/mm-modem-novatel-gsm.h | 28 +++++++ plugins/mm-modem-novatel.c | 171 --------------------------------------- plugins/mm-modem-novatel.h | 28 ------- plugins/mm-plugin-novatel.c | 12 ++- 8 files changed, 311 insertions(+), 208 deletions(-) create mode 100644 plugins/mm-modem-novatel-cdma.c create mode 100644 plugins/mm-modem-novatel-cdma.h create mode 100644 plugins/mm-modem-novatel-gsm.c create mode 100644 plugins/mm-modem-novatel-gsm.h delete mode 100644 plugins/mm-modem-novatel.c delete mode 100644 plugins/mm-modem-novatel.h (limited to 'plugins') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 813b37c4..b50ec93b 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -83,8 +83,10 @@ libmm_plugin_sierra_la_LDFLAGS = -module -avoid-version # Novatel libmm_plugin_novatel_la_SOURCES = \ - mm-modem-novatel.c \ - mm-modem-novatel.h \ + mm-modem-novatel-cdma.c \ + mm-modem-novatel-cdma.h \ + mm-modem-novatel-gsm.c \ + mm-modem-novatel-gsm.h \ mm-plugin-novatel.c \ mm-plugin-novatel.h diff --git a/plugins/mm-modem-novatel-cdma.c b/plugins/mm-modem-novatel-cdma.c new file mode 100644 index 00000000..4b6b9b2e --- /dev/null +++ b/plugins/mm-modem-novatel-cdma.c @@ -0,0 +1,73 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#include +#include +#include +#include +#include "mm-modem-novatel-cdma.h" +#include "mm-errors.h" +#include "mm-callback-info.h" + +static gpointer mm_modem_novatel_cdma_parent_class = NULL; + +MMModem * +mm_modem_novatel_cdma_new (const char *data_device, + const char *driver) +{ + g_return_val_if_fail (data_device != NULL, NULL); + g_return_val_if_fail (driver != NULL, NULL); + + return MM_MODEM (g_object_new (MM_TYPE_MODEM_NOVATEL_CDMA, + MM_SERIAL_DEVICE, data_device, + MM_SERIAL_CARRIER_DETECT, FALSE, + MM_MODEM_DRIVER, driver, + MM_MODEM_TYPE, MM_MODEM_TYPE_CDMA, + NULL)); +} + +/*****************************************************************************/ + +static void +modem_init (MMModem *modem_class) +{ +} + +static void +mm_modem_novatel_cdma_init (MMModemNovatelCdma *self) +{ +} + +static void +mm_modem_novatel_cdma_class_init (MMModemNovatelCdmaClass *klass) +{ + mm_modem_novatel_cdma_parent_class = g_type_class_peek_parent (klass); +} + +GType +mm_modem_novatel_cdma_get_type (void) +{ + static GType modem_novatel_cdma_type = 0; + + if (G_UNLIKELY (modem_novatel_cdma_type == 0)) { + static const GTypeInfo modem_novatel_cdma_type_info = { + sizeof (MMModemNovatelCdmaClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) mm_modem_novatel_cdma_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (MMModemNovatelCdma), + 0, /* n_preallocs */ + (GInstanceInitFunc) mm_modem_novatel_cdma_init, + }; + + static const GInterfaceInfo modem_iface_info = { + (GInterfaceInitFunc) modem_init + }; + + modem_novatel_cdma_type = g_type_register_static (MM_TYPE_GENERIC_CDMA, "MMModemNovatelCdma", &modem_novatel_cdma_type_info, 0); + g_type_add_interface_static (modem_novatel_cdma_type, MM_TYPE_MODEM, &modem_iface_info); + } + + return modem_novatel_cdma_type; +} diff --git a/plugins/mm-modem-novatel-cdma.h b/plugins/mm-modem-novatel-cdma.h new file mode 100644 index 00000000..d9b9d33a --- /dev/null +++ b/plugins/mm-modem-novatel-cdma.h @@ -0,0 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#ifndef MM_MODEM_NOVATEL_CDMA_H +#define MM_MODEM_NOVATEL_CDMA_H + +#include "mm-generic-cdma.h" + +#define MM_TYPE_MODEM_NOVATEL_CDMA (mm_modem_novatel_cdma_get_type ()) +#define MM_MODEM_NOVATEL_CDMA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_NOVATEL_CDMA, MMModemNovatelCdma)) +#define MM_MODEM_NOVATEL_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_NOVATEL_CDMA, MMModemNovatelCdmaClass)) +#define MM_IS_MODEM_NOVATEL_CDMA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_NOVATEL_CDMA)) +#define MM_IS_MODEM_NOVATEL_CDMA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_MODEM_NOVATEL_CDMA)) +#define MM_MODEM_NOVATEL_CDMA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_NOVATEL_CDMA, MMModemNovatelCdmaClass)) + +typedef struct { + MMGenericCdma parent; +} MMModemNovatelCdma; + +typedef struct { + MMGenericCdmaClass parent; +} MMModemNovatelCdmaClass; + +GType mm_modem_novatel_cdma_get_type (void); + +MMModem *mm_modem_novatel_cdma_new (const char *data_device, + const char *driver); + +#endif /* MM_MODEM_NOVATEL_CDMA_H */ diff --git a/plugins/mm-modem-novatel-gsm.c b/plugins/mm-modem-novatel-gsm.c new file mode 100644 index 00000000..9c569264 --- /dev/null +++ b/plugins/mm-modem-novatel-gsm.c @@ -0,0 +1,173 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#include +#include +#include +#include +#include "mm-modem-novatel-gsm.h" +#include "mm-errors.h" +#include "mm-callback-info.h" + +static gpointer mm_modem_novatel_gsm_parent_class = NULL; + +MMModem * +mm_modem_novatel_gsm_new (const char *data_device, + const char *driver) +{ + g_return_val_if_fail (data_device != NULL, NULL); + g_return_val_if_fail (driver != NULL, NULL); + + return MM_MODEM (g_object_new (MM_TYPE_MODEM_NOVATEL_GSM, + MM_SERIAL_DEVICE, data_device, + MM_MODEM_DRIVER, driver, + MM_MODEM_TYPE, MM_MODEM_TYPE_GSM, + NULL)); +} + +/*****************************************************************************/ +/* Modem class override functions */ +/*****************************************************************************/ + +static void +init_modem_done (MMSerial *serial, + GString *response, + GError *error, + gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + if (error) + info->error = g_error_copy (error); + + mm_callback_info_schedule (info); +} + +static void +pin_check_done (MMModem *modem, GError *error, gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + if (error) { + info->error = g_error_copy (error); + mm_callback_info_schedule (info); + } else + /* Finish the initialization */ + mm_serial_queue_command (MM_SERIAL (modem), "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1", 10, init_modem_done, info); +} + +static void +pre_init_done (MMSerial *serial, + GString *response, + GError *error, + gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + if (error) { + info->error = g_error_copy (error); + mm_callback_info_schedule (info); + } else { + /* Now check the PIN explicitly, novatel doesn't seem to report + that it needs it otherwise */ + mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info); + } +} + +static void +enable_flash_done (MMSerial *serial, gpointer user_data) +{ + mm_serial_queue_command (serial, "E0 V1", 3, pre_init_done, user_data); +} + +static void +disable_done (MMSerial *serial, + GString *response, + GError *error, + gpointer user_data) +{ + mm_serial_close (serial); + mm_callback_info_schedule ((MMCallbackInfo *) user_data); +} + +static void +disable_flash_done (MMSerial *serial, gpointer user_data) +{ + mm_serial_queue_command (serial, "+CFUN=0", 5, disable_done, user_data); +} + +static void +enable (MMModem *modem, + gboolean do_enable, + MMModemFn callback, + gpointer user_data) +{ + MMCallbackInfo *info; + + /* First, reset the previously used CID */ + mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0); + + info = mm_callback_info_new (modem, callback, user_data); + + if (!do_enable) { + if (mm_serial_is_connected (MM_SERIAL (modem))) + mm_serial_flash (MM_SERIAL (modem), 1000, disable_flash_done, info); + else + disable_flash_done (MM_SERIAL (modem), info); + } else { + if (mm_serial_open (MM_SERIAL (modem), &info->error)) + mm_serial_flash (MM_SERIAL (modem), 100, enable_flash_done, info); + + if (info->error) + mm_callback_info_schedule (info); + } +} + +/*****************************************************************************/ + +static void +modem_init (MMModem *modem_class) +{ + modem_class->enable = enable; +} + +static void +mm_modem_novatel_gsm_init (MMModemNovatelGsm *self) +{ +} + +static void +mm_modem_novatel_gsm_class_init (MMModemNovatelGsmClass *klass) +{ + mm_modem_novatel_gsm_parent_class = g_type_class_peek_parent (klass); +} + +GType +mm_modem_novatel_gsm_get_type (void) +{ + static GType modem_novatel_gsm_type = 0; + + if (G_UNLIKELY (modem_novatel_gsm_type == 0)) { + static const GTypeInfo modem_novatel_gsm_type_info = { + sizeof (MMModemNovatelGsmClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) mm_modem_novatel_gsm_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (MMModemNovatelGsm), + 0, /* n_preallocs */ + (GInstanceInitFunc) mm_modem_novatel_gsm_init, + }; + + static const GInterfaceInfo modem_iface_info = { + (GInterfaceInitFunc) modem_init + }; + + modem_novatel_gsm_type = g_type_register_static (MM_TYPE_GENERIC_GSM, "MMModemNovatelGsm", + &modem_novatel_gsm_type_info, 0); + + g_type_add_interface_static (modem_novatel_gsm_type, MM_TYPE_MODEM, &modem_iface_info); + } + + return modem_novatel_gsm_type; +} diff --git a/plugins/mm-modem-novatel-gsm.h b/plugins/mm-modem-novatel-gsm.h new file mode 100644 index 00000000..cfb0c007 --- /dev/null +++ b/plugins/mm-modem-novatel-gsm.h @@ -0,0 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#ifndef MM_MODEM_NOVATEL_GSM_H +#define MM_MODEM_NOVATEL_GSM_H + +#include "mm-generic-gsm.h" + +#define MM_TYPE_MODEM_NOVATEL_GSM (mm_modem_novatel_gsm_get_type ()) +#define MM_MODEM_NOVATEL_GSM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_NOVATEL_GSM, MMModemNovatelGsm)) +#define MM_MODEM_NOVATEL_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_NOVATEL_GSM, MMModemNovatelGsmClass)) +#define MM_IS_MODEM_NOVATEL_GSM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_NOVATEL_GSM)) +#define MM_IS_MODEM_NOVATEL_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_MODEM_NOVATEL_GSM)) +#define MM_MODEM_NOVATEL_GSM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_NOVATEL_GSM, MMModemNovatelGsmClass)) + +typedef struct { + MMGenericGsm parent; +} MMModemNovatelGsm; + +typedef struct { + MMGenericGsmClass parent; +} MMModemNovatelGsmClass; + +GType mm_modem_novatel_gsm_get_type (void); + +MMModem *mm_modem_novatel_gsm_new (const char *data_device, + const char *driver); + +#endif /* MM_MODEM_NOVATEL_GSM_H */ diff --git a/plugins/mm-modem-novatel.c b/plugins/mm-modem-novatel.c deleted file mode 100644 index c0da1eef..00000000 --- a/plugins/mm-modem-novatel.c +++ /dev/null @@ -1,171 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - -#include -#include -#include -#include -#include "mm-modem-novatel.h" -#include "mm-errors.h" -#include "mm-callback-info.h" - -static gpointer mm_modem_novatel_parent_class = NULL; - -MMModem * -mm_modem_novatel_new (const char *data_device, - const char *driver) -{ - g_return_val_if_fail (data_device != NULL, NULL); - g_return_val_if_fail (driver != NULL, NULL); - - return MM_MODEM (g_object_new (MM_TYPE_MODEM_NOVATEL, - MM_SERIAL_DEVICE, data_device, - MM_MODEM_DRIVER, driver, - MM_MODEM_TYPE, MM_MODEM_TYPE_GSM, - NULL)); -} - -/*****************************************************************************/ -/* Modem class override functions */ -/*****************************************************************************/ - -static void -init_modem_done (MMSerial *serial, - GString *response, - GError *error, - gpointer user_data) -{ - MMCallbackInfo *info = (MMCallbackInfo *) user_data; - - if (error) - info->error = g_error_copy (error); - - mm_callback_info_schedule (info); -} - -static void -pin_check_done (MMModem *modem, GError *error, gpointer user_data) -{ - MMCallbackInfo *info = (MMCallbackInfo *) user_data; - - if (error) { - info->error = g_error_copy (error); - mm_callback_info_schedule (info); - } else - /* Finish the initialization */ - mm_serial_queue_command (MM_SERIAL (modem), "Z E0 V1 X4 &C1 +CMEE=1;+CFUN=1", 10, init_modem_done, info); -} - -static void -pre_init_done (MMSerial *serial, - GString *response, - GError *error, - gpointer user_data) -{ - MMCallbackInfo *info = (MMCallbackInfo *) user_data; - - if (error) { - info->error = g_error_copy (error); - mm_callback_info_schedule (info); - } else { - /* Now check the PIN explicitly, novatel doesn't seem to report - that it needs it otherwise */ - mm_generic_gsm_check_pin (MM_GENERIC_GSM (info->modem), pin_check_done, info); - } -} - -static void -enable_flash_done (MMSerial *serial, gpointer user_data) -{ - mm_serial_queue_command (serial, "E0 V1", 3, pre_init_done, user_data); -} - -static void -disable_done (MMSerial *serial, - GString *response, - GError *error, - gpointer user_data) -{ - mm_serial_close (serial); - mm_callback_info_schedule ((MMCallbackInfo *) user_data); -} - -static void -disable_flash_done (MMSerial *serial, gpointer user_data) -{ - mm_serial_queue_command (serial, "+CFUN=0", 5, disable_done, user_data); -} - -static void -enable (MMModem *modem, - gboolean do_enable, - MMModemFn callback, - gpointer user_data) -{ - MMCallbackInfo *info; - - /* First, reset the previously used CID */ - mm_generic_gsm_set_cid (MM_GENERIC_GSM (modem), 0); - - info = mm_callback_info_new (modem, callback, user_data); - - if (!do_enable) { - if (mm_serial_is_connected (MM_SERIAL (modem))) - mm_serial_flash (MM_SERIAL (modem), 1000, disable_flash_done, info); - else - disable_flash_done (MM_SERIAL (modem), info); - } else { - if (mm_serial_open (MM_SERIAL (modem), &info->error)) - mm_serial_flash (MM_SERIAL (modem), 100, enable_flash_done, info); - - if (info->error) - mm_callback_info_schedule (info); - } -} - -/*****************************************************************************/ - -static void -modem_init (MMModem *modem_class) -{ - modem_class->enable = enable; -} - -static void -mm_modem_novatel_init (MMModemNovatel *self) -{ -} - -static void -mm_modem_novatel_class_init (MMModemNovatelClass *klass) -{ - mm_modem_novatel_parent_class = g_type_class_peek_parent (klass); -} - -GType -mm_modem_novatel_get_type (void) -{ - static GType modem_novatel_type = 0; - - if (G_UNLIKELY (modem_novatel_type == 0)) { - static const GTypeInfo modem_novatel_type_info = { - sizeof (MMModemNovatelClass), - (GBaseInitFunc) NULL, - (GBaseFinalizeFunc) NULL, - (GClassInitFunc) mm_modem_novatel_class_init, - (GClassFinalizeFunc) NULL, - NULL, /* class_data */ - sizeof (MMModemNovatel), - 0, /* n_preallocs */ - (GInstanceInitFunc) mm_modem_novatel_init, - }; - - static const GInterfaceInfo modem_iface_info = { - (GInterfaceInitFunc) modem_init - }; - - modem_novatel_type = g_type_register_static (MM_TYPE_GENERIC_GSM, "MMModemNovatel", &modem_novatel_type_info, 0); - g_type_add_interface_static (modem_novatel_type, MM_TYPE_MODEM, &modem_iface_info); - } - - return modem_novatel_type; -} diff --git a/plugins/mm-modem-novatel.h b/plugins/mm-modem-novatel.h deleted file mode 100644 index 7c228f6f..00000000 --- a/plugins/mm-modem-novatel.h +++ /dev/null @@ -1,28 +0,0 @@ -/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ - -#ifndef MM_MODEM_NOVATEL_H -#define MM_MODEM_NOVATEL_H - -#include "mm-generic-gsm.h" - -#define MM_TYPE_MODEM_NOVATEL (mm_modem_novatel_get_type ()) -#define MM_MODEM_NOVATEL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_NOVATEL, MMModemNovatel)) -#define MM_MODEM_NOVATEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_NOVATEL, MMModemNovatelClass)) -#define MM_IS_MODEM_NOVATEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_NOVATEL)) -#define MM_IS_MODEM_NOVATEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_MODEM_NOVATEL)) -#define MM_MODEM_NOVATEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_NOVATEL, MMModemNovatelClass)) - -typedef struct { - MMGenericGsm parent; -} MMModemNovatel; - -typedef struct { - MMGenericGsmClass parent; -} MMModemNovatelClass; - -GType mm_modem_novatel_get_type (void); - -MMModem *mm_modem_novatel_new (const char *data_device, - const char *driver); - -#endif /* MM_MODEM_NOVATEL_H */ diff --git a/plugins/mm-plugin-novatel.c b/plugins/mm-plugin-novatel.c index 68950ac2..0957c7d5 100644 --- a/plugins/mm-plugin-novatel.c +++ b/plugins/mm-plugin-novatel.c @@ -3,8 +3,8 @@ #include #include #include "mm-plugin-novatel.h" -#include "mm-modem-novatel.h" -#include "mm-generic-cdma.h" +#include "mm-modem-novatel-cdma.h" +#include "mm-modem-novatel-gsm.h" static void plugin_init (MMPlugin *plugin_class); @@ -141,11 +141,9 @@ create_modem (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi) g_return_val_if_fail (driver != NULL, NULL); if (is_novatel_gsm) - modem = MM_MODEM (mm_modem_novatel_new (data_device, driver)); - else { - modem = MM_MODEM (mm_generic_cdma_new (data_device, driver)); - g_object_set (G_OBJECT (modem), MM_SERIAL_CARRIER_DETECT, FALSE, NULL); - } + modem = MM_MODEM (mm_modem_novatel_gsm_new (data_device, driver)); + else + modem = MM_MODEM (mm_modem_novatel_cdma_new (data_device, driver)); libhal_free_string (data_device); libhal_free_string (driver); -- cgit v1.2.3-70-g09d2