Diffstat (limited to 'libopie2/opiebluez/obluetooth.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiebluez/obluetooth.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp index fbc4f0a..b5df96e 100644 --- a/libopie2/opiebluez/obluetooth.cpp +++ b/libopie2/opiebluez/obluetooth.cpp | |||
@@ -115,4 +115,7 @@ 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) == -1 ) |
117 | { | ||
118 | owarn << "OBluetooth::synchronize() - can't issue HCIGETDEVINFO on device " << i << " (" << strerror( errno ) << ") - skipping that device. " << oendl; | ||
117 | continue; | 119 | continue; |
120 | } | ||
118 | odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; | 121 | odebug << "OBluetooth::synchronize() - found device #" << di.dev_id << oendl; |
@@ -137,2 +140,3 @@ class OBluetoothInterface::Private | |||
137 | OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo ) | 140 | OBluetoothInterface::OBluetoothInterface( QObject* parent, const char* name, void* devinfo ) |
141 | :QObject( parent, name ) | ||
138 | { | 142 | { |
@@ -147,6 +151,9 @@ QString OBluetoothInterface::macAddress() const | |||
147 | { | 151 | { |
148 | char addr[18]; | 152 | return QString().sprintf( "%2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X", |
149 | //ba2str( &d->devinfo.bdaddr, addr); | 153 | d->devinfo.bdaddr.b[5], |
150 | //return addr; | 154 | d->devinfo.bdaddr.b[4], |
151 | return "BLA"; | 155 | d->devinfo.bdaddr.b[3], |
156 | d->devinfo.bdaddr.b[2], | ||
157 | d->devinfo.bdaddr.b[1], | ||
158 | d->devinfo.bdaddr.b[0] ); | ||
152 | } | 159 | } |