summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2007-05-08 18:10:40 +0000
committerMarcel Holtmann <marcel@holtmann.org>2007-05-08 18:10:40 +0000
commit7e1400ac4c259b464d8f0d4c30abf2ee59f3f664 (patch)
tree579ef30a72ffa4520ddc3902531f98e73fd658d4
parent0416abb5d66e9f362f868ab44757728b445f9a0f (diff)
Don't compile in RFCOMM interface support
-rw-r--r--hcid/Makefile.am2
-rw-r--r--hcid/dbus-common.c1
-rw-r--r--hcid/dbus-hci.c6
3 files changed, 1 insertions, 8 deletions
diff --git a/hcid/Makefile.am b/hcid/Makefile.am
index 0081899d..13e2b256 100644
--- a/hcid/Makefile.am
+++ b/hcid/Makefile.am
@@ -18,7 +18,7 @@ libhciserver_a_SOURCES = hcid.h security.c device.c \
dbus-database.c dbus-database.h dbus-security.c dbus-security.h \
dbus-adapter.c dbus-adapter.h dbus-device.c dbus-device.h \
dbus-service.c dbus-service.h dbus-sdp.c dbus-sdp.h \
- dbus-rfcomm.c dbus-rfcomm.h dbus-test.c dbus-test.h
+ dbus-test.c dbus-test.h
if HCID
sbin_PROGRAMS = hcid
diff --git a/hcid/dbus-common.c b/hcid/dbus-common.c
index a7b733cf..5e7d0888 100644
--- a/hcid/dbus-common.c
+++ b/hcid/dbus-common.c
@@ -59,7 +59,6 @@
#include "dbus-database.h"
#include "dbus-security.h"
#include "dbus-test.h"
-#include "dbus-rfcomm.h"
#include "dbus-sdp.h"
#include "dbus-common.h"
diff --git a/hcid/dbus-hci.c b/hcid/dbus-hci.c
index 1da7ab31..c0e3b5f3 100644
--- a/hcid/dbus-hci.c
+++ b/hcid/dbus-hci.c
@@ -50,7 +50,6 @@
#include "dbus-common.h"
#include "dbus-error.h"
#include "dbus-test.h"
-#include "dbus-rfcomm.h"
#include "dbus-security.h"
#include "dbus-service.h"
#include "dbus-manager.h"
@@ -487,11 +486,6 @@ int hcid_dbus_register_device(uint16_t id)
goto failed;
}
- if (!rfcomm_init(connection, path)) {
- error("RFCOMM interface init failed");
- goto failed;
- }
-
/*
* Send the adapter added signal
*/