modemmanager: Add support for Samsung Y3300 modem

BUG=chrome-os-partner:2394
TEST=gmerge modemmanager, watch logs, see detected as Samsung modem, connect to AT&T network

Review URL: http://codereview.chromium.org/6614026
Patch from Jun Woo Lee <jw86.lee@samsung.com>.

Change-Id: I913628ff4a1cd16c8180e3c808644b0134e69e31

plugins/Makefile.am

@@ -35,7 +35,8 @@ pkglib_LTLIBRARIES = \
 	libmm-plugin-anydata.la \
 	libmm-plugin-simtech.la \
 	libmm-plugin-x22x.la \
-	libmm-plugin-linktop.la
+	libmm-plugin-linktop.la \
+	libmm-plugin-samsung.la
 
 # Generic
 
@@ -335,6 +336,24 @@ libmm_plugin_linktop_la_LDFLAGS = \
 	-module \
 	-avoid-version
 
+# Samsung modem
+
+libmm_plugin_samsung_la_SOURCES = \
+	mm-plugin-samsung.c \
+	mm-plugin-samsung.h \
+	mm-modem-samsung-gsm.c \
+	mm-modem-samsung-gsm.h
+
+libmm_plugin_samsung_la_CPPFLAGS = \
+	$(MM_CFLAGS) \
+	$(GUDEV_CFLAGS) \
+	-I$(top_srcdir)/src
+
+libmm_plugin_samsung_la_LDFLAGS = \
+	$(GUDEV_LDFLAGS) \
+	-module \
+	-avoid-version
+
 udevrulesdir = $(UDEV_BASE_DIR)/rules.d
 udevrules_DATA = \
 	77-mm-ericsson-mbm.rules \

plugins/mm-modem-samsung-gsm.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright 2011 by Samsung Electronics, Inc.,
+ */
+
+#ifndef MM_MODEM_SAMSUNG_GSM_H
+#define MM_MODEM_SAMSUNG_GSM_H
+#include <glib-object.h>
+
+#include "mm-generic-gsm.h"
+#include "mm-generic-gsm.h"
+
+#define MM_TYPE_MODEM_SAMSUNG_GSM            (mm_modem_samsung_gsm_get_type ())
+#define MM_MODEM_SAMSUNG_GSM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_MODEM_SAMSUNG_GSM, MMModemSamsungGsm))
+#define MM_MODEM_SAMSUNG_GSM_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_MODEM_SAMSUNG_GSM, MMModemSamsungGsmClass))
+#define MM_IS_MODEM_SAMSUNG_GSM(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_MODEM_SAMSUNG_GSM))
+#define MM_IS_MODEM_SAMSUNG_GSM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_MODEM_SAMSUNG_GSM))
+#define MM_MODEM_SAMSUNG_GSM_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_MODEM_SAMSUNG_GSM, MMModemSamsungGsmClass))
+
+typedef struct {
+    MMGenericGsm parent;
+} MMModemSamsungGsm;
+
+typedef struct {
+    MMGenericGsmClass parent;
+} MMModemSamsungGsmClass;
+
+GType mm_modem_samsung_gsm_get_type (void);
+
+void mm_modem_samsung_cleanup (MMModemSamsungGsm *self);
+
+void mm_modem_samsung_change_unsolicited_messages (MMModemSamsungGsm *self,
+                                                 gboolean enabled);
+
+void mm_modem_samsung_do_connect (MMModemSamsungGsm *self,
+                                const char *number,
+                                MMModemFn callback,
+                                gpointer user_data);
+
+MMModem *mm_modem_samsung_gsm_new (const char *device,
+                                  const char *driver,
+                                  const char *plugin_name);
+
+#endif /* MM_MODEM_SAMSUNG_GSM_H */
+

plugins/mm-plugin-samsung.c

@@ -0,0 +1,166 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright 2011 by Samsung Electronics, Inc.,
+ */
+
+#include <string.h>
+#include <gmodule.h>
+#define G_UDEV_API_IS_SUBJECT_TO_CHANGE
+#include <gudev/gudev.h>
+
+#include "mm-plugin-samsung.h"
+#include "mm-modem-samsung-gsm.h"
+
+G_DEFINE_TYPE (MMPluginSamsung, mm_plugin_samsung, MM_TYPE_PLUGIN_BASE)
+
+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_SAMSUNG,
+                                    MM_PLUGIN_BASE_NAME, "Samsung",
+                                    NULL));
+}
+
+static guint32
+get_level_for_capabilities (guint32 capabilities)
+{
+    if (capabilities & MM_PLUGIN_BASE_PORT_CAP_GSM)
+        return 10;
+    return 0;
+}
+
+static void
+probe_result (MMPluginBase *base,
+              MMPluginBaseSupportsTask *task,
+              guint32 capabilities,
+              gpointer user_data)
+{
+    mm_plugin_base_supports_task_complete (task, get_level_for_capabilities (capabilities));
+}
+
+static MMPluginSupportsResult
+supports_port (MMPluginBase *base,
+               MMModem *existing,
+               MMPluginBaseSupportsTask *task)
+{
+    GUdevDevice *port;
+    const char *tmp;
+    guint32 level;
+
+    /* Can't do anything with non-serial ports */
+    port = mm_plugin_base_supports_task_get_port (task);
+
+    if(!g_str_has_prefix(g_udev_device_get_subsystem(port), "tty"))
+    {
+        if(g_str_has_prefix(g_udev_device_get_name(port), "usb"))
+    {
+            goto done;
+        }
+        else
+        {
+            return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
+        }
+    }
+    else
+    {
+        tmp = g_udev_device_get_property (port, "ID_BUS");
+
+        if(g_strcmp0(tmp, "usb"))
+            return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
+
+        tmp = g_udev_device_get_property (port, "ID_VENDOR_ID");
+
+        if (g_strcmp0(tmp, "04e8") && g_strcmp0(tmp, "1983"))
+        {
+            return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
+        }
+    }
+
+done:
+
+    if (g_str_has_prefix(g_udev_device_get_name (port), "usb")) {
+        level = get_level_for_capabilities (1);
+        if (level) {
+            mm_plugin_base_supports_task_complete (task, 10);
+            return MM_PLUGIN_SUPPORTS_PORT_IN_PROGRESS;
+        }
+        return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
+    }
+
+    mm_plugin_base_supports_task_set_custom_init_command (task, "+CFUN=1", 10, 4, FALSE);
+
+    /* Otherwise kick off a probe */
+    if (mm_plugin_base_probe_port (base, task, NULL))
+    {
+        return MM_PLUGIN_SUPPORTS_PORT_IN_PROGRESS;
+    }
+    return MM_PLUGIN_SUPPORTS_PORT_UNSUPPORTED;
+}
+
+static MMModem *
+grab_port (MMPluginBase *base,
+           MMModem *existing,
+           MMPluginBaseSupportsTask *task,
+           GError **error)
+{
+    GUdevDevice *port = NULL;
+    MMModem *modem = NULL;
+    const char *name, *subsys, *sysfs_path;
+
+    port = mm_plugin_base_supports_task_get_port (task);
+    g_assert (port);
+
+    subsys = g_udev_device_get_subsystem (port);
+    name = g_udev_device_get_name (port);
+
+    sysfs_path = mm_plugin_base_supports_task_get_physdev_path (task);
+    if (!existing) {
+        modem = mm_modem_samsung_gsm_new (sysfs_path,
+                                         mm_plugin_base_supports_task_get_driver (task),
+                                         mm_plugin_get_name (MM_PLUGIN (base)));
+
+        if (modem) {
+            if (!mm_modem_grab_port (modem, subsys, name, MM_PORT_TYPE_UNKNOWN, NULL, error)) {
+                g_object_unref (modem);
+                return NULL;
+            }
+        }
+    } else {
+        modem = existing;
+        if (!mm_modem_grab_port (modem, subsys, name, MM_PORT_TYPE_UNKNOWN, NULL, error))
+            return NULL;
+    }
+
+    return modem;
+}
+
+static void
+mm_plugin_samsung_init (MMPluginSamsung *self)
+{
+    g_signal_connect (self, "probe-result", G_CALLBACK (probe_result), NULL);
+}
+
+static void
+mm_plugin_samsung_class_init (MMPluginSamsungClass *klass)
+{
+    MMPluginBaseClass *pb_class = MM_PLUGIN_BASE_CLASS (klass);
+
+    pb_class->supports_port = supports_port;
+    pb_class->grab_port = grab_port;
+}
+

plugins/mm-plugin-samsung.h

@@ -0,0 +1,45 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details:
+ *
+ * Copyright (C) 2008 - 2009 Novell, Inc.
+ * Copyright (C) 2009 Red Hat, Inc.
+ * Copyright 2011 by Samsung Electronics, Inc.,
+ */
+
+#ifndef MM_PLUGIN_SAMSUNG_H
+#define MM_PLUGIN_SAMSUNG_H
+
+#include "mm-plugin.h"
+#include "mm-plugin-base.h"
+#include "mm-generic-gsm.h"
+
+#define MM_TYPE_PLUGIN_SAMSUNG            (mm_plugin_samsung_get_type ())
+#define MM_PLUGIN_SAMSUNG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsung))
+#define MM_PLUGIN_SAMSUNG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsungClass))
+#define MM_IS_PLUGIN_SAMSUNG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MM_TYPE_PLUGIN_SAMSUNG))
+#define MM_IS_PLUGIN_SAMSUNG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MM_TYPE_PLUGIN_SAMSUNG))
+#define MM_PLUGIN_SAMSUNG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MM_TYPE_PLUGIN_SAMSUNG, MMPluginSamsungClass))
+
+typedef struct {
+    MMPluginBase parent;
+} MMPluginSamsung;
+
+typedef struct {
+    MMPluginBaseClass parent;
+} MMPluginSamsungClass;
+
+GType mm_plugin_samsung_get_type (void);
+
+G_MODULE_EXPORT MMPlugin *mm_plugin_create (void);
+
+#endif /* MM_PLUGIN_SAMSUNG_H */
+

src/mm-port.c

@@ -68,6 +68,8 @@ mm_port_type_to_name (MMPortType ptype)
         return "primary";
     case MM_PORT_TYPE_SECONDARY:
         return "secondary";
+    case MM_PORT_TYPE_ECM:
+    	return "ECM";
     case MM_PORT_TYPE_IGNORED:
         return "ignored";
     case MM_PORT_TYPE_QCDM:

src/mm-port.h

@@ -32,6 +32,7 @@ typedef enum {
     MM_PORT_TYPE_UNKNOWN = 0x0,
     MM_PORT_TYPE_PRIMARY,
     MM_PORT_TYPE_SECONDARY,
+    MM_PORT_TYPE_ECM,
     MM_PORT_TYPE_IGNORED,
     MM_PORT_TYPE_QCDM,