Posts by leading_edjge

leading_edjge

Quote from elrd

I just got a Raspberry Pi 3, and trying to get the dual tuner (model 15950 to work with ATSC).

There are a lot of references to retrieving patches, but It's not clear to me how to pull down the patch files.

I am far more familiar with svn than git, though I have tried various git commands to get the desired patch files, and also looked at the web page links (like clicking on the patch link above). Also, after I figure how to get the patch files, can they all sit in the same directory I make for holding them (them patch files). Thanks. (I have compiled kernels before, though as Linux has become so much more friendly, and there is so much module support, I have not done so for a while).

Try the following:

Code

wget https://raw.githubusercontent.com/b-rad-NDi/Ubuntu-media-tree-kernel-builder/master/patches/ubuntu-zesty-4.10.0/extra/0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Edit the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch file

Remove this from the top of the file:

Code

From a4bb762c6f1a975387099f224510116f85d5bd97 Mon Sep 17 00:00:00 2001
From: Brad Love <[email protected]>
Date: Sun, 16 Apr 2017 00:13:39 -0500
Subject: [PATCH 1/5] em28xx: Hauppauge DualHD DVB/ATSC second tuner support

--- drivers/media/usb/em28xx/em28xx-cards.c | 123 +++++++++++++++++++++++++++++++- drivers/media/usb/em28xx/em28xx-core.c  |  47 +++++++++--- drivers/media/usb/em28xx/em28xx-dvb.c   |  28 ++++++-- drivers/media/usb/em28xx/em28xx.h       |  12 ++++ 4 files changed, 192 insertions(+), 18 deletions(-)

Remove this from the bottom of file:

Code

-- 2.11.0

Save the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch file

If you still cannot get the patch working, go to Ubuntu-media-tree-kernel-builder/patches/ubuntu-zesty-4.10.0/extra at master · b-rad-NDi/Ubuntu-media-tree-kernel-builder · GitHub

Click on 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Click on Raw

You should be now at 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Copy everything from

Diff

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a12b599a1fa2..df0e080bd08e 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c

to

Code

+
+    struct em28xx    *dev_next;
+    int ts; };  #define kref_to_dev(d) container_of(d, struct em28xx, ref)

and paste into 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch. These steps should work.

leading_edjge

Try the following:

Code

wget https://raw.githubusercontent.com/b-rad-NDi/Ubuntu-media-tree-kernel-builder/master/patches/ubuntu-zesty-4.10.0/extra/0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Edit the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch file

Remove this from the top of the file:

Code

From a4bb762c6f1a975387099f224510116f85d5bd97 Mon Sep 17 00:00:00 2001
From: Brad Love <[email protected]>
Date: Sun, 16 Apr 2017 00:13:39 -0500
Subject: [PATCH 1/5] em28xx: Hauppauge DualHD DVB/ATSC second tuner support

---
 drivers/media/usb/em28xx/em28xx-cards.c | 123 +++++++++++++++++++++++++++++++-
 drivers/media/usb/em28xx/em28xx-core.c  |  47 +++++++++---
 drivers/media/usb/em28xx/em28xx-dvb.c   |  28 ++++++--
 drivers/media/usb/em28xx/em28xx.h       |  12 ++++
 4 files changed, 192 insertions(+), 18 deletions(-)

Display More

Remove this from the bottom of file:

Code

-- 
2.11.0

Save the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch file

If you still cannot get the patch working, go to Ubuntu-media-tree-kernel-builder/patches/ubuntu-zesty-4.10.0/extra at master · b-rad-NDi/Ubuntu-media-tree-kernel-builder · GitHub

Click on 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Click on Raw

You should be now at 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

Copy everything from

Diff

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a12b599a1fa2..df0e080bd08e 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c

to

Code

+
+    struct em28xx    *dev_next;
+    int ts;
 };
 
 #define kref_to_dev(d) container_of(d, struct em28xx, ref)

and paste into 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch. These steps should work.

leading_edjge

Here is the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch. Copy below using the copy icon and paste it into the file of 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch.

Diff

diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index a12b599a1fa2..df0e080bd08e 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -2387,6 +2387,7 @@ struct em28xx_board em28xx_boards[] = {
         .tuner_type    = TUNER_ABSENT,
         .tuner_gpio    = hauppauge_dualhd_dvb,
         .has_dvb       = 1,
+        .has_dual_ts   = 1,
         .ir_codes      = RC_MAP_HAUPPAUGE,
         .leds          = hauppauge_dualhd_leds,
     },
@@ -2402,6 +2403,7 @@ struct em28xx_board em28xx_boards[] = {
         .tuner_type    = TUNER_ABSENT,
         .tuner_gpio    = hauppauge_dualhd_dvb,
         .has_dvb       = 1,
+        .has_dual_ts   = 1,
         .ir_codes      = RC_MAP_HAUPPAUGE,
         .leds          = hauppauge_dualhd_leds,
     },
@@ -3222,7 +3224,8 @@ static void em28xx_release_resources(struct em28xx *dev)
         em28xx_i2c_unregister(dev, 1);
     em28xx_i2c_unregister(dev, 0);
 
-    usb_put_dev(udev);
+    if(dev->ts == PRIMARY_TS)
+        usb_put_dev(udev);
 
     /* Mark device as unused */
     clear_bit(dev->devno, em28xx_devused);
@@ -3415,6 +3418,34 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
     return 0;
 }
 
+int em28xx_duplicate_dev(struct em28xx *dev)
+{
+    int nr;
+    struct em28xx *sec_dev = kzalloc(sizeof(*sec_dev), GFP_KERNEL);
+    if (sec_dev == NULL) {
+        dev->dev_next = NULL;
+        return -ENOMEM;
+    }
+    memcpy(sec_dev, dev, sizeof(sizeof(*sec_dev)));
+    /* Check to see next free device and mark as used */
+    do {
+        nr = find_first_zero_bit(em28xx_devused, EM28XX_MAXBOARDS);
+        if (nr >= EM28XX_MAXBOARDS) {
+            /* No free device slots */
+            printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
+                    EM28XX_MAXBOARDS);
+            kfree(sec_dev);
+            dev->dev_next = NULL;
+            return -ENOMEM;
+        }
+    } while (test_and_set_bit(nr, em28xx_devused));
+    sec_dev->devno = nr;
+    snprintf(sec_dev->name, 28, "em28xx #%d", nr);
+    sec_dev->dev_next = NULL;
+    dev->dev_next = sec_dev;
+    return 0;
+}
+
 /* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */
 #define hb_mult(wMaxPacketSize) (1 + (((wMaxPacketSize) >> 11) & 0x03))
 
@@ -3428,7 +3459,8 @@ static int em28xx_usb_probe(struct usb_interface *interface,
     struct usb_device *udev;
     struct em28xx *dev = NULL;
     int retval;
-    bool has_vendor_audio = false, has_video = false, has_dvb = false;
+    bool has_vendor_audio = false, has_video = false;
+    bool has_dvb = false, has_dvb_ts2 = false;
     int i, nr, try_bulk;
     const int ifnum = interface->altsetting[0].desc.bInterfaceNumber;
     char *speed;
@@ -3534,6 +3566,19 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                         }
                     }
                     break;
+                case 0x85:
+                    if (usb_endpoint_xfer_isoc(e)) {
+                        if (size > dev->dvb_max_pkt_size_isoc_ts2) {
+                            has_dvb_ts2 = true; /* see NOTE (~) */
+                            dev->dvb_ep_isoc_ts2 = e->bEndpointAddress;
+                            dev->dvb_max_pkt_size_isoc_ts2 = size;
+                            dev->dvb_alt_isoc = i;
+                        }
+                    } else {
+                        has_dvb_ts2 = true;
+                        dev->dvb_ep_bulk_ts2 = e->bEndpointAddress;
+                    }
+                    break;
                 }
             }
             /* NOTE:
@@ -3615,6 +3660,10 @@ static int em28xx_usb_probe(struct usb_interface *interface,
     dev->has_video = has_video;
     dev->ifnum = ifnum;
 
+    dev->ts = PRIMARY_TS;
+    snprintf(dev->name, 28, "em28xx");
+    dev->dev_next = NULL;
+
     if (has_vendor_audio) {
         dev_err(&interface->dev,
             "Audio interface %i found (Vendor Class)\n", ifnum);
@@ -3694,6 +3743,61 @@ static int em28xx_usb_probe(struct usb_interface *interface,
             dev->dvb_xfer_bulk ? "bulk" : "isoc");
     }
 
+    if(dev->board.has_dual_ts && em28xx_duplicate_dev(dev) == 0)
+    {
+        dev->dev_next->ts = SECONDARY_TS;
+        dev->dev_next->alt   = -1;
+        dev->dev_next->is_audio_only = has_vendor_audio && !(has_video || has_dvb);
+        dev->dev_next->has_video = false;
+        dev->dev_next->ifnum = ifnum;
+        dev->dev_next->model = id->driver_info;
+
+        mutex_init(&dev->dev_next->lock);
+        retval = em28xx_init_dev(dev->dev_next, udev, interface, dev->dev_next->devno);
+        if (retval) {
+            goto err_free;
+        }
+
+        if (usb_xfer_mode < 0) {
+            if (dev->dev_next->board.is_webcam)
+                try_bulk = 1;
+            else
+                try_bulk = 0;
+        } else {
+            try_bulk = usb_xfer_mode > 0;
+        }
+
+        /* Select USB transfer types to use */
+        if (has_dvb) {
+            if (!dev->dvb_ep_isoc_ts2 || (try_bulk && dev->dvb_ep_bulk_ts2))
+                dev->dev_next->dvb_xfer_bulk = 1;
+            dev_info(&dev->intf->dev, "dvb ts2 set to %s mode.\n",
+                    dev->dev_next->dvb_xfer_bulk ? "bulk" : "isoc");
+        }
+
+        dev->dev_next->dvb_ep_isoc = dev->dvb_ep_isoc_ts2;
+        dev->dev_next->dvb_ep_bulk = dev->dvb_ep_bulk_ts2;
+        dev->dev_next->dvb_max_pkt_size_isoc = dev->dvb_max_pkt_size_isoc_ts2;
+        dev->dev_next->dvb_alt_isoc = dev->dvb_alt_isoc;
+
+        /* Configuare hardware to support TS2*/
+        if(dev->dvb_xfer_bulk) {
+            /* The ep4 and ep5 are configuared for BULK */
+            em28xx_write_reg(dev, 0x0b, 0x96);
+            mdelay(100);
+            em28xx_write_reg(dev, 0x0b, 0x80);
+            mdelay(100);
+        } else {
+            /* The ep4 and ep5 are configuared for ISO */
+            em28xx_write_reg(dev, 0x0b, 0x96);
+            mdelay(100);
+            em28xx_write_reg(dev, 0x0b, 0x82);
+            mdelay(100);
+        }
+
+        kref_init(&dev->dev_next->ref);
+    }
+
     kref_init(&dev->ref);
 
     request_modules(dev);
@@ -3736,15 +3840,28 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
     if (!dev)
         return;
 
+    if(dev->dev_next!=NULL) {
+        dev->dev_next->disconnected = 1;
+        dev_info(&dev->intf->dev, "Disconnecting %s\n", dev->dev_next->name);
+        flush_request_modules(dev->dev_next);
+    }
+
     dev->disconnected = 1;
 
-    dev_err(&dev->intf->dev, "Disconnecting\n");
+    dev_err(&dev->intf->dev, "Disconnecting %s\n", dev->name);
 
     flush_request_modules(dev);
 
     em28xx_close_extension(dev);
 
+    if(dev->dev_next!=NULL)
+        em28xx_release_resources(dev->dev_next);
     em28xx_release_resources(dev);
+
+    if(dev->dev_next!=NULL) {
+        kref_put(&dev->dev_next->ref, em28xx_free_device);
+        dev->dev_next = NULL;
+    }
     kref_put(&dev->ref, em28xx_free_device);
 }
 
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 19ccff41c7eb..432668dc18de 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -637,10 +637,23 @@ int em28xx_capture_start(struct em28xx *dev, int start)
         dev->chip_id == CHIP_ID_EM28174 ||
         dev->chip_id == CHIP_ID_EM28178) {
         /* The Transport Stream Enable Register moved in em2874 */
-        rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE,
-                       start ?
-                           EM2874_TS1_CAPTURE_ENABLE : 0x00,
-                       EM2874_TS1_CAPTURE_ENABLE);
+        if(dev->board.has_dual_ts) {
+            if (dev->ts == PRIMARY_TS)
+                rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE,
+                            start ?
+                            EM2874_TS1_CAPTURE_ENABLE : 0x00,
+                            EM2874_TS1_CAPTURE_ENABLE);
+            else
+                rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE,
+                            start ?
+                            EM2874_TS2_CAPTURE_ENABLE : 0x00,
+                            EM2874_TS2_CAPTURE_ENABLE);
+        } else {
+            rc = em28xx_write_reg_bits(dev, EM2874_R5F_TS_ENABLE,
+                            start ?
+                            EM2874_TS1_CAPTURE_ENABLE : 0x00,
+                            EM2874_TS1_CAPTURE_ENABLE);
+        }
     } else {
         /* FIXME: which is the best order? */
         /* video registers are sampled by VREF */
@@ -1076,7 +1089,11 @@ int em28xx_register_extension(struct em28xx_ops *ops)
     mutex_lock(&em28xx_devlist_mutex);
     list_add_tail(&ops->next, &em28xx_extension_devlist);
     list_for_each_entry(dev, &em28xx_devlist, devlist) {
-        ops->init(dev);
+        if (ops->init) {
+            ops->init(dev);
+            if(dev->dev_next!=NULL)
+                ops->init(dev->dev_next);
+        }
     }
     mutex_unlock(&em28xx_devlist_mutex);
     pr_info("em28xx: Registered (%s) extension\n", ops->name);
@@ -1090,7 +1107,11 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
 
     mutex_lock(&em28xx_devlist_mutex);
     list_for_each_entry(dev, &em28xx_devlist, devlist) {
-        ops->fini(dev);
+        if (ops->fini) {
+            if(dev->dev_next!=NULL)
+                ops->fini(dev->dev_next);
+            ops->fini(dev);
+        }
     }
     list_del(&ops->next);
     mutex_unlock(&em28xx_devlist_mutex);
@@ -1105,8 +1126,11 @@ void em28xx_init_extension(struct em28xx *dev)
     mutex_lock(&em28xx_devlist_mutex);
     list_add_tail(&dev->devlist, &em28xx_devlist);
     list_for_each_entry(ops, &em28xx_extension_devlist, next) {
-        if (ops->init)
+        if (ops->init) {
             ops->init(dev);
+            if(dev->dev_next!=NULL)
+                ops->init(dev->dev_next);
+        }
     }
     mutex_unlock(&em28xx_devlist_mutex);
 }
@@ -1117,8 +1141,11 @@ void em28xx_close_extension(struct em28xx *dev)
 
     mutex_lock(&em28xx_devlist_mutex);
     list_for_each_entry(ops, &em28xx_extension_devlist, next) {
-        if (ops->fini)
+        if (ops->fini) {
+            if(dev->dev_next!=NULL)
+                ops->fini(dev->dev_next);
             ops->fini(dev);
+        }
     }
     list_del(&dev->devlist);
     mutex_unlock(&em28xx_devlist_mutex);
@@ -1133,6 +1160,8 @@ int em28xx_suspend_extension(struct em28xx *dev)
     list_for_each_entry(ops, &em28xx_extension_devlist, next) {
         if (ops->suspend)
             ops->suspend(dev);
+        if(dev->dev_next!=NULL)
+            ops->suspend(dev->dev_next);
     }
     mutex_unlock(&em28xx_devlist_mutex);
     return 0;
@@ -1147,6 +1176,8 @@ int em28xx_resume_extension(struct em28xx *dev)
     list_for_each_entry(ops, &em28xx_extension_devlist, next) {
         if (ops->resume)
             ops->resume(dev);
+        if(dev->dev_next!=NULL)
+            ops->resume(dev->dev_next);
     }
     mutex_unlock(&em28xx_devlist_mutex);
     return 0;
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 1fb9926b6fdb..dbc8ad68fd10 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -199,7 +199,7 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
     int rc;
     struct em28xx_i2c_bus *i2c_bus = dvb->adapter.priv;
     struct em28xx *dev = i2c_bus->dev;
-    struct usb_device *udev = interface_to_usbdev(dev->intf);
+//    struct usb_device *udev = interface_to_usbdev(dev->intf);
     int dvb_max_packet_size, packet_multiplier, dvb_alt;
 
     if (dev->dvb_xfer_bulk) {
@@ -218,7 +218,8 @@ static int em28xx_start_streaming(struct em28xx_dvb *dvb)
         dvb_alt = dev->dvb_alt_isoc;
     }
 
-    usb_set_interface(udev, dev->ifnum, dvb_alt);
+    /* moved to em28xx_dvb_init*/
+    //usb_set_interface(udev, dev->ifnum, dvb_alt);
     rc = em28xx_set_mode(dev, EM28XX_DIGITAL_MODE);
     if (rc < 0)
         return rc;
@@ -1128,8 +1129,9 @@ static void em28xx_unregister_dvb(struct em28xx_dvb *dvb)
 
 static int em28xx_dvb_init(struct em28xx *dev)
 {
-    int result = 0;
+    int result = 0, dvb_alt = 0;
     struct em28xx_dvb *dvb;
+    struct usb_device *udev;
 
     if (dev->is_audio_only) {
         /* Shouldn't initialize IR for this interface */
@@ -1913,7 +1915,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
             si2168_config.ts_mode = SI2168_TS_SERIAL;
             memset(&info, 0, sizeof(struct i2c_board_info));
             strlcpy(info.type, "si2168", I2C_NAME_SIZE);
-            info.addr = 0x64;
+            if(dev->ts == PRIMARY_TS) info.addr = 0x64;
+            else info.addr = 0x67;
             info.platform_data = &si2168_config;
             request_module(info.type);
             client = i2c_new_device(&dev->i2c_adap[dev->def_i2c_bus], &info);
@@ -1939,7 +1942,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
 #endif
             memset(&info, 0, sizeof(struct i2c_board_info));
             strlcpy(info.type, "si2157", I2C_NAME_SIZE);
-            info.addr = 0x60;
+            if(dev->ts == PRIMARY_TS) info.addr = 0x60;
+            else info.addr = 0x63;
             info.platform_data = &si2157_config;
             request_module(info.type);
             client = i2c_new_device(adapter, &info);
@@ -1975,7 +1979,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
             lgdt3306a_config.fe = &dvb->fe[0];
             lgdt3306a_config.i2c_adapter = &adapter;
             strlcpy(info.type, "lgdt3306a", sizeof(info.type));
-            info.addr = 0x59;
+            if(dev->ts == PRIMARY_TS) info.addr = 0x59;
+            else info.addr = 0x0e;
             info.platform_data = &lgdt3306a_config;
             request_module(info.type);
             client = i2c_new_device(&dev->i2c_adap[dev->def_i2c_bus],
@@ -2002,7 +2007,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
 #endif
             memset(&info, 0, sizeof(struct i2c_board_info));
             strlcpy(info.type, "si2157", sizeof(info.type));
-            info.addr = 0x60;
+            if(dev->ts == PRIMARY_TS) info.addr = 0x60;
+            else info.addr = 0x62;
             info.platform_data = &si2157_config;
             request_module(info.type);
 
@@ -2045,6 +2051,14 @@ static int em28xx_dvb_init(struct em28xx *dev)
     if (result < 0)
         goto out_free;
 
+    if (dev->dvb_xfer_bulk) {
+        dvb_alt = 0;
+    } else { /* isoc */
+        dvb_alt = dev->dvb_alt_isoc;
+    }
+
+    udev = interface_to_usbdev(dev->intf);
+    usb_set_interface(udev, dev->ifnum, dvb_alt);
     dev_info(&dev->intf->dev, "DVB extension successfully initialized\n");
 
     kref_get(&dev->ref);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index e8d97d5ec161..2fdd8df238cf 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -216,6 +216,9 @@
 /* max. number of button state polling addresses */
 #define EM28XX_NUM_BUTTON_ADDRESSES_MAX        5
 
+#define PRIMARY_TS    0
+#define SECONDARY_TS    1
+
 enum em28xx_mode {
     EM28XX_SUSPEND,
     EM28XX_ANALOG_MODE,
@@ -456,6 +459,7 @@ struct em28xx_board {
     unsigned int mts_firmware:1;
     unsigned int max_range_640_480:1;
     unsigned int has_dvb:1;
+    unsigned int has_dual_ts:1;
     unsigned int is_webcam:1;
     unsigned int valid:1;
     unsigned int has_ir_i2c:1;
@@ -620,6 +624,7 @@ struct em28xx {
     unsigned int is_audio_only:1;
     enum em28xx_int_audio_type int_audio_type;
     enum em28xx_usb_audio_type usb_audio_type;
+    unsigned char name[32];
 
     struct em28xx_board board;
 
@@ -681,6 +686,8 @@ struct em28xx {
     u8 ifnum;        /* number of the assigned usb interface */
     u8 analog_ep_isoc;    /* address of isoc endpoint for analog */
     u8 analog_ep_bulk;    /* address of bulk endpoint for analog */
+    u8 dvb_ep_isoc_ts2;        /* address of isoc endpoint for DVB TS2*/
+    u8 dvb_ep_bulk_ts2;        /* address of bulk endpoint for DVB TS2*/
     u8 dvb_ep_isoc;        /* address of isoc endpoint for DVB */
     u8 dvb_ep_bulk;        /* address of bulk endpoint for DVB */
     int alt;        /* alternate setting */
@@ -694,6 +701,8 @@ struct em28xx {
     int dvb_alt_isoc;    /* alternate setting for DVB isoc transfers */
     unsigned int dvb_max_pkt_size_isoc;    /* isoc max packet size of the
                            selected DVB ep at dvb_alt */
+    unsigned int dvb_max_pkt_size_isoc_ts2;    /* isoc max packet size of the
+                           selected DVB ep at dvb_alt */
     unsigned int dvb_xfer_bulk:1;        /* use bulk instead of isoc
                            transfers for DVB          */
     char urb_buf[URB_MAX_CTRL_SIZE];    /* urb control msg buffer */
@@ -725,6 +734,9 @@ struct em28xx {
     struct media_entity input_ent[MAX_EM28XX_INPUT];
     struct media_pad input_pad[MAX_EM28XX_INPUT];
 #endif
+
+    struct em28xx    *dev_next;
+    int ts;
 };
 
 #define kref_to_dev(d) container_of(d, struct em28xx, ref)

Display More

leading_edjge

Quote from propergol

One question : is the new patch different from the one from @Puffin Chunks in post #24 ?

Now I have not one but 2 x wintv-dual hd so 4 DVB-T2 tunners in total that for now look to works perfectly with Puffin Chunks patch.

I am wondering if it worth repatching with the new one.

Yes, the new patch is different. Puffin Chunks commented out the lgdt3306a section (ATSC tuner) to get his patch to be successfully applied.

I had both of my ATSC tuners working using a different patch for kernel linux 4.2.5. See Post #26

Here is my reason for repatching with a newer patch:

I was only 2 versions behind the Raspberry kernel of 4.4 at that time.

Now that Raspberry kernel has been updated to 4.9, I was 7 versions behind.

I was trying to figure out how to put the ATSC/lgdt3306a section for the single tuner ATSC patches now in kernel 4.11 into Puffin Chunks patches. I gave up since the new patch is out, for kernel 4.11. Now I am 2 versions ahead of the updated Raspberry kernel.

The new patch should be closer to the one in the mainline of the future kernel. Kernel 4.12 will come out in the beginning of July. It will be months after July when we will see a future kernel with the new patch in the mainline.

leading_edjge

Quote from propergol

Instructions given in post #24 worked for me on DVB-T version.

thanks a lot @Puffin Chunks

Now this thread is talking about patching ATSC version of the dongle witch is a complete different beast only used in north america/Canada

Maybe splitting this thread would help avoiding confusion?

The latest patch add hauppauge patch · CvH/LibreELEC.tv@6f53d92 · GitHub will solve the dual tuner problem on ATSC and DVB-C/T/T2. Any solution on the ATSC will fix problems on the DVB-C/T/T2 and visa versa. A Hauppauge engineer is evaluating this patch and will work on it to submit it to the mainline of a future Linux kernel.

leading_edjge

I am updating Puffin Chunks instructions to cover both DVB-C/T/T2 and ATSC tuners. Thanks @Puffin Chunks

This patch has been built, tested and confirmed working on a rPi Model 3 for Kernel 4.11.3
Whilst this patch was compiled for a Model 3, I see no reason why it would not work on other models of Pi as the sources are the same.

With that said, follow the instructions for compiling your own kernel as detailed in the Raspberry Pi documentation here: Kernel building - Raspberry Pi Documentation but make the following changes:

When instructed to get the sources, use the following command instead to ensure that you grab the sources for the 4.11 kernel:

Code

git clone --depth 1 -b rpi-4.11.y https://github.com/raspberrypi/linux

Once you have retrieved the sources, but before running any other commands, grab the patch from here: add hauppauge patch · CvH/LibreELEC.tv@6f53d92 · GitHub and copy it one folder up from where you have downloaded the rpi kernel source (eg: if your source downloaded to /home/user/linux then copy the patch to /home/user)

Enter the kernel source directory and apply the patch

Code

cd linux
patch -p1 < ../0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

The following output should tell you whether you've successfully applied the patch:

Code

patching file drivers/media/usb/em28xx/em28xx-cards.c
patching file drivers/media/usb/em28xx/em28xx-core.c
patching file drivers/media/usb/em28xx/em28xx-dvb.c
patching file drivers/media/usb/em28xx/em28xx.h

With the patch successfully applied to the source you can now continue to follow the instructions on the Raspberry Pi documentation. It is up to you whether you compile locally on the Pi or on a different machine. My advice is the latter as it takes just minutes, but can take many hours to compile on a Pi.

For DVB-C/T/T2 tuners only: Once compiled and installed on the Pi, don't forget to grab the firmware for the card from here: dvb-demod-si2168-b40-01.fw and copy it to your /lib/firmware folder on your Pi.

As to your other questions, be aware, an apt-get upgrade will update the kernel if a new one has been released for Raspbian, so you will want to suppress this from your updates to avoid overwriting your custom kernel.

The Raspberry Pi documentation will tell you how to either compile on your pi or on another system and transfer it over. As I stated above, I recommend cross-compiling on a different machine, but do whatever you feel most comfortable with, just be prepared for a long wait if compiling on the Pi.

leading_edjge

Are you sure that the previous patches had altered your linux kernel 4.11 source code? Normally when you apply a patch that does not work, you have to reverse the patch with the following command:

Code

patch -p1 -R < path/file.patch

You might have to get a clean linux kernel 4.11 source code and start over again with 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch.

How about putting 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch into packages/linux/patches/ (packages/linux/patches/default?) and trying again?

Alternatively

I assume if your linux kernel 4.11 is located in packages/linux/ and the patches are located in packages/linux/patches/, you should able to run the patch command.

Code

cd linux
patch -p1 < patches/0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch

If the patch is successful, you should be able to compile the kernel 4.11 with the patch.

leading_edjge

Quote from edit4ever

I compiled the latest Leia Rpi2/3 build last night (which includes kernel 4.11.5) with all 5 of the patches and I can still only see 1 front end. Perhaps adding the other 4 patches messed something else up?

Maybe you should only use the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch. The other patches might have reverted some parts of your Linux kernel 4.11 to Linux kernel 4.10.

leading_edjge

Quote from CvH

we are using 4.12 in the next release so the patch needs to fit there,

0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch is enough to make it work ?

For me, yes. It is enough to make it work. Hopefully others can confirm this will work as well.

leading_edjge

Quote from edit4ever

Which version of LE are you running?

Sorry, I am running Raspian OS and not LibreElec. I apologize in advance for any bogus suggestion.

leading_edjge

Quote from CvH

if you have something what works pls ping me to include it in official rls, tx

How about putting in the kernel 4.11.x with the patch 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch from Ubuntu-media-tree-kernel-builder/patches/ubuntu-zesty-4.10.0/extra
at master · b-rad-NDi/Ubuntu-media-tree-kernel-builder · GitHub?

This patch should be removed when the future kernel supports both tuners.

What does everyone else think?

leading_edjge

No. I did not modify the 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch.

I used Kernel 4.11.3 only with above patch. I used these instruction to get both my tuners working. I did not want to use the Kernel release candidate 4.12, and I found that Kernel 4.11.3 worked fine.

Code

On 2017-05-27 10:38, Christian Steiner wrote:
> Hello,
>
> I have found patches that add support for the second tuner:
> https://github.com/b-rad-NDi/Ubuntu-media-tree-kernel-builder/tree/master/patches/ubuntu-zesty-4.10.0/extra
>
> I can confirm that they also work with the latest kernel (4.12.0-rc2).
> Would it be possible to integrate these patches into mainline?
> Applying 0006-Hauppauge-WinTV-DualHD-DVB-ATSC-second-tuner-support.patch
> is sufficient for the second tuner to appear, but I guess we should
> include all patches.
>
> Best regards,
> Christian

Display More

Re: Fwd: [PATCH] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner — Linux media

leading_edjge

I was able to build the patches for two tuners.

I extracted the one patch file 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch from Ubuntu-media-tree-kernel-builder/patches/ubuntu-zesty-4.10.0/extra at master · b-rad-NDi/Ubuntu-media-tree-kernel-builder · GitHub

I had trouble applying the patch with Linux Kernel 4.9 and Linux Kernel 4.10.

I was successful in applying the patch with Linux Kernel 4.11.

I built the patch with Linux Kernel 4.11 using these instructions: Kernel building - Raspberry Pi Documentation

I did not use the LibreElec instructions to compile for my two tuners. I apologize in advance for any bogus suggestion.

Compile - LibreELEC

Would this command work to build Linux Kernel 4.11?

Raspberry Pi 2 or 3 (for master branch):

Code

PROJECT=RPi DEVICE=RPi2 ARCH=arm LINUX_VERSION=4.11

and put the patch file of 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch into projects/RPi2/patches/linux/

Then perform the compilation of the Linux Kernel 4.11 with the patch and create a new image for your Raspberry Pi 3.

leading_edjge

Quote from sciascia88

Thanks for replying. I believe mine is ATSC as well, North American broadcast, correct? I also have the firmware in my lib/firmware folder.

That firmware is only for the Si2168-B40 demodulator on the DVB-C tuner version of the Hauppauge Wintv-Dual HD. It does nothing for the North American ATSC tuner version since it uses a LGDT3306a for its demodulator.

Sorry but LibreELEC version 8.0.2 with Linux Kernel 4.9.x does not support any ATSC tuner of the Hauppauge Wintv-Dual HD.

The single ATSC tuner support of the Hauppauge Wintv-Dual HD showed up in the newly released Linux Kernel 4.11.x.

You would have to wait for a future version of LibreELEC with a Linux Kernel of 4.11.x or greater to see ATSC tuner support. You would have to wait future version of LibreELEC with a future Linux Kernel to see dual ATSC/DVB-C tuner support.

Re: Fwd: [PATCH] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner — Linux media

The other option is to build a new Linux Kernel 4.11.x to make the single ATSC tuner work. If you select this option, you might as well build the patch to support both ATSC tuners.

leading_edjge

Quote from sciascia88

I'm not very savvy in this arena, but I cannot even get one tuner listed in Tvheadend. I'm on Generic build LE version 8.0.2 and I read earlier in this topic that kernel 4.7 and up should support at least one tuner, but they won't show for me. Am I missing something?

Edit: I also tried creating a firmware file in storage/.config/ and adding all of the firmware available in this thread, but no dice. Any sort of help would be appreciated.

For the DVB-C tuner version of the Hauppauge Wintv-Dual HD, can you confirm that you have the correct firmware?

Check if /lib/firmware has the file dvb-demod-si2168-b40-01.fw.

If not, here are the instructions to getting the firmware for the DVB-C tuner version of the Hauppauge Wintv-Dual HD and putting in the /lib/firmware.

Hopefully you will able to see the first tuner.

Sorry I only have the ATSC version of the Hauppauge Wintv-Dual HD, so I cannot verify these instructions.

Code

wget http://palosaari.fi/linux/v4l-dvb/firmware/Si2168/Si2168-B40/4.0.11/dvb-demod-si2168-b40-01.fw
mv dvb-demod-si2168-b40-01.fw /lib/firmware/

leading_edjge

I got both ATSC tuners working for my Raspberry Pi 3 with the patch 0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch from Ubuntu-media-tree-kernel-builder/patches/ubuntu-zesty-4.10.0/extra at master · b-rad-NDi/Ubuntu-media-tree-kernel-builder · GitHub

I had problems applying the patch with kernel 4.9 and 4.10.

I got it working with kernel 4.11.

I assume that two DVB-C tuners are supported with this patch.

Hopefully this patch will be accepted in the future kernel (4.12 or 4.13?). A future Libreelec with the new kernel should see both tuners on the Hauppauge-DualHD.

Code

sudo apt-get install git bc
git clone --depth 1 -b rpi-4.11.y https://github.com/raspberrypi/linux
cd linux
patch -p1 < ../0001-em28xx-Hauppauge-DualHD-DVB-ATSC-second-tuner-suppor.patch
cd linux
KERNEL=kernel7
make bcm2709_defconfig
make -j4 zImage modules dtbs
sudo make modules_install
sudo cp arch/arm/boot/dts/*.dtb /boot/
sudo cp arch/arm/boot/dts/overlays/*.dtb* /boot/overlays/
sudo cp arch/arm/boot/dts/overlays/README /boot/overlays/
sudo scripts/mkknlimg arch/arm/boot/zImage /boot/kernel7.img

Display More

leading_edjge

Quote from hapanero

Can anyone tell me if both of the DVB-C tuners in Hauppauge Wintv-Dual HD work simultaneously with TVHeadend on LibreElec 8?

I've tried looking for info on this everywhere but the information seems conflicting,

I already bought one tuner that only works on Windows (Astrometa DVB T/T2/C) and I don't want to repeat that mistake.

Libreelec/TVHeadend with Linux Kernel 4.7 and higher will support one DVB-C tuner on Hauppauge Wintv-Dual HD currently . You have to build the custom patches listed earlier to get both DVB-C tuners working simultaneously.

leading_edjge

Quote from elliottmc

Hi,

Thanks for your efforts on this. I'd love to switch to TVHeadEnd, but lack the knowledge of how to apply these patches.

Do you know when libreelec will support both tuners for this device out of the box?

Thanks,

Mark

No. Libreelec will not support both tuners out of the box. You would set up TVHeadEnd under Libreelec. Libreelec with Linux Kernel 4.7 and higher will support one DVB tuner. Libreelec does not support ATSC tuner currently. When this patch ([v3,2/2,media] em28xx: support for Hauppauge WinTV-dualHD 01595 ATSC/QAM - Patchwork) is accepted, Libreelec in a future Linux Kernel will support one ATSC tuner. We have to wait until technical bureaucracy of supporting two WinTV-dualHD tuners to be settled in one of the patches and placed in the future Linux Kernel. Until then, I would recommend the "unofficial" patches to get the two tuners working.

Posts by leading_edjge

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner

hauppauge wintv-dual hd - only see one tuner