mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-03 07:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

port/qt-usb: support file descriptors as data source on posix systems

Browse Source
This commit is contained in:
Matthias Ringwald 2020-02-28 16:15:43 +01:00
parent afbbff0576
commit 84ede5298a
4 changed files with 106 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
platform/qt/btstack_run_loop_qt.cpp
View File

@ -71,21 +71,52 @@ static struct timeval init_tv;
static BTstackRunLoopQt * btstack_run_loop_object;
#ifdef Q_OS_WIN
#include <QHash>
#ifdef Q_OS_WIN
// associate each data source with QWinEventNotifier
static QHash<btstack_data_source_t *, QWinEventNotifier *> win_event_notifiers;
#else
static QHash<btstack_data_source_t *, QSocketNotifier *> read_notifiers;
static QHash<btstack_data_source_t *, QSocketNotifier *> write_notifiers;
#endif
static void btstack_run_loop_qt_update_data_source(btstack_data_source_t * ds){
#ifdef Q_OS_WIN
QWinEventNotifier * win_notifier = win_event_notifiers.value(ds, NULL);
if (win_notifier){
bool enabled = (ds->flags & (DATA_SOURCE_CALLBACK_READ | DATA_SOURCE_CALLBACK_WRITE)) != 0;
win_notifier->setEnabled(enabled);
}
#else
QSocketNotifier * read_notifier = read_notifiers.value(ds, NULL);
if (read_notifier){
bool read_enabled = (ds->flags & DATA_SOURCE_CALLBACK_READ) != 0;
read_notifier->setEnabled(read_enabled);
}
QSocketNotifier * write_notifier = write_notifiers.value(ds, NULL);
if (write_notifier){
bool write_enabled = (ds->flags & DATA_SOURCE_CALLBACK_WRITE) != 0;
write_notifier->setEnabled(write_enabled);
}
#endif
}
void btstack_run_loop_qt_add_data_source(btstack_data_source_t *ds){
#ifdef Q_OS_WIN
QWinEventNotifier * win_notifier = new QWinEventNotifier(ds->source.handle);
win_event_notifiers.insert(ds, win_notifier);
QObject::connect(win_notifier, SIGNAL(activated(HANDLE)),
btstack_run_loop_object, SLOT(processDataSource(HANDLE)));
bool enabled = (ds->flags & (DATA_SOURCE_CALLBACK_READ | DATA_SOURCE_CALLBACK_WRITE)) != 0;
win_notifier->setEnabled(enabled);
btstack_run_loop_qt_update_data_source(ds);
QObject::connect(win_notifier, SIGNAL(activated(HANDLE)), btstack_run_loop_object, SLOT(processDataSource(HANDLE)));
log_debug("add data source %p with handle %p", ds, ds->source.handle);
#else
// POSIX Systems: macOS, Linux, ..
QSocketNotifier * read_notifier = new QSocketNotifier(ds->source.fd, QSocketNotifier::Read);
QSocketNotifier * write_notifier = new QSocketNotifier(ds->source.fd, QSocketNotifier::Write);
read_notifiers.insert(ds, read_notifier);
write_notifiers.insert(ds, write_notifier);
btstack_run_loop_qt_update_data_source(ds);
QObject::connect(read_notifier, SIGNAL(activated(int)), btstack_run_loop_object, SLOT(processDataSourceRead(int)));
QObject::connect(write_notifier, SIGNAL(activated(int)), btstack_run_loop_object, SLOT(processDataSourceWrite(int)));
#endif
btstack_run_loop_base_add_data_source(ds);
}
@ -97,30 +128,29 @@ bool btstack_run_loop_qt_remove_data_source(btstack_data_source_t *ds){
win_event_notifiers.remove(ds);
free(win_notifier);
}
#else
QSocketNotifier * read_notifier = read_notifiers.value(ds, NULL);
if (read_notifier){
read_notifiers.remove(ds);
free(read_notifier);
}
QSocketNotifier * write_notifier = write_notifiers.value(ds, NULL);
if (write_notifier){
write_notifiers.remove(ds);
free(write_notifier);
}
#endif
return btstack_run_loop_base_remove_data_source(ds);
}
void btstack_run_loop_qt_enable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){
btstack_run_loop_base_enable_data_source_callbacks(ds, callback_types);
#ifdef Q_OS_WIN
QWinEventNotifier * win_notifier = win_event_notifiers.value(ds, NULL);
if (win_notifier){
bool enabled = (ds->flags & (DATA_SOURCE_CALLBACK_READ | DATA_SOURCE_CALLBACK_WRITE)) != 0;
win_notifier->setEnabled(enabled);
}
#endif
btstack_run_loop_qt_update_data_source(ds);
}
void btstack_run_loop_qt_disable_data_source_callbacks(btstack_data_source_t * ds, uint16_t callback_types){
btstack_run_loop_base_disable_data_source_callbacks(ds, callback_types);
#ifdef Q_OS_WIN
QWinEventNotifier * win_notifier = win_event_notifiers.value(ds, NULL);
if (win_notifier){
bool enabled = (ds->flags & (DATA_SOURCE_CALLBACK_READ | DATA_SOURCE_CALLBACK_WRITE)) != 0;
win_notifier->setEnabled(enabled);
}
#endif
btstack_run_loop_qt_update_data_source(ds);
}
#ifdef _POSIX_MONOTONIC_CLOCK
@ -232,6 +262,38 @@ void BTstackRunLoopQt::processDataSource(HANDLE handle){
}
}
}
#else
static void btstack_run_loop_qt_process_data_source(int fd, uint16_t callback_types){
// find ds
btstack_linked_list_iterator_t it;
btstack_linked_list_iterator_init(&it, &btstack_run_loop_base_data_sources);
while (btstack_linked_list_iterator_has_next(&it)){
btstack_data_source_t *ds = (btstack_data_source_t*) btstack_linked_list_iterator_next(&it);
if (fd == ds->source.fd){
if ((callback_types & DATA_SOURCE_CALLBACK_READ) != 0){
if ((ds->flags & DATA_SOURCE_CALLBACK_READ) != 0){
ds->process(ds, DATA_SOURCE_CALLBACK_READ);
}
}
if ((callback_types & DATA_SOURCE_CALLBACK_WRITE) != 0){
if ((ds->flags & DATA_SOURCE_CALLBACK_WRITE) != 0){
ds->process(ds, DATA_SOURCE_CALLBACK_WRITE);
}
}
break;
}
}
}
void BTstackRunLoopQt::processDataSourceRead(int fd){
log_debug("read - lookup data source for handle %p, sender %p", fd, QObject::sender());
btstack_run_loop_qt_process_data_source(fd, DATA_SOURCE_CALLBACK_READ);
}
void BTstackRunLoopQt::processDataSourceWrite(int fd){
log_debug("write - lookup data source for handle %p, sender %p", fd, QObject::sender());
btstack_run_loop_qt_process_data_source(fd, DATA_SOURCE_CALLBACK_WRITE);
}
#endif
static void btstack_run_loop_qt_init(void){

5
platform/qt/btstack_run_loop_qt.h
View File

@ -52,6 +52,8 @@
#ifdef Q_OS_WIN
#include <windows.h>
#include <QWinEventNotifier>
#else
#include <QSocketNotifier>
#endif
class BTstackRunLoopQt : public QObject {
Q_OBJECT
@ -59,6 +61,9 @@ public slots:
void processTimers(void);
#ifdef Q_OS_WIN
void processDataSource(HANDLE handle);
#else
void processDataSourceRead(int fd);
void processDataSourceWrite(int fd);
#endif
};
#endif

4
port/qt-usb/CMakeLists.txt
View File

@ -54,9 +54,6 @@ file(GLOB SOURCES_HXCMOD "${BTSTACK_ROOT}/3rd-party/hxcmod-player/*.c" "${BT
file(GLOB SOURCES_RIJNDAEL "${BTSTACK_ROOT}/3rd-party/rijndael/rijndael.c")
set(SOURCES_POSIX
# Adding btstack_uart_block.c causes weird link error, skip for now. QSerialPort might be used in btstack_uart_block_qt.cpp
# ${BTSTACK_ROOT}/platform/posix/btstack_uart_block.c
${BTSTACK_ROOT}/platform/posix/btstack_audio_portaudio.c
${BTSTACK_ROOT}/platform/posix/btstack_tlv_posix.c
${BTSTACK_ROOT}/platform/posix/wav_util.c
@ -130,6 +127,7 @@ ELSE()
set(SOURCES_STDIN ${BTSTACK_ROOT}/platform/posix/btstack_stdin_posix.c)
list(APPEND SOURCES_POSIX ${BTSTACK_ROOT}/platform/posix/btstack_network_posix.c)
list(APPEND SOURCES_POSIX ${BTSTACK_ROOT}/platform/posix/btstack_uart_block_posix.c)
ENDIF()
set(SOURCES

19
port/qt-usb/main.cpp
View File

@ -67,6 +67,7 @@
#include "btstack_stdin.h"
#include "btstack_audio.h"
#include "btstack_tlv_posix.h"
#include "btstack_uart_block.h"
#ifdef Q_OS_WIN
#define TLV_DB_PATH_PREFIX "btstack"
@ -225,7 +226,25 @@ int main(int argc, char * argv[]){
hci_dump_open(pklg_path, HCI_DUMP_PACKETLOGGER);
// init HCI
#if 1
// USB
hci_init(hci_transport_usb_instance(), NULL);
#else
// H4
static hci_transport_config_uart_t config = {
HCI_TRANSPORT_CONFIG_UART,
115200,
0, // main baudrate
1, // flow control
NULL,
};
config.device_name = "/dev/tty.usbserial-A900K2WS"; // DFROBOT
// init HCI
const btstack_uart_block_t * uart_driver = btstack_uart_block_posix_instance();
const hci_transport_t * transport = hci_transport_h4_instance(uart_driver);
hci_init(transport, (void*) &config);
#endif
#ifdef HAVE_PORTAUDIO
btstack_audio_sink_set_instance(btstack_audio_portaudio_sink_get_instance());