Ticket #13386: 20190126-dvbchannelscan-dvbv5.patch

mythtv/libs/libmythtv/recorders/dvbchannel.cpp

@@ -49 +49 @@
 #include "dvbcam.h"
 #include "tv_rec.h"
 
+// Returned by drivers on unsupported dvbv3 ioctl calls
+#ifndef ENOTSUPP
+#define ENOTSUPP 524
+#endif
+
 static void drain_dvb_events(int fd);
 static bool wait_for_backend(int fd, int timeout_ms);
 static struct dvb_frontend_parameters dtvmultiplex_to_dvbparams(
@@ -1167 +1172 @@
     if (ret < 0)
     {
 #if DVB_API_VERSION >=5
-        if (errno == EOPNOTSUPP)
+        if (errno == EOPNOTSUPP || errno == ENOTSUPP)
         {
             return GetSignalStrengthDVBv5(ok);
         }
@@ -1255 +1260 @@
     if (ret < 0)
     {
 #if DVB_API_VERSION >=5
-        if (errno == EOPNOTSUPP)
+        if (errno == EOPNOTSUPP || errno == ENOTSUPP)
         {
             return GetSNRDVBv5(ok);
         }
@@ -1326 +1331 @@
     if (ret < 0)
     {
 #if DVB_API_VERSION >=5
-        if (errno == EOPNOTSUPP)
+        if (errno == EOPNOTSUPP || errno == ENOTSUPP)
         {
             return GetBitErrorRateDVBv5(ok);
         }
@@ -1390 +1395 @@
     if (ret < 0)
     {
 #if DVB_API_VERSION >=5
-        if (errno == EOPNOTSUPP)
+        if (errno == EOPNOTSUPP || errno == ENOTSUPP)
         {
             return GetUncorrectedBlockCountDVBv5(ok);
         }
@@ -1494 +1499 @@
  */
 static bool wait_for_backend(int fd, int timeout_ms)
 {
-    struct timeval select_timeout = { 0, (timeout_ms % 1000) * 1000 /*usec*/};
+    struct timeval select_timeout = { timeout_ms / 1000, (timeout_ms % 1000) * 1000 /*usec*/};
+
     fd_set fd_select_set;
     FD_ZERO(    &fd_select_set);
     FD_SET (fd, &fd_select_set);
@@ -1515 +1521 @@
 
     // This is supposed to work on all cards, post 2.6.12...
     fe_status_t status;
+    memset(&status, 0, sizeof(status));
+
     if (ioctl(fd, FE_READ_STATUS, &status) < 0)
     {
         LOG(VB_GENERAL, LOG_ERR,