mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

cleanup: remove dc_user_device_t

Browse source 
The same structure was defined as "struct dc_user_device_t"
and typedefed as "device_data_t". Unify this. Since there
are much more of the latter, remove the former.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-10-19 18:42:43 +02:00 • committed by Dirk Hohndel
parent 8c65558b5c
commit 5a19437311
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/libdivecomputer.h
View file

@ -29,8 +29,7 @@ extern "C" {
struct dive; struct dive;
struct dive_computer; struct dive_computer;
typedef struct dc_user_device_t typedef struct {
{
dc_descriptor_t *descriptor; dc_descriptor_t *descriptor;
const char *vendor, *product, *devname; const char *vendor, *product, *devname;
const char *model, *btname; const char *model, *btname;

6
core/qt-ble.cpp
View file

@ -229,7 +229,7 @@ void BLEObject::addService(const QBluetoothUuid &newService)
} }
} }
BLEObject::BLEObject(QLowEnergyController *c, dc_user_device_t *d) BLEObject::BLEObject(QLowEnergyController *c, device_data_t *d)
{ {
controller = c; controller = c;
device = d; device = d;
@ -520,13 +520,13 @@ dc_status_t BLEObject::setupHwTerminalIo(const QList<QLowEnergyCharacteristic> &
// Bluez is broken, and doesn't have a sane way to query // Bluez is broken, and doesn't have a sane way to query
// whether to use a random address or not. So we have to // whether to use a random address or not. So we have to
// fake it. // fake it.
static int use_random_address(dc_user_device_t *user_device) static int use_random_address(device_data_t *user_device)
{ {
return IS_SHEARWATER(user_device) || IS_GARMIN(user_device); return IS_SHEARWATER(user_device) || IS_GARMIN(user_device);
} }
#endif #endif
dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, dc_user_device_t *user_device) dc_status_t qt_ble_open(void **io, dc_context_t *, const char *devaddr, device_data_t *user_device)
{ {
debugCounter = 0; debugCounter = 0;
QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true")); QLoggingCategory::setFilterRules(QStringLiteral("qt.bluetooth* = true"));

6
core/qt-ble.h
View file

@ -18,7 +18,7 @@ class BLEObject : public QObject
Q_OBJECT Q_OBJECT
public: public:
BLEObject(QLowEnergyController *c, dc_user_device_t *); BLEObject(QLowEnergyController *c, device_data_t *);
~BLEObject(); ~BLEObject();
inline void set_timeout(int value) { timeout = value; } inline void set_timeout(int value) { timeout = value; }
dc_status_t write(const void* data, size_t size, size_t *actual); dc_status_t write(const void* data, size_t size, size_t *actual);
@ -50,7 +50,7 @@ private:
QLowEnergyService *preferred = nullptr; QLowEnergyService *preferred = nullptr;
QList<QByteArray> receivedPackets; QList<QByteArray> receivedPackets;
bool isCharacteristicWritten; bool isCharacteristicWritten;
dc_user_device_t *device; device_data_t *device;
unsigned int hw_credit = 0; unsigned int hw_credit = 0;
unsigned int desc_written = 0; unsigned int desc_written = 0;
int timeout; int timeout;
@ -65,7 +65,7 @@ private:
extern "C" { extern "C" {
dc_status_t qt_ble_open(void **io, dc_context_t *context, const char *devaddr, dc_user_device_t *user_device); dc_status_t qt_ble_open(void **io, dc_context_t *context, const char *devaddr, device_data_t *user_device);
dc_status_t qt_ble_set_timeout(void *io, int timeout); dc_status_t qt_ble_set_timeout(void *io, int timeout);
dc_status_t qt_ble_poll(void *io, int timeout); dc_status_t qt_ble_poll(void *io, int timeout);
dc_status_t qt_ble_read(void *io, void* data, size_t size, size_t *actual); dc_status_t qt_ble_read(void *io, void* data, size_t size, size_t *actual);

2
core/qtserialbluetooth.cpp
View file

@ -300,7 +300,7 @@ ble_packet_open(dc_iostream_t **iostream, dc_context_t *context, const char* dev
.close = qt_ble_close, .close = qt_ble_close,
}; };
rc = qt_ble_open(&io, context, devaddr, (dc_user_device_t *) userdata); rc = qt_ble_open(&io, context, devaddr, (device_data_t *) userdata);
if (rc != DC_STATUS_SUCCESS) { if (rc != DC_STATUS_SUCCESS) {
return rc; return rc;
} }