summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-07-14 14:17:46 (UTC)
committer mickeyl <mickeyl>2005-07-14 14:17:46 (UTC)
commit72224480ec012cf8d68608aea5a1b035f4d16895 (patch) (unidiff)
tree104feb22de493fd96823b10e318f0160cc97e68f
parent237cf3ec5134e299a9da0ce7deb533383f3d11f0 (diff)
downloadopie-72224480ec012cf8d68608aea5a1b035f4d16895.zip
opie-72224480ec012cf8d68608aea5a1b035f4d16895.tar.gz
opie-72224480ec012cf8d68608aea5a1b035f4d16895.tar.bz2
- add device class
- first bits at inquiry
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiebluez/obluetooth.cpp57
-rw-r--r--libopie2/opiebluez/obluetooth.h40
2 files changed, 96 insertions, 1 deletions
diff --git a/libopie2/opiebluez/obluetooth.cpp b/libopie2/opiebluez/obluetooth.cpp
index c99a822..e0ba0ec 100644
--- a/libopie2/opiebluez/obluetooth.cpp
+++ b/libopie2/opiebluez/obluetooth.cpp
@@ -39,2 +39,3 @@ using namespace Opie::Core;
39#include <bluetooth/hci_lib.h> 39#include <bluetooth/hci_lib.h>
40#include <assert.h>
40#include <errno.h> 41#include <errno.h>
@@ -42,2 +43,3 @@ using namespace Opie::Core;
42#include <string.h> 43#include <string.h>
44#include <unistd.h>
43#include <sys/ioctl.h> 45#include <sys/ioctl.h>
@@ -191,4 +193,59 @@ bool OBluetoothInterface::isUp() const
191 193
194OBluetoothInterface::DeviceIterator OBluetoothInterface::neighbourhood()
195{
196 _devices.clear();
197 struct hci_inquiry_req* ir;
198 int nrsp = 255;
199
200 char* mybuffer = static_cast<char*>( malloc( sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) ) );
201 assert( mybuffer );
202
203 ir = (struct hci_inquiry_req*) mybuffer;
204 memset( ir, 0, sizeof( *ir ) + ( sizeof( inquiry_info ) * (nrsp) ) );
205
206 ir->dev_id = d->devinfo.dev_id;
207 ir->num_rsp = nrsp;
208 ir->length = 8;
209 ir->flags = 0;
210 ir->lap[0] = 0x33;
211 ir->lap[1] = 0x8b;
212 ir->lap[2] = 0x9e;
213
214 int result = ::ioctl( d->ctlfd, HCIINQUIRY, mybuffer );
215 if ( result == -1 )
216 {
217 owarn << "OBluetoothInterface::neighbourhood() - can't issue HCIINQUIRY (" << strerror( errno ) << ")" << oendl;
218 return DeviceIterator( _devices );
219 }
220
221 for( int i = 0; i < ir->num_rsp; ++i )
222 {
223 odebug << "found a device" << oendl;
224 }
225
226 return DeviceIterator( _devices );
192} 227}
228
229
230/*======================================================================================
231 * OBluetoothDevice
232 *======================================================================================*/
233
234OBluetoothDevice::OBluetoothDevice( QObject* parent, const char* name )
235 :QObject( parent, name )
236{
237 odebug << "OBluetoothDevice::OBluetoothDevice() - '" << name << "'" << oendl;
238}
239
240OBluetoothDevice::~OBluetoothDevice()
241{
242 odebug << "OBluetoothDevice::~OBluetoothDevice()" << oendl;
193} 243}
194 244
245QString OBluetoothDevice::macAddress() const
246{
247 return "N/A";
248}
249
250}
251}
diff --git a/libopie2/opiebluez/obluetooth.h b/libopie2/opiebluez/obluetooth.h
index 4423a55..ee4a90d 100644
--- a/libopie2/opiebluez/obluetooth.h
+++ b/libopie2/opiebluez/obluetooth.h
@@ -39,2 +39,3 @@ namespace Bluez {
39class OBluetoothInterface; 39class OBluetoothInterface;
40class OBluetoothDevice;
40 41
@@ -106,3 +107,3 @@ class OBluetooth : public QObject
106 * 107 *
107 * This class provides a wrapper for an infrared interface. All the cumbersome details of 108 * This class provides a wrapper for a bluetooth HCI device. All the cumbersome details of
108 * Linux ioctls are hidden under a convenient high-level interface. 109 * Linux ioctls are hidden under a convenient high-level interface.
@@ -115,2 +116,7 @@ class OBluetoothInterface : public QObject
115{ 116{
117 Q_OBJECT
118 public:
119 typedef QDict<OBluetoothDevice> DeviceMap;
120 typedef QDictIterator<OBluetoothDevice> DeviceIterator;
121
116 public: 122 public:
@@ -137,4 +143,9 @@ class OBluetoothInterface : public QObject
137 bool isUp() const; 143 bool isUp() const;
144 /**
145 * @returns an iterator usable for iterating through the devices in range
146 */
147 DeviceIterator neighbourhood();
138 148
139 private: 149 private:
150 DeviceMap _devices;
140 class Private; 151 class Private;
@@ -143,3 +154,30 @@ class OBluetoothInterface : public QObject
143 154
155/*======================================================================================
156 * OBluetoothDevice
157 *======================================================================================*/
158
159/**
160 * @brief An bluetooth (remote) device abstraction.
161 *
162 * This class resembles a (remote) bluetooth device.
163 * @author Michael 'Mickey' Lauer <mickey@vanille.de>
164 */
165class OBluetoothDevice : public QObject
166{
167 Q_OBJECT
144 168
169 public:
170 /**
171 * Constructor.
172 */
173 OBluetoothDevice( QObject* parent, const char* name );
174 /**
175 * Destructor.
176 */
177 virtual ~OBluetoothDevice();
178 /**
179 * @returns the MAC address of the device's interface
180 */
181 QString macAddress() const;
182};
145 183