Skip to contentSkip to conversation

bluetooth: Rename DUN GW plugin

PATCH Superseded Frédéric Danis 2 participants 3 messages Mar 12, 2013 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 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%)
Makefile.am +2 -2
index 3b998af..bf4806b 100644
@@ -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
plugins/dun_gw_bluez4.c renamed from plugins/dun_gw.c +3 -2
similarity index 96%
rename from plugins/dun_gw.c
rename to plugins/dun_gw_bluez4.c
index fc8bde4..a1de7a4 100644
@@ -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)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 2/2 dun_gw: Add BlueZ 5 version

This patch adds initial implementation of the D-Bus Profile1 interface and methods responsible for handling Bluetooth connections.

The DUN GW profile interface is registered as soon as a GPRS capable modem is registered in oFono.

---
 Makefile.am             |    3 +
 plugins/bluez5.h        |    1 +
 plugins/dun_gw_bluez5.c |  235 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 239 insertions(+)
 create mode 100644 plugins/dun_gw_bluez5.c
Makefile.am +3 -0
index bf4806b..ebe20bd 100644
@@ -443,6 +443,9 @@ builtin_sources += plugins/hfp_hf_bluez5.c plugins/bluez5.h
 
 builtin_modules += hfp_ag_bluez5
 builtin_sources += plugins/hfp_ag_bluez5.c plugins/bluez5.h
+
+builtin_modules += dun_gw_bluez5
+builtin_sources += plugins/dun_gw_bluez5.c plugins/bluez5.h
 endif
 endif
 endif
plugins/bluez5.h +1 -0
index 573a54c..5b8c1f5 100644
@@ -25,6 +25,7 @@
 #define BLUEZ_DEVICE_INTERFACE		BLUEZ_SERVICE ".Device1"
 #define BLUEZ_ERROR_INTERFACE		BLUEZ_SERVICE ".Error"
 
+#define DUN_GW_UUID	"00001103-0000-1000-8000-00805f9b34fb"
 #define HFP_HS_UUID	"0000111e-0000-1000-8000-00805f9b34fb"
 #define HFP_AG_UUID	"0000111f-0000-1000-8000-00805f9b34fb"
 
plugins/dun_gw_bluez5.c new file +235 -0

235 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#2 lore raw

Re: [PATCH 2/2] dun_gw: Add BlueZ 5 version

plugins/dun_gw_bluez5.c line 4

Quoted 10 lines
plugins/dun_gw_bluez5.c new file +4 -0
new file mode 100644
index 0000000..902df32
@@ -0,0 +1,235 @@
+/*
+ *  oFono - Open Source Telephony
+ *
+ *  Copyright (C) 2011  Intel Corporation. All rights reserved.

2013?