Diffstat (limited to 'libopie2/opiebluez/obluetooth.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 13 |
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 | |||
@@ -46,5 +46,5 @@ using namespace Opie::Core; | |||
46 | 46 | ||
47 | namespace Opie { | 47 | namespace Opie { |
48 | namespace Shower { | 48 | namespace Bluez { |
49 | 49 | ||
50 | /*====================================================================================== | 50 | /*====================================================================================== |
@@ -116,10 +116,4 @@ void OBluetooth::synchronize() | |||
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 ) ); |
@@ -153,6 +147,7 @@ QString 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 | ||