mirror of git://git.sysmocom.de/ofono
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.
This commit is contained in:
parent
145112dad2
commit
caad5322f6
18
Makefile.am
18
Makefile.am
|
@ -409,23 +409,23 @@ builtin_sources += plugins/sim900.c
|
||||||
|
|
||||||
if BLUETOOTH
|
if BLUETOOTH
|
||||||
if BLUEZ4
|
if BLUEZ4
|
||||||
builtin_modules += bluetooth
|
builtin_modules += bluez4
|
||||||
builtin_sources += plugins/bluetooth.c plugins/bluetooth.h
|
builtin_sources += plugins/bluez4.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += telit
|
builtin_modules += telit
|
||||||
builtin_sources += plugins/telit.c plugins/bluetooth.h
|
builtin_sources += plugins/telit.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += sap
|
builtin_modules += sap
|
||||||
builtin_sources += plugins/sap.c plugins/bluetooth.h
|
builtin_sources += plugins/sap.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += hfp
|
builtin_modules += hfp_bluez4
|
||||||
builtin_sources += plugins/hfp_hf.c plugins/bluetooth.h
|
builtin_sources += plugins/hfp_hf_bluez4.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += hfp_ag
|
builtin_modules += hfp_ag
|
||||||
builtin_sources += plugins/hfp_ag.c plugins/bluetooth.h
|
builtin_sources += plugins/hfp_ag.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += dun_gw
|
builtin_modules += dun_gw
|
||||||
builtin_sources += plugins/dun_gw.c plugins/bluetooth.h
|
builtin_sources += plugins/dun_gw.c plugins/bluez4.h
|
||||||
|
|
||||||
builtin_modules += connman
|
builtin_modules += connman
|
||||||
builtin_sources += plugins/connman.c
|
builtin_sources += plugins/connman.c
|
||||||
|
@ -750,7 +750,7 @@ if DUNDEE
|
||||||
sbin_PROGRAMS += dundee/dundee
|
sbin_PROGRAMS += dundee/dundee
|
||||||
|
|
||||||
dundee_dundee_SOURCES = $(gdbus_sources) $(gatchat_sources) $(btio_sources) \
|
dundee_dundee_SOURCES = $(gdbus_sources) $(gatchat_sources) $(btio_sources) \
|
||||||
src/log.c src/dbus.c plugins/bluetooth.c \
|
src/log.c src/dbus.c plugins/bluez4.c \
|
||||||
dundee/dundee.h dundee/main.c dundee/dbus.c \
|
dundee/dundee.h dundee/main.c dundee/dbus.c \
|
||||||
dundee/manager.c dundee/device.c dundee/bluetooth.c
|
dundee/manager.c dundee/device.c dundee/bluetooth.c
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
|
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
|
|
||||||
#include "plugins/bluetooth.h"
|
#include "plugins/bluez4.h"
|
||||||
|
|
||||||
#include "dundee.h"
|
#include "dundee.h"
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <ofono/log.h>
|
#include <ofono/log.h>
|
||||||
|
|
||||||
#include <btio.h>
|
#include <btio.h>
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
|
|
||||||
static DBusConnection *connection;
|
static DBusConnection *connection;
|
||||||
static GHashTable *uuid_hash = NULL;
|
static GHashTable *uuid_hash = NULL;
|
||||||
|
@ -985,5 +985,5 @@ void bluetooth_unregister_server(struct server *server)
|
||||||
bluetooth_unref();
|
bluetooth_unref();
|
||||||
}
|
}
|
||||||
|
|
||||||
OFONO_PLUGIN_DEFINE(bluetooth, "Bluetooth Utils Plugins", VERSION,
|
OFONO_PLUGIN_DEFINE(bluez4, "Bluetooth Utils Plugins", VERSION,
|
||||||
OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL)
|
OFONO_PLUGIN_PRIORITY_DEFAULT, NULL, NULL)
|
|
@ -33,7 +33,7 @@
|
||||||
#include <ofono/modem.h>
|
#include <ofono/modem.h>
|
||||||
#include <gdbus.h>
|
#include <gdbus.h>
|
||||||
|
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
|
|
||||||
#define DUN_GW_CHANNEL 1
|
#define DUN_GW_CHANNEL 1
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include <ofono/modem.h>
|
#include <ofono/modem.h>
|
||||||
#include <gdbus.h>
|
#include <gdbus.h>
|
||||||
|
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
|
|
||||||
#define HFP_AG_CHANNEL 13
|
#define HFP_AG_CHANNEL 13
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
#include <drivers/hfpmodem/slc.h>
|
#include <drivers/hfpmodem/slc.h>
|
||||||
|
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
|
|
||||||
#define BLUEZ_GATEWAY_INTERFACE BLUEZ_SERVICE ".HandsfreeGateway"
|
#define BLUEZ_GATEWAY_INTERFACE BLUEZ_SERVICE ".HandsfreeGateway"
|
||||||
|
|
||||||
|
@ -548,5 +548,5 @@ static void hfp_exit(void)
|
||||||
g_hash_table_destroy(modem_hash);
|
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)
|
OFONO_PLUGIN_PRIORITY_DEFAULT, hfp_init, hfp_exit)
|
|
@ -37,7 +37,7 @@
|
||||||
#include <ofono/log.h>
|
#include <ofono/log.h>
|
||||||
#include <ofono/modem.h>
|
#include <ofono/modem.h>
|
||||||
|
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
#ifndef DBUS_TYPE_UNIX_FD
|
#ifndef DBUS_TYPE_UNIX_FD
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
#include <drivers/atmodem/atutil.h>
|
#include <drivers/atmodem/atutil.h>
|
||||||
#include <drivers/atmodem/vendor.h>
|
#include <drivers/atmodem/vendor.h>
|
||||||
|
|
||||||
#include "bluetooth.h"
|
#include "bluez4.h"
|
||||||
|
|
||||||
static const char *none_prefix[] = { NULL };
|
static const char *none_prefix[] = { NULL };
|
||||||
static const char *rsen_prefix[]= { "#RSEN:", NULL };
|
static const char *rsen_prefix[]= { "#RSEN:", NULL };
|
||||||
|
|
Loading…
Reference in New Issue