diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-11-26 09:46:42 +0100 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-11-26 09:46:42 +0100 |
commit | 378de73cbf88e5522fe0102c6a913a5ddb55e84c (patch) | |
tree | 02d5f89772a1d2a4f8997146f4331172b06de105 | |
parent | a2601994cd564bb81d2240c98261de17a6b830e4 (diff) | |
download | connman-378de73cbf88e5522fe0102c6a913a5ddb55e84c.tar.gz connman-378de73cbf88e5522fe0102c6a913a5ddb55e84c.tar.bz2 connman-378de73cbf88e5522fe0102c6a913a5ddb55e84c.zip |
Remove empty plugins for Novatel and Huawei modems
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | Makefile.plugins | 16 | ||||
-rwxr-xr-x | bootstrap-configure | 2 | ||||
-rw-r--r-- | configure.ac | 11 | ||||
-rw-r--r-- | plugins/huawei.c | 83 | ||||
-rw-r--r-- | plugins/novatel.c | 83 |
6 files changed, 1 insertions, 196 deletions
diff --git a/Makefile.am b/Makefile.am index 9c04b6b6..8040b060 100644 --- a/Makefile.am +++ b/Makefile.am @@ -154,8 +154,6 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \ --enable-dhclient \ --enable-resolvconf \ --enable-dnsproxy \ - --enable-novatel \ - --enable-huawei \ --enable-hso \ --enable-mbm \ --enable-udev \ diff --git a/Makefile.plugins b/Makefile.plugins index fe98997a..d3f02607 100644 --- a/Makefile.plugins +++ b/Makefile.plugins @@ -87,22 +87,6 @@ plugins_modemmgr_la_LDFLAGS = $(plugin_ldflags) endif endif -if NOVATEL -plugin_LTLIBRARIES += plugins/novatel.la -plugin_objects += $(plugins_novatel_la_OBJECTS) -plugins_novatel_la_SOURCES = plugins/novatel.c plugins/modem.h plugins/modem.c -plugins_novatel_la_CFLAGS = $(plugin_cflags) -plugins_novatel_la_LDFLAGS = $(plugin_ldflags) -endif - -if HUAWEI -plugin_LTLIBRARIES += plugins/huawei.la -plugin_objects += $(plugins_huawei_la_OBJECTS) -plugins_huawei_la_SOURCES = plugins/huawei.c plugins/modem.h plugins/modem.c -plugins_huawei_la_CFLAGS = $(plugin_cflags) -plugins_huawei_la_LDFLAGS = $(plugin_ldflags) -endif - if HSO if HSO_BUILTIN builtin_modules += hso diff --git a/bootstrap-configure b/bootstrap-configure index 674f6e06..706f0431 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -26,8 +26,6 @@ fi --enable-dhclient=builtin \ --enable-resolvconf=builtin \ --enable-dnsproxy=builtin \ - --enable-novatel \ - --enable-huawei \ --enable-hso=builtin \ --enable-mbm=builtin \ --enable-ppp \ diff --git a/configure.ac b/configure.ac index 1cc01c36..f9ce1b65 100644 --- a/configure.ac +++ b/configure.ac @@ -168,14 +168,6 @@ AC_ARG_ENABLE(dnsproxy, AM_CONDITIONAL(DNSPROXY, test "${enable_dnsproxy}" != "no") AM_CONDITIONAL(DNSPROXY_BUILTIN, test "${enable_dnsproxy}" = "builtin") -AC_ARG_ENABLE(novatel, AC_HELP_STRING([--enable-novatel], - [enable Novatel support]), [enable_novatel=${enableval}]) -AM_CONDITIONAL(NOVATEL, test "${enable_novatel}" = "yes") - -AC_ARG_ENABLE(huawei, AC_HELP_STRING([--enable-huawei], - [enable HUAWEI support]), [enable_huawei=${enableval}]) -AM_CONDITIONAL(HUAWEI, test "${enable_huawei}" = "yes") - AC_ARG_ENABLE(hso, AC_HELP_STRING([--enable-hso], [enable HSO support]), [enable_hso=${enableval}], [enable_hso="no"]) @@ -193,8 +185,7 @@ AC_ARG_WITH(pppd, AC_HELP_STRING([--with-pppd=PROGRAM], AC_ARG_ENABLE(ppp, AC_HELP_STRING([--enable-ppp], [enable PPP support]), [enable_ppp=${enableval}]) -if (test "${enable_ppp}" = "yes" || test "${enable_novatel}" = "yes" || - test "${enable_huawei}" = "yes"); then +if (test "${enable_ppp}" = "yes"); then if (test -z "${path_pppd}"); then AC_PATH_PROG(PPPD, [pppd], [], $PATH:/sbin:/usr/sbin) else diff --git a/plugins/huawei.c b/plugins/huawei.c deleted file mode 100644 index c1a2c0d5..00000000 --- a/plugins/huawei.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2009 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 - -#define CONNMAN_API_SUBJECT_TO_CHANGE -#include <connman/plugin.h> -#include <connman/device.h> -#include <connman/log.h> - -#include "modem.h" - -static int huawei_probe(struct connman_device *device) -{ - DBG("device %p", device); - - return 0; -} - -static void huawei_remove(struct connman_device *device) -{ - DBG("device %p", device); -} - -static int huawei_enable(struct connman_device *device) -{ - DBG("device %p", device); - - connman_device_set_powered(device, TRUE); - - return 0; -} - -static int huawei_disable(struct connman_device *device) -{ - DBG("device %p", device); - - connman_device_set_powered(device, FALSE); - - return 0; -} - -static struct connman_device_driver huawei_driver = { - .name = "huawei", - .type = CONNMAN_DEVICE_TYPE_HUAWEI, - .probe = huawei_probe, - .remove = huawei_remove, - .enable = huawei_enable, - .disable = huawei_disable, -}; - -static int huawei_init(void) -{ - return connman_device_driver_register(&huawei_driver); -} - -static void huawei_exit(void) -{ - connman_device_driver_unregister(&huawei_driver); -} - -CONNMAN_PLUGIN_DEFINE(huawei, "HUAWEI Mobile device plugin", VERSION, - CONNMAN_PLUGIN_PRIORITY_DEFAULT, huawei_init, huawei_exit) diff --git a/plugins/novatel.c b/plugins/novatel.c deleted file mode 100644 index 4c0c9aac..00000000 --- a/plugins/novatel.c +++ /dev/null @@ -1,83 +0,0 @@ -/* - * - * Connection Manager - * - * Copyright (C) 2007-2009 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 - -#define CONNMAN_API_SUBJECT_TO_CHANGE -#include <connman/plugin.h> -#include <connman/device.h> -#include <connman/log.h> - -#include "modem.h" - -static int novatel_probe(struct connman_device *device) -{ - DBG("device %p", device); - - return 0; -} - -static void novatel_remove(struct connman_device *device) -{ - DBG("device %p", device); -} - -static int novatel_enable(struct connman_device *device) -{ - DBG("device %p", device); - - connman_device_set_powered(device, TRUE); - - return 0; -} - -static int novatel_disable(struct connman_device *device) -{ - DBG("device %p", device); - - connman_device_set_powered(device, FALSE); - - return 0; -} - -static struct connman_device_driver novatel_driver = { - .name = "novatel", - .type = CONNMAN_DEVICE_TYPE_NOVATEL, - .probe = novatel_probe, - .remove = novatel_remove, - .enable = novatel_enable, - .disable = novatel_disable, -}; - -static int novatel_init(void) -{ - return connman_device_driver_register(&novatel_driver); -} - -static void novatel_exit(void) -{ - connman_device_driver_unregister(&novatel_driver); -} - -CONNMAN_PLUGIN_DEFINE(novatel, "Novatel Wireless device plugin", VERSION, - CONNMAN_PLUGIN_PRIORITY_DEFAULT, novatel_init, novatel_exit) |