author | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-07-11 14:05:50 (UTC) |
commit | de58c11168d02f5e52624e68529c9e2eac7978f6 (patch) (unidiff) | |
tree | 8fdaf84de66d55259344ee1708cf753f5162e2b8 /libopie2/opiebluez/obluetooth.cpp | |
parent | 4a7503c5e64101a5fadcf8003e66bf447d796f95 (diff) | |
download | opie-de58c11168d02f5e52624e68529c9e2eac7978f6.zip opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.gz opie-de58c11168d02f5e52624e68529c9e2eac7978f6.tar.bz2 |
don't link to libbluez since this would taint LGPL
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 | |||
@@ -44,9 +44,9 @@ using namespace Opie::Core; | |||
44 | #include <sys/types.h> | 44 | #include <sys/types.h> |
45 | #include <sys/socket.h> | 45 | #include <sys/socket.h> |
46 | 46 | ||
47 | namespace Opie { | 47 | namespace Opie { |
48 | namespace Shower { | 48 | namespace Bluez { |
49 | 49 | ||
50 | /*====================================================================================== | 50 | /*====================================================================================== |
51 | * OBluetooth | 51 | * OBluetooth |
52 | *======================================================================================*/ | 52 | *======================================================================================*/ |
@@ -114,14 +114,8 @@ void OBluetooth::synchronize() | |||
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 | } |
@@ -151,10 +145,11 @@ OBluetoothInterface::~OBluetoothInterface() | |||
151 | 145 | ||
152 | QString OBluetoothInterface::macAddress() const | 146 | 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 | ||
159 | } | 154 | } |
160 | } | 155 | } |