diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | config.tests/btapi10_2_1/btapi10_2_1.pro | 7 | ||||
| -rw-r--r-- | config.tests/btapi10_2_1/main.cpp | 53 | ||||
| -rw-r--r-- | qtconnectivity.pro | 2 | ||||
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 5 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_p.h | 5 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp | 123 |
7 files changed, 194 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 2f09a2ba..16328b7d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.2.0 +MODULE_VERSION = 5.3.0 diff --git a/config.tests/btapi10_2_1/btapi10_2_1.pro b/config.tests/btapi10_2_1/btapi10_2_1.pro new file mode 100644 index 00000000..0ad7b88a --- /dev/null +++ b/config.tests/btapi10_2_1/btapi10_2_1.pro @@ -0,0 +1,7 @@ +TEMPLATE = app + +TARGET = blackberry + +LIBS += -lbtapi + +SOURCES += main.cpp diff --git a/config.tests/btapi10_2_1/main.cpp b/config.tests/btapi10_2_1/main.cpp new file mode 100644 index 00000000..7f8bed3e --- /dev/null +++ b/config.tests/btapi10_2_1/main.cpp @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtConnectivity module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <btapi/btdevice.h> + +static void callback( bt_sdp_list_t *result, void *user_data, uint8_t error) +{ + +} + +int main() +{ + bt_rdev_sdp_search_async( 0, 0, &callback, 0 ); + return 0; +} diff --git a/qtconnectivity.pro b/qtconnectivity.pro index 8fd93a28..40663d70 100644 --- a/qtconnectivity.pro +++ b/qtconnectivity.pro @@ -1,4 +1,4 @@ load(configure) qtCompileTest(bluez) - +qtCompileTest(btapi10_2_1) load(qt_parts) diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index ebf6f500..7c9f9f00 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -77,6 +77,11 @@ config_bluez:qtHaveModule(dbus) { include(qnx/qnx.pri) + config_btapi10_2_1 { + DEFINES += QT_QNX_BT_BLUETOOTH + LIBS += -lbtapi + } + PRIVATE_HEADERS += \ qbluetoothtransferreply_qnx_p.h diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_p.h b/src/bluetooth/qbluetoothservicediscoveryagent_p.h index 517f6a98..0691b490 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothservicediscoveryagent_p.h @@ -64,6 +64,7 @@ QT_END_NAMESPACE #include <fcntl.h> #include <unistd.h> #include <QTimer> +#include <btapi/btdevice.h> #endif QT_BEGIN_NAMESPACE @@ -125,11 +126,15 @@ private Q_SLOTS: void controlReply(ppsResult result); void controlEvent(ppsResult result); void queryTimeout(); +#ifdef QT_QNX_BT_BLUETOOTH + static void deviceServicesDiscoveryCallback(bt_sdp_list_t *, void *, uint8_t); +#endif private: int m_rdfd; QSocketNotifier *rdNotifier; QTimer m_queryTimer; + bool m_btInitialized; #endif public: diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp index 2ea847e6..319e631f 100644 --- a/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp +++ b/src/bluetooth/qbluetoothservicediscoveryagent_qnx.cpp @@ -49,6 +49,10 @@ #include "qbluetoothuuid.h" #include <sys/pps.h> +#ifdef QT_QNX_BT_BLUETOOTH +#include <errno.h> +#include <QPointer> +#endif #include <QFile> @@ -56,13 +60,85 @@ QT_BEGIN_NAMESPACE +#ifdef QT_QNX_BT_BLUETOOTH +void QBluetoothServiceDiscoveryAgentPrivate::deviceServicesDiscoveryCallback(bt_sdp_list_t *result, void *user_data, uint8_t error) +{ + if (error != 0) + qWarning() << "Error received in callback: " << errno << strerror(errno); + QPointer<QBluetoothServiceDiscoveryAgentPrivate> *classPointer = static_cast<QPointer<QBluetoothServiceDiscoveryAgentPrivate> *>(user_data); + if (classPointer->isNull()) { + qBBBluetoothDebug() << "Pointer received in callback is null"; + return; + } + QBluetoothServiceDiscoveryAgentPrivate *p = classPointer->data(); + if ( result == 0) { + qBBBluetoothDebug() << "Result received in callback is null."; + p->errorString = QBluetoothServiceDiscoveryAgent::tr("Result received in callback is null."); + p->error = QBluetoothServiceDiscoveryAgent::InputOutputError; + p->q_ptr->error(p->error); + p->_q_serviceDiscoveryFinished(); + return; + } + + for (int i = 0; i < result->num_records; i++) { + bt_sdp_record_t rec = result->record[i]; + QBluetoothServiceInfo serviceInfo; + serviceInfo.setDevice(p->discoveredDevices.at(0)); + serviceInfo.setServiceName(rec.name); + serviceInfo.setServiceDescription(rec.description); + //serviceInfo.setServiceAvailability(rec.availability); + serviceInfo.setServiceProvider(QString(rec.provider)); + QBluetoothServiceInfo::Sequence protocolDescriptorList; + for ( int j = 0; j < rec.num_protocol; j++) { + bt_sdp_prot_t protoc = rec.protocol[j]; + QString protocolUuid(protoc.uuid); + protocolUuid = QStringLiteral("0x") + protocolUuid; + QBluetoothUuid pUuid(protocolUuid.toUShort(0,0)); + protocolDescriptorList << QVariant::fromValue(pUuid); + for ( int k = 0; k < 2; k++) + protocolDescriptorList << QVariant::fromValue(QString::fromLatin1(protoc.parm[k])); + } + serviceInfo.setAttribute(QBluetoothServiceInfo::ProtocolDescriptorList, protocolDescriptorList); + qBBBluetoothDebug() << "Service name " << rec.name << " Description: " << rec.description << "uuid " << rec.serviceId << "provider: " << rec.provider; + qBBBluetoothDebug() << "num protocol " << rec.num_protocol << "record handle " << rec.record_handle << "class id" << rec.num_classId << "availability " << rec.availability << rec.num_language; + + QList<QBluetoothUuid> serviceClassId; + + for (int j = 0; j < rec.num_classId; j++) { + bt_sdp_class_t uuid = rec.classId[j]; + qBBBluetoothDebug() << "uuid: " << uuid.uuid; + QString protocolUuid(uuid.uuid); + protocolUuid = QStringLiteral("0x") + protocolUuid; + QBluetoothUuid Uuid(protocolUuid.toUShort(0,0)); + if (j == 0) { + serviceInfo.setServiceUuid(Uuid); + //Check if the UUID is in the uuidFilter + if (!p->uuidFilter.isEmpty() && !p->uuidFilter.contains(Uuid)) + continue; + } + serviceClassId << Uuid; + } + serviceInfo.setAttribute(QBluetoothServiceInfo::ServiceClassIds, QVariant::fromValue(serviceClassId)); + serviceInfo.setAttribute(QBluetoothServiceInfo::BrowseGroupList, + QBluetoothUuid(QBluetoothUuid::PublicBrowseGroup)); + p->q_ptr->serviceDiscovered(serviceInfo); + } + p->_q_serviceDiscoveryFinished(); + //delete p; + //delete classPointer; +} +#endif + QBluetoothServiceDiscoveryAgentPrivate::QBluetoothServiceDiscoveryAgentPrivate(const QBluetoothAddress &deviceAdapter) - : m_rdfd(-1), rdNotifier(0), error(QBluetoothServiceDiscoveryAgent::NoError), deviceAddress(deviceAdapter), state(Inactive), + : m_rdfd(-1), rdNotifier(0), m_btInitialized(false), error(QBluetoothServiceDiscoveryAgent::NoError), deviceAddress(deviceAdapter), state(Inactive), deviceDiscoveryAgent(0), mode(QBluetoothServiceDiscoveryAgent::MinimalDiscovery) { ppsRegisterControl(); connect(&m_queryTimer, SIGNAL(timeout()), this, SLOT(queryTimeout())); ppsRegisterForEvent(QStringLiteral("service_updated"), this); + //Needed for connecting signals and slots from static function + qRegisterMetaType<QBluetoothServiceInfo>("QBluetoothServiceInfo"); + qRegisterMetaType<QBluetoothServiceDiscoveryAgent::Error>("QBluetoothServiceDiscoveryAgent::Error"); } QBluetoothServiceDiscoveryAgentPrivate::~QBluetoothServiceDiscoveryAgentPrivate() @@ -74,6 +150,50 @@ QBluetoothServiceDiscoveryAgentPrivate::~QBluetoothServiceDiscoveryAgentPrivate( void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &address) { Q_Q(QBluetoothServiceDiscoveryAgent); +#ifdef QT_QNX_BT_BLUETOOTH + errno = 0; + if (!m_btInitialized) { + if (bt_device_init( 0 ) < 0) { + qWarning() << "Failed to initialize bluetooth stack."; + error = QBluetoothServiceDiscoveryAgent::InputOutputError; + errorString = QBluetoothServiceDiscoveryAgent::tr("Failed to open to initialize bluetooth stack"); + q->error(error); + _q_serviceDiscoveryFinished(); + return; + } + } + m_btInitialized = true; + errno = 0; + bt_remote_device_t *remoteDevice = bt_rdev_get_device(address.toString().toLocal8Bit().constData()); + int deviceType = bt_rdev_get_type(remoteDevice); + if (deviceType == -1) { + qWarning() << "Could not retrieve remote device (address is 00:00:00:00:00:00)."; + error = QBluetoothServiceDiscoveryAgent::InputOutputError; + errorString = QBluetoothServiceDiscoveryAgent::tr("Could not retrieve remote device (address is 00:00:00:00:00:00)."); + q->error(error); + _q_serviceDiscoveryFinished(); + return; + } + /* + * In case remote device is LE device, calling bt_rdev_sdp_search_async will cause memory fault. + */ + + if ( deviceType >1) { + errno = 0; + QPointer<QBluetoothServiceDiscoveryAgentPrivate> *classPointer = new QPointer<QBluetoothServiceDiscoveryAgentPrivate>(this); + int b = bt_rdev_sdp_search_async(remoteDevice, 0, &(this->deviceServicesDiscoveryCallback), classPointer); + if ( b != 0 ) { + qWarning() << "Failed to run search on device: " << address.toString(); + error = QBluetoothServiceDiscoveryAgent::InputOutputError; + errorString = QBluetoothServiceDiscoveryAgent::tr(strerror(errno)); + q->error(error); + _q_serviceDiscoveryFinished(); + return; + } + } + else + _q_serviceDiscoveryFinished(); +#else qBBBluetoothDebug() << "Starting Service discovery for" << address.toString(); const char *filePath = QByteArray("/pps/services/bluetooth/remote_devices/").append(address.toString().toUtf8().constData()).constData(); if ((m_rdfd = qt_safe_open(filePath, O_RDONLY)) == -1) { @@ -105,6 +225,7 @@ void QBluetoothServiceDiscoveryAgentPrivate::start(const QBluetoothAddress &addr } m_queryTimer.start(10000); ppsSendControlMessage("service_query", QStringLiteral("{\"addr\":\"%1\"}").arg(address.toString()), this); +#endif } void QBluetoothServiceDiscoveryAgentPrivate::stop() |