Merge pull request #12395 from tru7/knxd

knxd: backport fix for usblowlever.cpp from upstream
This commit is contained in:
Hannu Nyman 2020-06-03 18:25:56 +03:00 committed by GitHub
commit 2d31b1780d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions

View file

@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=knxd
PKG_VERSION:=0.14.38
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?

View file

@ -0,0 +1,10 @@
--- a/src/libserver/usblowlevel.cpp 2020-06-03 16:41:02.128182612 +0200
+++ b/src/libserver/usblowlevel.cpp 2020-06-03 16:41:31.660704440 +0200
@@ -155,6 +155,7 @@
{
t->setAuxName("usbL");
send_timeout = cfg->value("send-timeout", 1000);
+ loop = nullptr;
read_trigger.set<USBLowLevelDriver,&USBLowLevelDriver::read_trigger_cb>(this);
write_trigger.set<USBLowLevelDriver,&USBLowLevelDriver::write_trigger_cb>(this);
read_trigger.start();