commit ModemManager

Hello community, here is the log from the commit of package ModemManager checked in at Mon Nov 24 16:25:48 CET 2008. -------- --- ModemManager/ModemManager.changes 2008-11-07 14:45:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/ModemManager/ModemManager.changes 2008-11-18 12:37:07.000000000 +0100 @@ -1,0 +2,8 @@ +Tue Nov 18 13:09:18 EET 2008 - tambet@suse.de + +- Don't require CDMA modems to implement verbose error reporting + (+CMEE command) (bnc #430502). +- Add a Sierra Wireless plugin that waits a bit after enabling the + radio (bnc #430673). + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ModemManager-0.1_20081030.tar.bz2 New: ---- ModemManager-0.1_20081118.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ModemManager.spec ++++++ --- /var/tmp/diff_new_pack.GV1488/_old 2008-11-24 16:25:43.000000000 +0100 +++ /var/tmp/diff_new_pack.GV1488/_new 2008-11-24 16:25:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ModemManager (Version 0.1_20081030) +# spec file for package ModemManager (Version 0.1_20081118) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: ModemManager Url: http://gitorious.org/projects/modemmanager -Version: 0.1_20081030 +Version: 0.1_20081118 Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -74,6 +74,11 @@ %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager.service %changelog +* Tue Nov 18 2008 tambet@suse.de +- Don't require CDMA modems to implement verbose error reporting + (+CMEE command) (bnc #430502). +- Add a Sierra Wireless plugin that waits a bit after enabling the + radio (bnc #430673). * Fri Nov 07 2008 tambet@suse.de - Implement a plugin for Option devices. - Enable/disable plugging with SIGUSR1. ++++++ ModemManager-0.1_20081030.tar.bz2 -> ModemManager-0.1_20081118.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/Makefile.am new/ModemManager-0.1/plugins/Makefile.am --- old/ModemManager-0.1/plugins/Makefile.am 2008-10-30 11:18:43.000000000 +0100 +++ new/ModemManager-0.1/plugins/Makefile.am 2008-11-18 12:03:10.000000000 +0100 @@ -2,7 +2,8 @@ libmm-plugin-huawei.la \ libmm-plugin-hso.la \ libmm-plugin-mbm.la \ - libmm-plugin-option.la + libmm-plugin-option.la \ + libmm-plugin-sierra.la # Huawei @@ -69,6 +70,20 @@ libmm_plugin_option_la_LDFLAGS = -module -avoid-version +# Sierra + +libmm_plugin_sierra_la_SOURCES = \ + mm-modem-sierra.c \ + mm-modem-sierra.h \ + mm-plugin-sierra.c \ + mm-plugin-sierra.h + +libmm_plugin_sierra_la_CPPFLAGS = \ + $(MM_CFLAGS) \ + -I$(top_srcdir)/src + +libmm_plugin_sierra_la_LDFLAGS = -module -avoid-version + BUILT_SOURCES = \ mm-modem-gsm-hso-glue.h \ mm-modem-gsm-mbm-glue.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/Makefile.in new/ModemManager-0.1/plugins/Makefile.in --- old/ModemManager-0.1/plugins/Makefile.in 2008-10-30 11:18:45.000000000 +0100 +++ new/ModemManager-0.1/plugins/Makefile.in 2008-11-18 12:03:21.000000000 +0100 @@ -80,6 +80,14 @@ libmm_plugin_option_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmm_plugin_option_la_LDFLAGS) $(LDFLAGS) -o $@ +libmm_plugin_sierra_la_LIBADD = +am_libmm_plugin_sierra_la_OBJECTS = \ + libmm_plugin_sierra_la-mm-modem-sierra.lo \ + libmm_plugin_sierra_la-mm-plugin-sierra.lo +libmm_plugin_sierra_la_OBJECTS = $(am_libmm_plugin_sierra_la_OBJECTS) +libmm_plugin_sierra_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libmm_plugin_sierra_la_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -95,11 +103,13 @@ SOURCES = $(libmm_plugin_hso_la_SOURCES) \ $(libmm_plugin_huawei_la_SOURCES) \ $(libmm_plugin_mbm_la_SOURCES) \ - $(libmm_plugin_option_la_SOURCES) + $(libmm_plugin_option_la_SOURCES) \ + $(libmm_plugin_sierra_la_SOURCES) DIST_SOURCES = $(libmm_plugin_hso_la_SOURCES) \ $(libmm_plugin_huawei_la_SOURCES) \ $(libmm_plugin_mbm_la_SOURCES) \ - $(libmm_plugin_option_la_SOURCES) + $(libmm_plugin_option_la_SOURCES) \ + $(libmm_plugin_sierra_la_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -223,7 +233,8 @@ libmm-plugin-huawei.la \ libmm-plugin-hso.la \ libmm-plugin-mbm.la \ - libmm-plugin-option.la + libmm-plugin-option.la \ + libmm-plugin-sierra.la # Huawei @@ -279,6 +290,19 @@ -I$(top_srcdir)/src libmm_plugin_option_la_LDFLAGS = -module -avoid-version + +# Sierra +libmm_plugin_sierra_la_SOURCES = \ + mm-modem-sierra.c \ + mm-modem-sierra.h \ + mm-plugin-sierra.c \ + mm-plugin-sierra.h + +libmm_plugin_sierra_la_CPPFLAGS = \ + $(MM_CFLAGS) \ + -I$(top_srcdir)/src + +libmm_plugin_sierra_la_LDFLAGS = -module -avoid-version BUILT_SOURCES = \ mm-modem-gsm-hso-glue.h \ mm-modem-gsm-mbm-glue.h @@ -353,6 +377,8 @@ $(libmm_plugin_mbm_la_LINK) -rpath $(pkglibdir) $(libmm_plugin_mbm_la_OBJECTS) $(libmm_plugin_mbm_la_LIBADD) $(LIBS) libmm-plugin-option.la: $(libmm_plugin_option_la_OBJECTS) $(libmm_plugin_option_la_DEPENDENCIES) $(libmm_plugin_option_la_LINK) -rpath $(pkglibdir) $(libmm_plugin_option_la_OBJECTS) $(libmm_plugin_option_la_LIBADD) $(LIBS) +libmm-plugin-sierra.la: $(libmm_plugin_sierra_la_OBJECTS) $(libmm_plugin_sierra_la_DEPENDENCIES) + $(libmm_plugin_sierra_la_LINK) -rpath $(pkglibdir) $(libmm_plugin_sierra_la_OBJECTS) $(libmm_plugin_sierra_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -368,6 +394,8 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmm_plugin_mbm_la-mm-plugin-mbm.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmm_plugin_option_la-mm-modem-option.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmm_plugin_option_la-mm-plugin-option.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmm_plugin_sierra_la-mm-modem-sierra.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmm_plugin_sierra_la-mm-plugin-sierra.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -446,6 +474,20 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmm_plugin_option_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmm_plugin_option_la-mm-plugin-option.lo `test -f 'mm-plugin-option.c' || echo '$(srcdir)/'`mm-plugin-option.c +libmm_plugin_sierra_la-mm-modem-sierra.lo: mm-modem-sierra.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmm_plugin_sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmm_plugin_sierra_la-mm-modem-sierra.lo -MD -MP -MF $(DEPDIR)/libmm_plugin_sierra_la-mm-modem-sierra.Tpo -c -o libmm_plugin_sierra_la-mm-modem-sierra.lo `test -f 'mm-modem-sierra.c' || echo '$(srcdir)/'`mm-modem-sierra.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmm_plugin_sierra_la-mm-modem-sierra.Tpo $(DEPDIR)/libmm_plugin_sierra_la-mm-modem-sierra.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mm-modem-sierra.c' object='libmm_plugin_sierra_la-mm-modem-sierra.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmm_plugin_sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmm_plugin_sierra_la-mm-modem-sierra.lo `test -f 'mm-modem-sierra.c' || echo '$(srcdir)/'`mm-modem-sierra.c + +libmm_plugin_sierra_la-mm-plugin-sierra.lo: mm-plugin-sierra.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmm_plugin_sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libmm_plugin_sierra_la-mm-plugin-sierra.lo -MD -MP -MF $(DEPDIR)/libmm_plugin_sierra_la-mm-plugin-sierra.Tpo -c -o libmm_plugin_sierra_la-mm-plugin-sierra.lo `test -f 'mm-plugin-sierra.c' || echo '$(srcdir)/'`mm-plugin-sierra.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libmm_plugin_sierra_la-mm-plugin-sierra.Tpo $(DEPDIR)/libmm_plugin_sierra_la-mm-plugin-sierra.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mm-plugin-sierra.c' object='libmm_plugin_sierra_la-mm-plugin-sierra.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmm_plugin_sierra_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libmm_plugin_sierra_la-mm-plugin-sierra.lo `test -f 'mm-plugin-sierra.c' || echo '$(srcdir)/'`mm-plugin-sierra.c + mostlyclean-libtool: -rm -f *.lo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/mm-modem-sierra.c new/ModemManager-0.1/plugins/mm-modem-sierra.c --- old/ModemManager-0.1/plugins/mm-modem-sierra.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ModemManager-0.1/plugins/mm-modem-sierra.c 2008-11-18 12:01:32.000000000 +0100 @@ -0,0 +1,104 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#include +#include +#include +#include +#include "mm-modem-sierra.h" +#include "mm-errors.h" +#include "mm-callback-info.h" + +static gpointer mm_modem_sierra_parent_class = NULL; + +MMModem * +mm_modem_sierra_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_SIERRA, + MM_SERIAL_DEVICE, data_device, + MM_MODEM_DRIVER, driver, + NULL)); +} + +static void +parent_enable_done (MMModem *modem, GError *error, gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + if (error) + info->error = g_error_copy (error); + else if (GPOINTER_TO_INT (mm_callback_info_get_data (info, "sierra-enable"))) { + /* Sierra returns OK on +CFUN=1 right away but needs some time + to finish initialization */ + sleep (10); + } + + mm_callback_info_schedule (info); +} + +static void +enable (MMModem *modem, + gboolean enable, + MMModemFn callback, + gpointer user_data) +{ + MMModem *parent_modem_iface; + MMCallbackInfo *info; + + info = mm_callback_info_new (modem, callback, user_data); + mm_callback_info_set_data (info, "sierra-enable", GINT_TO_POINTER (enable), NULL); + + parent_modem_iface = g_type_interface_peek_parent (MM_MODEM_GET_INTERFACE (modem)); + parent_modem_iface->enable (modem, enable, parent_enable_done, info); +} + +/*****************************************************************************/ + +static void +modem_init (MMModem *modem_class) +{ + modem_class->enable = enable; +} + +static void +mm_modem_sierra_init (MMModemSierra *self) +{ +} + +static void +mm_modem_sierra_class_init (MMModemSierraClass *klass) +{ + mm_modem_sierra_parent_class = g_type_class_peek_parent (klass); +} + +GType +mm_modem_sierra_get_type (void) +{ + static GType modem_sierra_type = 0; + + if (G_UNLIKELY (modem_sierra_type == 0)) { + static const GTypeInfo modem_sierra_type_info = { + sizeof (MMModemSierraClass), + (GBaseInitFunc) NULL, + (GBaseFinalizeFunc) NULL, + (GClassInitFunc) mm_modem_sierra_class_init, + (GClassFinalizeFunc) NULL, + NULL, /* class_data */ + sizeof (MMModemSierra), + 0, /* n_preallocs */ + (GInstanceInitFunc) mm_modem_sierra_init, + }; + + static const GInterfaceInfo modem_iface_info = { + (GInterfaceInitFunc) modem_init + }; + + modem_sierra_type = g_type_register_static (MM_TYPE_GENERIC_GSM, "MMModemSierra", &modem_sierra_type_info, 0); + g_type_add_interface_static (modem_sierra_type, MM_TYPE_MODEM, &modem_iface_info); + } + + return modem_sierra_type; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/mm-modem-sierra.h new/ModemManager-0.1/plugins/mm-modem-sierra.h --- old/ModemManager-0.1/plugins/mm-modem-sierra.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ModemManager-0.1/plugins/mm-modem-sierra.h 2008-11-18 11:59:43.000000000 +0100 @@ -0,0 +1,28 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#ifndef MM_MODEM_SIERRA_H +#define MM_MODEM_SIERRA_H + +#include "mm-generic-gsm.h" + +#define MM_TYPE_MODEM_SIERRA (mm_modem_sierra_get_type ()) +#define MM_MODEM_SIERRA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_SIERRA, MMModemSierra)) +#define MM_MODEM_SIERRA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_MODEM_SIERRA, MMModemSierraClass)) +#define MM_IS_MODEM_SIERRA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_SIERRA)) +#define MM_IS_MODEM_SIERRA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_MODEM_SIERRA)) +#define MM_MODEM_SIERRA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_MODEM_SIERRA, MMModemSierraClass)) + +typedef struct { + MMGenericGsm parent; +} MMModemSierra; + +typedef struct { + MMGenericGsmClass parent; +} MMModemSierraClass; + +GType mm_modem_sierra_get_type (void); + +MMModem *mm_modem_sierra_new (const char *data_device, + const char *driver); + +#endif /* MM_MODEM_SIERRA_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/mm-plugin-sierra.c new/ModemManager-0.1/plugins/mm-plugin-sierra.c --- old/ModemManager-0.1/plugins/mm-plugin-sierra.c 1970-01-01 01:00:00.000000000 +0100 +++ new/ModemManager-0.1/plugins/mm-plugin-sierra.c 2008-11-18 11:59:03.000000000 +0100 @@ -0,0 +1,148 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#include +#include +#include "mm-plugin-sierra.h" +#include "mm-modem-sierra.h" + +static void plugin_init (MMPlugin *plugin_class); + +G_DEFINE_TYPE_EXTENDED (MMPluginSierra, mm_plugin_sierra, G_TYPE_OBJECT, + 0, G_IMPLEMENT_INTERFACE (MM_TYPE_PLUGIN, plugin_init)) + +int mm_plugin_major_version = MM_PLUGIN_MAJOR_VERSION; +int mm_plugin_minor_version = MM_PLUGIN_MINOR_VERSION; + +G_MODULE_EXPORT MMPlugin * +mm_plugin_create (void) +{ + return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_SIERRA, NULL)); +} + +/*****************************************************************************/ + +static const char * +get_name (MMPlugin *plugin) +{ + return "Sierra"; +} + +static char ** +list_supported_udis (MMPlugin *plugin, LibHalContext *hal_ctx) +{ + char **supported = NULL; + char **devices; + int num_devices; + int i; + + devices = libhal_find_device_by_capability (hal_ctx, "modem", &num_devices, NULL); + if (devices) { + GPtrArray *array; + + array = g_ptr_array_new (); + + for (i = 0; i < num_devices; i++) { + char *udi = devices[i]; + + if (mm_plugin_supports_udi (plugin, hal_ctx, udi)) + g_ptr_array_add (array, g_strdup (udi)); + } + + if (array->len > 0) { + g_ptr_array_add (array, NULL); + supported = (char **) g_ptr_array_free (array, FALSE); + } else + g_ptr_array_free (array, TRUE); + } + + g_strfreev (devices); + + return supported; +} + +static gboolean +supports_udi (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi) +{ + char **capabilities; + char **iter; + gboolean supported = FALSE; + + capabilities = libhal_device_get_property_strlist (hal_ctx, udi, "modem.command_sets", NULL); + for (iter = capabilities; iter && *iter && !supported; iter++) { + if (!strcmp (*iter, "GSM-07.07")) { + char *parent_udi; + + parent_udi = libhal_device_get_property_string (hal_ctx, udi, "info.parent", NULL); + if (parent_udi) { + int vendor; + + vendor = libhal_device_get_property_int (hal_ctx, parent_udi, "usb.vendor_id", NULL); + if (vendor == 0x1199) + supported = TRUE; + + libhal_free_string (parent_udi); + } + } + } + g_strfreev (capabilities); + + return supported; +} + +static char * +get_driver_name (LibHalContext *ctx, const char *udi) +{ + char *parent_udi; + char *driver = NULL; + + parent_udi = libhal_device_get_property_string (ctx, udi, "info.parent", NULL); + if (parent_udi) { + driver = libhal_device_get_property_string (ctx, parent_udi, "info.linux.driver", NULL); + libhal_free_string (parent_udi); + } + + return driver; +} + +static MMModem * +create_modem (MMPlugin *plugin, LibHalContext *hal_ctx, const char *udi) +{ + char *data_device; + char *driver; + MMModem *modem; + + data_device = libhal_device_get_property_string (hal_ctx, udi, "serial.device", NULL); + g_return_val_if_fail (data_device != NULL, NULL); + + driver = get_driver_name (hal_ctx, udi); + g_return_val_if_fail (driver != NULL, NULL); + + modem = MM_MODEM (mm_modem_sierra_new (data_device, driver)); + + libhal_free_string (data_device); + libhal_free_string (driver); + + return modem; +} + +/*****************************************************************************/ + +static void +plugin_init (MMPlugin *plugin_class) +{ + /* interface implementation */ + plugin_class->get_name = get_name; + plugin_class->list_supported_udis = list_supported_udis; + plugin_class->supports_udi = supports_udi; + plugin_class->create_modem = create_modem; +} + +static void +mm_plugin_sierra_init (MMPluginSierra *self) +{ +} + +static void +mm_plugin_sierra_class_init (MMPluginSierraClass *klass) +{ +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/plugins/mm-plugin-sierra.h new/ModemManager-0.1/plugins/mm-plugin-sierra.h --- old/ModemManager-0.1/plugins/mm-plugin-sierra.h 1970-01-01 01:00:00.000000000 +0100 +++ new/ModemManager-0.1/plugins/mm-plugin-sierra.h 2008-11-18 11:55:20.000000000 +0100 @@ -0,0 +1,26 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + +#ifndef MM_PLUGIN_SIERRA_H +#define MM_PLUGIN_SIERRA_H + +#include "mm-plugin.h" +#include "mm-generic-gsm.h" + +#define MM_TYPE_PLUGIN_SIERRA (mm_plugin_sierra_get_type ()) +#define MM_PLUGIN_SIERRA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_SIERRA, MMPluginSierra)) +#define MM_PLUGIN_SIERRA_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), MM_TYPE_PLUGIN_SIERRA, MMPluginSierraClass)) +#define MM_IS_PLUGIN_SIERRA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_SIERRA)) +#define MM_IS_PLUGIN_SIERRA_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MM_TYPE_PLUGIN_SIERRA)) +#define MM_PLUGIN_SIERRA_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), MM_TYPE_PLUGIN_SIERRA, MMPluginSierraClass)) + +typedef struct { + GObject parent; +} MMPluginSierra; + +typedef struct { + GObjectClass parent; +} MMPluginSierraClass; + +GType mm_plugin_sierra_get_type (void); + +#endif /* MM_PLUGIN_SIERRA_H */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ModemManager-0.1/src/mm-generic-cdma.c new/ModemManager-0.1/src/mm-generic-cdma.c --- old/ModemManager-0.1/src/mm-generic-cdma.c 2008-10-20 13:39:05.000000000 +0200 +++ new/ModemManager-0.1/src/mm-generic-cdma.c 2008-11-18 11:35:27.000000000 +0100 @@ -32,6 +32,21 @@ /*****************************************************************************/ static void +enable_error_reporting_done (MMSerial *serial, + GString *response, + GError *error, + gpointer user_data) +{ + MMCallbackInfo *info = (MMCallbackInfo *) user_data; + + if (error) + g_warning ("Your CDMA modem does not support +CMEE command"); + + /* Ignore errors, see FIXME in init_done() */ + mm_callback_info_schedule (info); +} + +static void init_done (MMSerial *serial, GString *response, GError *error, @@ -39,16 +54,23 @@ { MMCallbackInfo *info = (MMCallbackInfo *) user_data; - if (error) + if (error) { info->error = g_error_copy (error); - - mm_callback_info_schedule (info); + mm_callback_info_schedule (info); + } else { + /* Try to enable better error reporting. My experience so far indicates + there's some CDMA modems that does not support that. + FIXME: It's mandatory by spec, so it really shouldn't be optional. Figure + out which CDMA modems have problems with it and implement plugin for them. + */ + mm_serial_queue_command (serial, "+CMEE=1", 3, enable_error_reporting_done, user_data); + } } static void flash_done (MMSerial *serial, gpointer user_data) { - mm_serial_queue_command (serial, "Z E0 V1 X4 &C1 +CMEE=1", 3, init_done, user_data); + mm_serial_queue_command (serial, "Z E0 V1 X4 &C1", 3, init_done, user_data); } static void ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org