Added support for kernel based LIRC driver

CONTRIBUTORS

@@ -2201,6 +2201,7 @@ Marko M
  for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu
  for reporting a problem with the video directory not being set correctly with --edit
  for reporting a compiler warning about the use of strncpy() in strreplace()
+ for adding support for kernel based LIRC driver
 
 Patrick Rother <krd-vdr@gulu.net>
  for reporting a bug in defining timers that only differ in the day of week

HISTORY

@@ -9780,7 +9780,7 @@ Video Disk Recorder Revision History
   out by Onur Sentürk).
 - Official release.
 
-2022-11-22:
+2022-11-23:
 
 - Added UPDATE-2.6.0, which was missing in the official 2.6.0 release.
 - Fixed unexpected calls of the '-r' script when a recording is interrupted and
@@ -9806,3 +9806,6 @@ Video Disk Recorder Revision History
 - Using the frame rate parsed from the stream, with fall back to determining it from
   PTS values.
 - Fixed printing/scanning values for systems where %ld doesn't work for time_t.
+- Added support for kernel based LIRC driver (thanks to Marko Mäkelä). Use the
+  command line option '--lirc=/dev/lirc0' to use this. Requires kernel version 5.10
+  or above.

Make.config.template

@@ -6,7 +6,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Make.config.template 4.1 2017/06/02 09:29:54 kls Exp $
+# $Id: Make.config.template 5.1 2022/11/26 13:37:06 kls Exp $
 
 ### The C compiler and options:
 
@@ -74,6 +74,8 @@ endif
 
 ### The remote control:
 LIRC_DEVICE = /var/run/lirc/lircd
+### Use this for kernel based driver:
+#LIRC_DEVICE = /dev/lirc0
 
 ### Define if you always want to use LIRC, independent of the --lirc option:
 #REMOTE=LIRC

lirc.c

@@ -6,24 +6,50 @@
  *
  * LIRC support added by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: lirc.c 4.2 2020/09/16 13:48:33 kls Exp $
+ * $Id: lirc.c 5.1 2022/11/26 13:37:06 kls Exp $
  */
 
 #include "lirc.h"
+#include <linux/version.h>
+#define HAVE_KERNEL_LIRC (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0))
+// cLircUsrRemote
 #include <netinet/in.h>
 #include <sys/socket.h>
+#include <sys/un.h>
+// cLircDevRemote
+#if HAVE_KERNEL_LIRC
+#include <linux/lirc.h>
+#include <sys/ioctl.h>
+#endif
 
 #define RECONNECTDELAY 3000 // ms
 
-cLircRemote::cLircRemote(const char *DeviceName)
+class cLircUsrRemote : public cLircRemote {
-:cRemote("LIRC")
+private:
+  enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
+  struct sockaddr_un addr;
+  bool Connect(void);
+  virtual void Action(void);
+public:
+  cLircUsrRemote(const char *DeviceName);
+  };
+
+#if HAVE_KERNEL_LIRC
+class cLircDevRemote : public cLircRemote {
+private:
+  void Connect(const char *DeviceName);
+  virtual void Action(void);
+public:
+  cLircDevRemote(const char *DeviceName);
+  };
+#endif
+
+// --- cLircRemote -----------------------------------------------------------
+
+cLircRemote::cLircRemote(const char *Name)
+:cRemote(Name)
 ,cThread("LIRC remote control")
 {
-  addr.sun_family = AF_UNIX;
-  strn0cpy(addr.sun_path, DeviceName, sizeof(addr.sun_path));
-  if (!Connect())
-     f = -1;
-  Start();
 }
 
 cLircRemote::~cLircRemote()
@@ -35,7 +61,27 @@ cLircRemote::~cLircRemote()
      close(fh);
 }
 
-bool cLircRemote::Connect(void)
+void cLircRemote::NewLircRemote(const char *Name)
+{
+#if HAVE_KERNEL_LIRC
+  if (startswith(Name, "/dev/"))
+     new cLircDevRemote(Name);
+  else
+#endif
+     new cLircUsrRemote(Name);
+}
+// --- cLircUsrRemote --------------------------------------------------------
+
+cLircUsrRemote::cLircUsrRemote(const char *DeviceName)
+: cLircRemote("LIRC")
+{
+  addr.sun_family = AF_UNIX;
+  strn0cpy(addr.sun_path, DeviceName, sizeof(addr.sun_path));
+  Connect();
+  Start();
+}
+
+bool cLircUsrRemote::Connect(void)
 {
   if ((f = socket(AF_UNIX, SOCK_STREAM, 0)) >= 0) {
      if (connect(f, (struct sockaddr *)&addr, sizeof(addr)) >= 0)
@@ -54,7 +100,7 @@ bool cLircRemote::Ready(void)
   return f >= 0;
 }
 
-void cLircRemote::Action(void)
+void cLircUsrRemote::Action(void)
 {
   cTimeMs FirstTime;
   cTimeMs LastTime;
@@ -129,3 +175,77 @@ void cLircRemote::Action(void)
            }
         }
 }
+
+// --- cLircDevRemote --------------------------------------------------------
+
+#if HAVE_KERNEL_LIRC
+inline void cLircDevRemote::Connect(const char *DeviceName)
+{
+  unsigned mode = LIRC_MODE_SCANCODE;
+  f = open(DeviceName, O_RDONLY, 0);
+  if (f < 0)
+     LOG_ERROR_STR(DeviceName);
+  else if (ioctl(f, LIRC_SET_REC_MODE, &mode)) {
+     LOG_ERROR_STR(DeviceName);
+     close(f);
+     f = -1;
+     }
+}
+
+cLircDevRemote::cLircDevRemote(const char *DeviceName)
+: cLircRemote("DEV_LIRC")
+{
+  Connect(DeviceName);
+  Start();
+}
+
+void cLircDevRemote::Action(void)
+{
+  if (f < 0)
+     return;
+  uint64_t FirstTime = 0, LastTime = 0;
+  uint32_t LastKeyCode = 0;
+  uint16_t LastFlags = false;
+  bool SeenRepeat = false;
+  bool repeat = false;
+
+  while (Running()) {
+        lirc_scancode sc;
+        ssize_t ret = read(f, &sc, sizeof sc);
+
+        if (ret == sizeof sc) {
+           const bool SameKey = sc.keycode == LastKeyCode && !((sc.flags ^ LastFlags) & LIRC_SCANCODE_FLAG_TOGGLE);
+
+           if (sc.flags & LIRC_SCANCODE_FLAG_REPEAT != 0)
+              // Before Linux 6.0, this flag is never set for some devices.
+              SeenRepeat = true;
+
+           if (SameKey && uint((sc.timestamp - FirstTime) / 1000000) < uint(Setup.RcRepeatDelay))
+              continue; // skip keys coming in too fast
+
+           if (!SameKey || (SeenRepeat && !(sc.flags & LIRC_SCANCODE_FLAG_REPEAT))) {
+              // This is a key-press event, not key-repeat.
+              if (repeat)
+                 Put(LastKeyCode, false, true); // generated release for previous key
+              repeat = false;
+              FirstTime = sc.timestamp;
+              LastKeyCode = sc.keycode;
+              LastFlags = sc.flags;
+              }
+           else if (uint((sc.timestamp - LastTime) / 1000000) < uint(Setup.RcRepeatDelta))
+              continue; // filter out too frequent key-repeat events
+           else
+              repeat = true;
+
+           LastTime = sc.timestamp;
+           Put(sc.keycode, repeat);
+           }
+        else {
+           if (repeat) // the last one was a repeat, so let's generate a release
+              Put(LastKeyCode, false, true);
+           repeat = false;
+           LastKeyCode = 0;
+           }
+        }
+}
+#endif

lirc.h

@@ -4,27 +4,23 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: lirc.h 1.4 2006/01/27 16:00:19 kls Exp $
+ * $Id: lirc.h 5.1 2022/11/26 13:37:06 kls Exp $
  */
 
 #ifndef __LIRC_H
 #define __LIRC_H
 
-#include <sys/un.h>
 #include "remote.h"
 #include "thread.h"
 
-class cLircRemote : public cRemote, private cThread {
+class cLircRemote : public cRemote, protected cThread {
-private:
+protected:
-  enum { LIRC_KEY_BUF = 30, LIRC_BUFFER_SIZE = 128 };
   int f;
-  struct sockaddr_un addr;
+  cLircRemote(const char *Name);
-  virtual void Action(void);
-  bool Connect(void);
 public:
-  cLircRemote(const char *DeviceName);
   virtual ~cLircRemote();
   virtual bool Ready(void);
+  static void NewLircRemote(const char *Name);
   };
 
 #endif //__LIRC_H

vdr.c

@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.tvdr.de
  *
- * $Id: vdr.c 5.8 2022/06/01 14:24:57 kls Exp $
+ * $Id: vdr.c 5.9 2022/11/26 13:37:06 kls Exp $
  */
 
 #include <getopt.h>
@@ -875,7 +875,7 @@ int main(int argc, char *argv[])
 
   // Remote Controls:
   if (LircDevice)
-     new cLircRemote(LircDevice);
+     cLircRemote::NewLircRemote(LircDevice);
   if (!DaemonMode && HasStdin && UseKbd)
      new cKbdRemote;
   Interface->LearnKeys();