From 8a1bd0d6570951f69949f9c9cf1a12e8aab63453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Danis?= Date: Tue, 12 Mar 2013 14:01:29 +0100 Subject: [PATCH] bluetooth: Rename DUN GW plugin As BlueZ 5 introduced backwards incompatible API changes, and we want to keep support for BlueZ 4 based DUN GW plugin for some time, we need to separate DUN GW plugin which is based on BlueZ 4 from the one based on BlueZ 5. The dun_gw.c plugin is renamed to dun_gw_bluez4. This will make it easy to add a DUN GW plugin for BlueZ 5. --- Makefile.am | 4 ++-- plugins/{dun_gw.c => dun_gw_bluez4.c} | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) rename plugins/{dun_gw.c => dun_gw_bluez4.c} (96%) diff --git a/Makefile.am b/Makefile.am index 3b998af7..bf4806b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -425,8 +425,8 @@ builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h builtin_modules += hfp_ag_bluez4 builtin_sources += plugins/hfp_ag_bluez4.c plugins/bluez4.h -builtin_modules += dun_gw -builtin_sources += plugins/dun_gw.c plugins/bluez4.h +builtin_modules += dun_gw_bluez4 +builtin_sources += plugins/dun_gw_bluez4.c plugins/bluez4.h builtin_modules += connman builtin_sources += plugins/connman.c diff --git a/plugins/dun_gw.c b/plugins/dun_gw_bluez4.c similarity index 96% rename from plugins/dun_gw.c rename to plugins/dun_gw_bluez4.c index fc8bde43..a1de7a47 100644 --- a/plugins/dun_gw.c +++ b/plugins/dun_gw_bluez4.c @@ -167,5 +167,6 @@ static void dun_gw_exit(void) } } -OFONO_PLUGIN_DEFINE(dun_gw, "Dial-up Networking Profile Plugins", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, dun_gw_init, dun_gw_exit) +OFONO_PLUGIN_DEFINE(dun_gw_bluez4, "Dial-up Networking Profile Plugins", + VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT, + dun_gw_init, dun_gw_exit)