diff options
| author | Claudio Takahasi <claudio.takahasi@openbossa.org> | 2013-01-16 10:31:27 -0300 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2013-01-16 13:37:23 -0600 |
| commit | caad5322f6117ab53bacc5d1999b055f7839beab (patch) | |
| tree | 810492d01e6b16eaf7f953b33d480d927d7add84 /plugins | |
| parent | 145112dad26f79c8d8eaa9f0f1411a49b6fb7001 (diff) | |
| download | ofono-caad5322f6117ab53bacc5d1999b055f7839beab.tar.bz2 | |
bluetooth: Rename bluetooth plugins
As BlueZ 5 introduced backwards incompatible API changes, and we want to
keep support for BlueZ 4 based plugins for some time, we need to separate
the plugins that are based on BlueZ 4 from the ones based on BlueZ 5.
The bluetooth.c plugin has now been renamed to bluez4.c and the hfp_hf.c
plugin is renamed to hfp_hf_bluez4. This will make it easy to add a
HFP HF plugin for BlueZ 5.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/bluez4.c (renamed from plugins/bluetooth.c) | 6 | ||||
| -rw-r--r-- | plugins/bluez4.h (renamed from plugins/bluetooth.h) | 0 | ||||
| -rw-r--r-- | plugins/dun_gw.c | 2 | ||||
| -rw-r--r-- | plugins/hfp_ag.c | 2 | ||||
| -rw-r--r-- | plugins/hfp_hf_bluez4.c (renamed from plugins/hfp_hf.c) | 4 | ||||
| -rw-r--r-- | plugins/sap.c | 2 | ||||
| -rw-r--r-- | plugins/telit.c | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/plugins/bluetooth.c b/plugins/bluez4.c index 5d28530e..6a29d9fa 100644 --- a/plugins/bluetooth.c +++ b/plugins/bluez4.c @@ -37,7 +37,7 @@ #include <ofono/log.h> #include <btio.h> -#include "bluetooth.h" +#include "bluez4.h" static DBusConnection *connection; static GHashTable *uuid_hash = NULL; @@ -985,5 +985,5 @@ void bluetooth_unregister_server(struct server *server) bluetooth_unref(); } -OFONO_PLUGIN_DEFINE(bluetooth, "Bluetooth Utils Plugins", VERSION, - OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL) +OFONO_PLUGIN_DEFINE(bluez4, "Bluetooth Utils Plugins", VERSION, + OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL) diff --git a/plugins/bluetooth.h b/plugins/bluez4.h index 4fc16adf..4fc16adf 100644 --- a/plugins/bluetooth.h +++ b/plugins/bluez4.h diff --git a/plugins/dun_gw.c b/plugins/dun_gw.c index 75b62ebf..fc8bde43 100644 --- a/plugins/dun_gw.c +++ b/plugins/dun_gw.c @@ -33,7 +33,7 @@ #include <ofono/modem.h> #include <gdbus.h> -#include "bluetooth.h" +#include "bluez4.h" #define DUN_GW_CHANNEL 1 diff --git a/plugins/hfp_ag.c b/plugins/hfp_ag.c index c2d1d306..12374ad8 100644 --- a/plugins/hfp_ag.c +++ b/plugins/hfp_ag.c @@ -33,7 +33,7 @@ #include <ofono/modem.h> #include <gdbus.h> -#include "bluetooth.h" +#include "bluez4.h" #define HFP_AG_CHANNEL 13 diff --git a/plugins/hfp_hf.c b/plugins/hfp_hf_bluez4.c index 7c500e36..450c183e 100644 --- a/plugins/hfp_hf.c +++ b/plugins/hfp_hf_bluez4.c @@ -47,7 +47,7 @@ #include <drivers/hfpmodem/slc.h> -#include "bluetooth.h" +#include "bluez4.h" #define BLUEZ_GATEWAY_INTERFACE BLUEZ_SERVICE ".HandsfreeGateway" @@ -548,5 +548,5 @@ static void hfp_exit(void) g_hash_table_destroy(modem_hash); } -OFONO_PLUGIN_DEFINE(hfp, "Hands-Free Profile Plugins", VERSION, +OFONO_PLUGIN_DEFINE(hfp_bluez4, "Hands-Free Profile Plugins", VERSION, OFONO_PLUGIN_PRIORITY_DEFAULT, hfp_init, hfp_exit) diff --git a/plugins/sap.c b/plugins/sap.c index d893bc12..d1913fb5 100644 --- a/plugins/sap.c +++ b/plugins/sap.c @@ -37,7 +37,7 @@ #include <ofono/log.h> #include <ofono/modem.h> -#include "bluetooth.h" +#include "bluez4.h" #include "util.h" #ifndef DBUS_TYPE_UNIX_FD diff --git a/plugins/telit.c b/plugins/telit.c index 79bc4219..392283aa 100644 --- a/plugins/telit.c +++ b/plugins/telit.c @@ -58,7 +58,7 @@ #include <drivers/atmodem/atutil.h> #include <drivers/atmodem/vendor.h> -#include "bluetooth.h" +#include "bluez4.h" static const char *none_prefix[] = { NULL }; static const char *rsen_prefix[]= { "#RSEN:", NULL }; |