Rename WiMAX plugin to Intel WiMAX SDK plugin

diff --git a/bootstrap-configure b/bootstrap-configure
index 21a6879..265d881 100755 (executable)
--- a/bootstrap-configure
+++ b/bootstrap-configure
@@ -20,7 +20,6 @@ fi
                --enable-loopback \
                --enable-ethernet \
                --enable-wifi \
-               --enable-wimax \
                --enable-bluetooth \
                --enable-udhcp \
                --enable-dhclient \
@@ -32,5 +31,6 @@ fi
                --enable-ppp \
                --enable-udev \
                --enable-iospm \
+               --enable-iwmxsdk \
                --enable-polkit \
                --enable-client $*

diff --git a/configure.ac b/configure.ac
index ac7de69..09bae92 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,6 @@ if (test "${enable_wifi}" = "yes"); then
 fi
 AM_CONDITIONAL(WIFI, test "${enable_wifi}" = "yes")
 
-AC_ARG_ENABLE(wimax, AC_HELP_STRING([--enable-wimax],
-               [enable WiMAX support]), [enable_wimax=${enableval}])
-AM_CONDITIONAL(WIMAX, test "${enable_wimax}" = "yes")
-
 AC_ARG_ENABLE(bluetooth, AC_HELP_STRING([--enable-bluetooth],
                [enable Bluetooth support]), [enable_bluetooth=${enableval}])
 AM_CONDITIONAL(BLUETOOTH, test "${enable_bluetooth}" = "yes")
@@ -209,6 +205,10 @@ AC_ARG_ENABLE(iospm, AC_HELP_STRING([--enable-iospm],
                [enable Intel OSPM support]), [enable_iospm=${enableval}])
 AM_CONDITIONAL(IOSPM, test "${enable_iospm}" = "yes")
 
+AC_ARG_ENABLE(iwmxsdk, AC_HELP_STRING([--enable-iwmxsdk],
+                [enable Intel WiMAX support]), [enable_iwmxsdk=${enableval}])
+AM_CONDITIONAL(IWMXSDK, test "${enable_iwmxsdk}" = "yes")
+
 AC_ARG_ENABLE(polkit, AC_HELP_STRING([--enable-polkit],
                [enable PolicyKit support]), [enable_polkit=${enableval}])
 if (test "${enable_polkit}" = "yes"); then

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 443b2c1..8e5b98e 100644 (file)
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -22,12 +22,6 @@ wifi_la_SOURCES = wifi.c inet.h inet.c supplicant.h supplicant.c
 wifi_la_LIBADD = @GDBUS_LIBS@
 endif
 
-if WIMAX
-plugin_LTLIBRARIES += wimax.la
-
-wimax_la_SOURCES = wimax.c
-endif
-
 if BLUETOOTH
 plugin_LTLIBRARIES += bluetooth.la
 
@@ -110,6 +104,12 @@ iospm_la_SOURCES = iospm.c
 iospm_la_CFLAGS = $(AM_CFLAGS)
 endif
 
+if IWMXSDK
+plugin_LTLIBRARIES += iwmxsdk.la
+
+iwmxsdk_la_SOURCES = iwmxsdk.c
+endif
+
 if FAKE
 plugin_LTLIBRARIES += fake.la
 

diff --git a/plugins/wimax.c b/plugins/iwmxsdk.c
similarity index 61%
rename from plugins/wimax.c
rename to plugins/iwmxsdk.c
index 1509e74..c30004f 100644 (file)
--- a/plugins/wimax.c
+++ b/plugins/iwmxsdk.c
@@ -28,50 +28,50 @@
 #include <connman/device.h>
 #include <connman/log.h>
 
-static int wimax_probe(struct connman_device *device)
+static int iwmxsdk_probe(struct connman_device *device)
 {
        DBG("device %p", device);
 
        return 0;
 }
 
-static void wimax_remove(struct connman_device *device)
+static void iwmxsdk_remove(struct connman_device *device)
 {
        DBG("device %p", device);
 }
 
-static int wimax_enable(struct connman_device *device)
+static int iwmxsdk_enable(struct connman_device *device)
 {
        DBG("device %p", device);
 
        return 0;
 }
 
-static int wimax_disable(struct connman_device *device)
+static int iwmxsdk_disable(struct connman_device *device)
 {
        DBG("device %p", device);
 
        return 0;
 }
 
-static struct connman_device_driver wimax_driver = {
-       .name           = "wimax",
+static struct connman_device_driver iwmxsdk_driver = {
+       .name           = "iwmxsdk",
        .type           = CONNMAN_DEVICE_TYPE_WIMAX,
-       .probe          = wimax_probe,
-       .remove         = wimax_remove,
-       .enable         = wimax_enable,
-       .disable        = wimax_disable,
+       .probe          = iwmxsdk_probe,
+       .remove         = iwmxsdk_remove,
+       .enable         = iwmxsdk_enable,
+       .disable        = iwmxsdk_disable,
 };
 
-static int wimax_init(void)
+static int iwmxsdk_init(void)
 {
-       return connman_device_driver_register(&wimax_driver);
+       return connman_device_driver_register(&iwmxsdk_driver);
 }
 
-static void wimax_exit(void)
+static void iwmxsdk_exit(void)
 {
-       connman_device_driver_unregister(&wimax_driver);
+       connman_device_driver_unregister(&iwmxsdk_driver);
 }
 
-CONNMAN_PLUGIN_DEFINE(wimax, "WiMAX interface plugin", VERSION,
-               CONNMAN_PLUGIN_PRIORITY_DEFAULT, wimax_init, wimax_exit)
+CONNMAN_PLUGIN_DEFINE(iwmxsdk, "Intel WiMAX interface plugin", VERSION,
+               CONNMAN_PLUGIN_PRIORITY_DEFAULT, iwmxsdk_init, iwmxsdk_exit)