From 7e1400ac4c259b464d8f0d4c30abf2ee59f3f664 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Tue, 8 May 2007 18:10:40 +0000
Subject: Don't compile in RFCOMM interface support

---
 hcid/Makefile.am   | 2 +-
 hcid/dbus-common.c | 1 -
 hcid/dbus-hci.c    | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

(limited to 'hcid')

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
 	 */
-- 
cgit