diff --git a/libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp b/libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp index a8a80b73..a2b4dee9 100644 --- a/libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp +++ b/libsrc/leddevice/dev_ftdi/ProviderFtdi.cpp @@ -50,27 +50,19 @@ bool ProviderFtdi::init(const QJsonObject &deviceConfig) return isInitOK; } -int ProviderFtdi::openDevice() +int ProviderFtdi::open() { - _ftdic = ftdi_new(); + int rc = 0; - Debug(_log, "Opening FTDI device=%s", QSTRING_CSTR(_deviceName)); + _ftdic = ftdi_new(); + + Debug(_log, "Opening FTDI device=%s", QSTRING_CSTR(_deviceName)); if (ftdi_usb_open_string(_ftdic, QSTRING_CSTR(_deviceName)) < 0) { setInError(ftdi_get_error_string(_ftdic)); return -1; } - return 1; -} -int ProviderFtdi::open() -{ - int rc = 0; - - if ((rc = openDevice()) != 1) - { - return -1; - } /* doing this disable resets things if they were in a bad state */ if ((rc = ftdi_disable_bitbang(_ftdic)) < 0) diff --git a/libsrc/leddevice/dev_ftdi/ProviderFtdi.h b/libsrc/leddevice/dev_ftdi/ProviderFtdi.h index afaba68f..955b2672 100644 --- a/libsrc/leddevice/dev_ftdi/ProviderFtdi.h +++ b/libsrc/leddevice/dev_ftdi/ProviderFtdi.h @@ -71,9 +71,6 @@ protected slots: /// @param errorMsg The error message to be logged /// void setInError(const QString& errorMsg, bool isRecoverable=true) override; - -private: - int openDevice(); }; #endif // PROVIDERFtdi_H