summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-11 14:05:50 (UTC)
committer mickeyl <mickeyl>2005-07-11 14:05:50 (UTC)
commitde58c11168d02f5e52624e68529c9e2eac7978f6 (patch) (unidiff)
tree8fdaf84de66d55259344ee1708cf753f5162e2b8
parent4a7503c5e64101a5fadcf8003e66bf447d796f95 (diff)
downloadopie-de58c11168d02f5e52624e68529c9e2eac7978f6.zip
opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.gz
opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.bz2
don't link to libbluez since this would taint LGPL
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiebluez/obluetooth.cpp13
-rw-r--r--libopie2/opiebluez/obluetooth.h2
-rw-r--r--libopie2/opiebluez/opiebluez.pro6
3 files changed, 6 insertions, 15 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
index a161f86..fbc4f0a 100644
--- a/libopie2/opiebluez/obluetooth.cpp
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -45,7 +45,7 @@ using namespace Opie::Core;
45#include <sys/socket.h> 45#include <sys/socket.h>
46 46
47namespace Opie { 47namespace Opie {
48namespace Shower { 48namespace Bluez {
49 49
50/*====================================================================================== 50/*======================================================================================
51 * OBluetooth 51 * OBluetooth
@@ -115,12 +115,6 @@ void OBluetooth::synchronize()
115 di.dev_id = ( dr + i )->dev_id; 115 di.dev_id = ( dr + i )->dev_id;
116 if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) < 0 ) 116 if ( ioctl( _fd, HCIGETDEVINFO, (void *) &di) < 0 )
117 continue; 117 continue;
118 if ( hci_test_bit(HCI_RAW, &di.flags) && !bacmp(&di.bdaddr, BDADDR_ANY))
119 {
120 int dd = hci_open_dev(di.dev_id);
121 hci_read_bd_addr(dd, &di.bdaddr, 1000);
122 hci_close_dev(dd);
123 }
124 odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; 118 odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl;
125 _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di ) ); 119 _interfaces.insert( di.name, new OBluetoothInterface( this, di.name, (void*) &di ) );
126 } 120 }
@@ -152,8 +146,9 @@ OBluetoothInterface::~OBluetoothInterface()
152QString OBluetoothInterface::macAddress() const 146QString OBluetoothInterface::macAddress() const
153{ 147{
154 char addr[18]; 148 char addr[18];
155 ba2str( &d->devinfo.bdaddr, addr); 149 //ba2str( &d->devinfo.bdaddr, addr);
156 return addr; 150 //return addr;
151 return "BLA";
157} 152}
158 153
159} 154}
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
index 30fdd18..10c8c49 100644
--- a/libopie2/opiebluez/obluetooth.h
+++ b/libopie2/opiebluez/obluetooth.h
@@ -34,7 +34,7 @@
34#include <qdict.h> 34#include <qdict.h>
35 35
36namespace Opie { 36namespace Opie {
37namespace Shower { 37namespace Bluez {
38 38
39class OBluetoothInterface; 39class OBluetoothInterface;
40 40
diff --git a/libopie2/opiebluez/opiebluez.pro b/libopie2/opiebluez/opiebluez.pro
index 6a37dee..8a52928 100644
--- a/libopie2/opiebluez/opiebluez.pro
+++ b/libopie2/opiebluez/opiebluez.pro
@@ -8,7 +8,7 @@ TARGET = opiebluez2
8VERSION = 0.0.0 8VERSION = 0.0.0
9INCLUDEPATH += $(OPIEDIR)/include 9INCLUDEPATH += $(OPIEDIR)/include
10DEPENDPATH += $(OPIEDIR)/include 10DEPENDPATH += $(OPIEDIR)/include
11LIBS += -lopiecore2 -lbluetooth 11LIBS += -lopiecore2
12 12
13!contains( platform, x11 ) { 13!contains( platform, x11 ) {
14 include( $(OPIEDIR)/include.pro ) 14 include( $(OPIEDIR)/include.pro )
@@ -21,7 +21,3 @@ contains( platform, x11 ) {
21!isEmpty( LIBBLUEZ_INC_DIR ) { 21!isEmpty( LIBBLUEZ_INC_DIR ) {
22 INCLUDEPATH = $$LIBBLUEZ_INC_DIR $$INCLUDEPATH 22 INCLUDEPATH = $$LIBBLUEZ_INC_DIR $$INCLUDEPATH
23} 23}
24!isEmpty( LIBBLUEZ_LIB_DIR ) {
25 LIBS = -L$$LIBBLUEZ_LIB_DIR $$LIBS
26}
27