summaryrefslogtreecommitdiff
path: root/libopie2/opiebluez/obluetooth.cpp
Unidiff
Diffstat (limited to 'libopie2/opiebluez/obluetooth.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiebluez/obluetooth.cpp13
1 files changed, 4 insertions, 9 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
@@ -42,13 +42,13 @@ using namespace Opie::Core;
42#include <string.h> 42#include <string.h>
43#include <sys/ioctl.h> 43#include <sys/ioctl.h>
44#include <sys/types.h> 44#include <sys/types.h>
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
52 *======================================================================================*/ 52 *======================================================================================*/
53 53
54OBluetooth* OBluetooth::_instance = 0; 54OBluetooth* OBluetooth::_instance = 0;
@@ -112,18 +112,12 @@ void OBluetooth::synchronize()
112 112
113 for ( int i = 0; i < dl->dev_num; ++i ) 113 for ( int i = 0; i < dl->dev_num; ++i )
114 { 114 {
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 }
127} 121}
128 122
129/*====================================================================================== 123/*======================================================================================
@@ -149,13 +143,14 @@ OBluetoothInterface::~OBluetoothInterface()
149{ 143{
150} 144}
151 145
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}
160} 155}
161 156