Remove unneeded plugin for Option HSO support

diff --git a/Makefile.am b/Makefile.am
index c540378..51fe810 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-dnsproxy \
                                --enable-google \
                                --enable-meego \
-                               --enable-hso \
                                --enable-mbm \
                                --enable-udev \
                                --enable-client \

diff --git a/Makefile.plugins b/Makefile.plugins
index 4b73cfa..0899a51 100644 (file)
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -77,22 +77,6 @@ plugins_ofono_la_LDFLAGS = $(plugin_ldflags)
 endif
 endif
 
-if HSO
-if HSO_BUILTIN
-builtin_modules += hso
-builtin_sources += plugins/hso.c
-builtin_cflags += -I$(srcdir)/gatchat
-builtin_libadd += plugins/libgatchat.la
-else
-plugin_LTLIBRARIES += plugins/hso.la
-plugin_objects += $(plugins_hso_la_OBJECTS)
-plugins_hso_la_SOURCES = plugins/hso.c
-plugins_hso_la_CFLAGS = $(plugin_cflags) -I$(srcdir)/gatchat
-plugins_hso_la_LIBADD = plugins/libgatchat.la
-plugins_hso_la_LDFLAGS = $(plugin_ldflags)
-endif
-endif
-
 if MBM
 if MBM_BUILTIN
 builtin_modules += mbm

diff --git a/bootstrap-configure b/bootstrap-configure
index 8a6ce89..9d2c920 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -28,7 +28,6 @@ fi
                --enable-dnsproxy=builtin \
                --enable-google=builtin \
                --enable-meego=builtin \
-               --enable-hso=builtin \
                --enable-mbm=builtin \
                --enable-iwmx \
                --enable-iospm \

diff --git a/configure.ac b/configure.ac
index cdb3a07..44e75cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -191,12 +191,6 @@ AC_ARG_ENABLE(meego,
 AM_CONDITIONAL(MEEGO, test "${enable_meego}" != "no")
 AM_CONDITIONAL(MEEGO_BUILTIN, test "${enable_meego}" = "builtin")
 
-AC_ARG_ENABLE(hso,
-       AC_HELP_STRING([--enable-hso], [enable HSO support]),
-                       [enable_hso=${enableval}], [enable_hso="no"])
-AM_CONDITIONAL(HSO, test "${enable_hso}" != "no")
-AM_CONDITIONAL(HSO_BUILTIN, test "${enable_hso}" = "builtin")
-
 AC_ARG_ENABLE(mbm,
        AC_HELP_STRING([--enable-mbm], [enable MBM support]),
                        [enable_mbm=${enableval}], [enable_mbm="no"])

diff --git a/include/device.h b/include/device.h
index 464daf7..9e23aa8 100644 (file)
--- a/include/device.h
+++ b/include/device.h
@@ -44,7 +44,6 @@ enum connman_device_type {
        CONNMAN_DEVICE_TYPE_CELLULAR  = 5,
        CONNMAN_DEVICE_TYPE_GPS       = 6,
        CONNMAN_DEVICE_TYPE_MBM       = 14,
-       CONNMAN_DEVICE_TYPE_HSO       = 15,
        CONNMAN_DEVICE_TYPE_VENDOR    = 10000,
 };
 

diff --git a/include/network.h b/include/network.h
index f53f24e..4d40b05 100644 (file)
--- a/include/network.h
+++ b/include/network.h
@@ -45,7 +45,6 @@ enum connman_network_type {
        CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN = 9,
        CONNMAN_NETWORK_TYPE_CELLULAR      = 10,
        CONNMAN_NETWORK_TYPE_MBM           = 22,
-       CONNMAN_NETWORK_TYPE_HSO           = 23,
        CONNMAN_NETWORK_TYPE_VENDOR        = 10000,
 };
 

diff --git a/plugins/hso.c b/plugins/hso.c
deleted file mode 100644 (file)
index 01b1a13..0000000
--- a/plugins/hso.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- *
- *  Connection Manager
- *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- *  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.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include <glib.h>
-
-#define CONNMAN_API_SUBJECT_TO_CHANGE
-#include <connman/plugin.h>
-#include <connman/device.h>
-#include <connman/log.h>
-
-struct hso_data {
-       int index;
-};
-
-static int hso_probe(struct connman_device *device)
-{
-       struct hso_data *data;
-
-       DBG("device %p", device);
-
-       data = g_try_new0(struct hso_data, 1);
-       if (data == NULL)
-               return -ENOMEM;
-
-       data->index = connman_device_get_index(device);
-
-       connman_device_set_data(device, data);
-
-       return 0;
-}
-
-static void hso_remove(struct connman_device *device)
-{
-       struct hso_data *data = connman_device_get_data(device);
-
-       DBG("device %p", device);
-
-       connman_device_set_data(device, NULL);
-
-       g_free(data);
-}
-
-static int hso_enable(struct connman_device *device)
-{
-       DBG("device %p", device);
-
-       connman_device_set_powered(device, TRUE);
-
-       return 0;
-}
-
-static int hso_disable(struct connman_device *device)
-{
-       DBG("device %p", device);
-
-       connman_device_set_powered(device, FALSE);
-
-       return 0;
-}
-
-static struct connman_device_driver hso_driver = {
-       .name           = "hso",
-       .type           = CONNMAN_DEVICE_TYPE_HSO,
-       .probe          = hso_probe,
-       .remove         = hso_remove,
-       .enable         = hso_enable,
-       .disable        = hso_disable,
-};
-
-static int hso_init(void)
-{
-       return connman_device_driver_register(&hso_driver);
-}
-
-static void hso_exit(void)
-{
-       connman_device_driver_unregister(&hso_driver);
-}
-
-CONNMAN_PLUGIN_DEFINE(hso, "Option HSO device plugin", VERSION,
-               CONNMAN_PLUGIN_PRIORITY_DEFAULT, hso_init, hso_exit)

diff --git a/src/device.c b/src/device.c
index 8255949..0ba39c6 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -135,7 +135,6 @@ static const char *type2description(enum connman_device_type type)
                return "GPS";
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                return "Cellular";
        }
 
@@ -160,7 +159,6 @@ static const char *type2string(enum connman_device_type type)
                return "gps";
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                return "cellular";
        }
 
@@ -186,7 +184,6 @@ enum connman_service_type __connman_device_get_service_type(struct connman_devic
                return CONNMAN_SERVICE_TYPE_BLUETOOTH;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                return CONNMAN_SERVICE_TYPE_CELLULAR;
        }
 
@@ -761,7 +758,6 @@ struct connman_device *connman_device_create(const char *node,
                break;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                device->scan_interval = 0;
                break;
        }

diff --git a/src/element.c b/src/element.c
index 94d13b3..cf90b67 100644 (file)
--- a/src/element.c
+++ b/src/element.c
@@ -212,7 +212,6 @@ struct connman_service *__connman_element_get_service(struct connman_element *el
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                network = __connman_element_get_network(element);
                if (network == NULL)
                        return NULL;

diff --git a/src/inet.c b/src/inet.c
index 45c3222..9fdd916 100644 (file)
--- a/src/inet.c
+++ b/src/inet.c
@@ -416,9 +416,6 @@ enum connman_device_type __connman_inet_get_device_type(int index)
                        devtype = CONNMAN_DEVICE_TYPE_WIFI;
                else
                        devtype = CONNMAN_DEVICE_TYPE_ETHERNET;
-       } else if (type == ARPHRD_NONE) {
-               if (g_str_has_prefix(devname, "hso") == TRUE)
-                       devtype = CONNMAN_DEVICE_TYPE_HSO;
        }
 
 done:
@@ -465,7 +462,6 @@ struct connman_device *connman_inet_create_device(int index)
        case CONNMAN_DEVICE_TYPE_BLUETOOTH:
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_GPS:
-       case CONNMAN_DEVICE_TYPE_HSO:
        case CONNMAN_DEVICE_TYPE_VENDOR:
                name = strdup(devname);
                break;
@@ -500,7 +496,6 @@ struct connman_device *connman_inet_create_device(int index)
                break;
        case CONNMAN_DEVICE_TYPE_CELLULAR:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                mode = CONNMAN_DEVICE_MODE_NETWORK_SINGLE;
                ident = index2ident(index, NULL);
                break;

diff --git a/src/network.c b/src/network.c
index b059b82..0849ed0 100644 (file)
--- a/src/network.c
+++ b/src/network.c
@@ -92,7 +92,6 @@ static const char *type2string(enum connman_network_type type)
                return "bluetooth";
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
                return "cellular";
        }
 
@@ -516,7 +515,6 @@ void connman_network_set_group(struct connman_network *network,
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
                break;
@@ -569,7 +567,6 @@ connman_bool_t __connman_network_get_weakness(struct connman_network *network)
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
        case CONNMAN_NETWORK_TYPE_WIMAX:
                break;
        case CONNMAN_NETWORK_TYPE_WIFI:
@@ -1440,7 +1437,6 @@ static int network_probe(struct connman_element *element)
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
                if (network->group != NULL)
@@ -1472,7 +1468,6 @@ static void network_remove(struct connman_element *element)
        case CONNMAN_NETWORK_TYPE_BLUETOOTH_DUN:
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
        case CONNMAN_NETWORK_TYPE_WIFI:
        case CONNMAN_NETWORK_TYPE_WIMAX:
                if (network->group != NULL) {

diff --git a/src/service.c b/src/service.c
index 7a7d6c8..1ee099d 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1671,7 +1671,6 @@ static connman_bool_t prepare_network(struct connman_service *service)
                break;
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
                connman_network_set_string(service->network,
                                                "Cellular.APN", service->apn);
 
@@ -2258,7 +2257,6 @@ static enum connman_service_type convert_network_type(struct connman_network *ne
                return CONNMAN_SERVICE_TYPE_BLUETOOTH;
        case CONNMAN_NETWORK_TYPE_CELLULAR:
        case CONNMAN_NETWORK_TYPE_MBM:
-       case CONNMAN_NETWORK_TYPE_HSO:
                return CONNMAN_SERVICE_TYPE_CELLULAR;
        }
 

diff --git a/src/udev-compat.c b/src/udev-compat.c
index 1156705..9cb3e6f 100644 (file)
--- a/src/udev-compat.c
+++ b/src/udev-compat.c
@@ -64,7 +64,6 @@ static void detect_newlink(unsigned short type, int index,
        case CONNMAN_DEVICE_TYPE_ETHERNET:
        case CONNMAN_DEVICE_TYPE_WIFI:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                break;
        }
 

diff --git a/src/udev.c b/src/udev.c
index 676fe6f..983ace6 100644 (file)
--- a/src/udev.c
+++ b/src/udev.c
@@ -97,7 +97,6 @@ static void add_net_device(struct udev_device *udev_device)
        case CONNMAN_DEVICE_TYPE_ETHERNET:
        case CONNMAN_DEVICE_TYPE_WIFI:
        case CONNMAN_DEVICE_TYPE_MBM:
-       case CONNMAN_DEVICE_TYPE_HSO:
                break;
        }