mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 01:41:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

rcinput: try harder to reacquire input device

Browse Source 
During lirc package update, the input device was sometimes lost and not
reacquired. Try to reacquire also if setKeyRepeatDelay fails.

Signed-off-by: Thilo Graf <dbt@novatux.de>

# Conflicts:
#	src/driver/rcinput.cpp
This commit is contained in:
Stefan Seyfried
2018-07-02 10:11:40 +02:00
committed by Thilo Graf
parent 678d1b980d
commit d920f4892a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/driver/rcinput.cpp
View File

@@ -1757,7 +1757,10 @@ int CRCInput::translate(int code)
void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms) void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms)
{ {
for (std::vector<in_dev>::iterator it = indev.begin(); it != indev.end(); ++it) { /* iterate backwards or the vector will be corrupted by the indev.erase(i) */
std::vector<in_dev>::iterator it = indev.end();
while (it != indev.begin()) {
--it;
int fd = (*it).fd; int fd = (*it).fd;
std::string path = (*it).path; std::string path = (*it).path;
if (path == "/tmp/neutrino.input") if (path == "/tmp/neutrino.input")
@@ -1781,8 +1784,17 @@ void CRCInput::setKeyRepeatDelay(unsigned int start_ms, unsigned int repeat_ms)
* rcinput loop into accepting the key event... */ * rcinput loop into accepting the key event... */
ie.value = start_ms + 10; ie.value = start_ms + 10;
ie.code = REP_DELAY; ie.code = REP_DELAY;
if (write(fd, &ie, sizeof(ie)) == -1) if (write(fd, &ie, sizeof(ie)) == -1) {
if (errno == ENODEV) {
printf("[rcinput:%s] %s(fd %d) ENODEV??\n", __func__, path.c_str(), fd);
/* hot-unplugged? */
::close(fd);
it = indev.erase(it);
devinput_mtime.tv_sec = 0; /* force check */
continue;
}
printf("[rcinput:%s] %s(fd %d) write %s: %m\n", __func__, path.c_str(), fd, "REP_DELAY"); printf("[rcinput:%s] %s(fd %d) write %s: %m\n", __func__, path.c_str(), fd, "REP_DELAY");
}
ie.value = repeat_ms + 10; ie.value = repeat_ms + 10;
ie.code = REP_PERIOD; ie.code = REP_PERIOD;