Undo previous changes as they were not allowing data to flow

Author: martinmarinov

drivers/src/main/java/info/martinmarinov/drivers/usb/rtl28xx/Rtl2832pFrontend.java

@@ -39,14 +39,16 @@ class Rtl2832pFrontend implements DvbFrontend {
     private final Rtl2832Frontend rtl2832Frontend;
     private final Rtl28xxDvbDevice rtl28xxDvbDevice;
     private final DvbFrontend slave;
+    private final boolean forceSlave;
     private DvbCapabilities rtl2832Capabilities;
 
     private boolean slaveEnabled;
 
-    Rtl2832pFrontend(Rtl2832Frontend rtl2832Frontend, Rtl28xxDvbDevice rtl28xxDvbDevice, DvbFrontend slave) throws DvbException {
+    Rtl2832pFrontend(Rtl2832Frontend rtl2832Frontend, Rtl28xxDvbDevice rtl28xxDvbDevice, DvbFrontend slave, boolean forceSlave) throws DvbException {
         this.rtl2832Frontend = rtl2832Frontend;
         this.rtl28xxDvbDevice = rtl28xxDvbDevice;
         this.slave = slave;
+        this.forceSlave = forceSlave;
     }
 
     @Override
@@ -78,7 +80,7 @@ public synchronized void init(DvbTuner tuner) throws DvbException {
     @Override
     public synchronized void setParams(long frequency, long bandwidthHz, @NonNull DeliverySystem deliverySystem) throws DvbException {
         enableSlave(false);
-        if (!rtl2832Capabilities.getSupportedDeliverySystems().contains(deliverySystem)) {
+        if (forceSlave || !rtl2832Capabilities.getSupportedDeliverySystems().contains(deliverySystem)) {
             enableSlave(true);
         }
         activeFrontend().setParams(frequency, bandwidthHz, deliverySystem);

drivers/src/main/java/info/martinmarinov/drivers/usb/rtl28xx/Rtl28xxSlaveType.java

@@ -34,21 +34,22 @@ enum Rtl28xxSlaveType {
 
         Rtl2832Frontend master = new Rtl2832Frontend(tuner, i2CAdapter, resources);
         Mn88472 slave = new Mn88472(i2CAdapter, resources);
-        return new Rtl2832pFrontend(master, rtl28xxDvbDevice, slave);
+        return new Rtl2832pFrontend(master, rtl28xxDvbDevice, slave, false);
     }),
     SLAVE_DEMOD_MN88473((rtl28xxDvbDevice, tuner, i2CAdapter, resources) -> {
         if (tuner != Rtl28xxTunerType.RTL2832_R828D)
             throw new DvbException(DvbException.ErrorCode.BAD_API_USAGE, resources.getString(R.string.unsupported_slave_on_tuner));
 
         Rtl2832Frontend master = new Rtl2832Frontend(tuner, i2CAdapter, resources);
         Mn88473 slave = new Mn88473(i2CAdapter, resources);
-        return new Rtl2832pFrontend(master, rtl28xxDvbDevice, slave);
+        return new Rtl2832pFrontend(master, rtl28xxDvbDevice, slave, false);
     }),
     SLAVE_DEMOD_CXD2837ER((rtl28xxDvbDevice, tuner, i2CAdapter, resources) -> {
         if (tuner != Rtl28xxTunerType.RTL2832_R828D)
             throw new DvbException(DvbException.ErrorCode.BAD_API_USAGE, resources.getString(R.string.unsupported_slave_on_tuner));
 
-        return new Cxd2841er(
+        Rtl2832Frontend master = new Rtl2832Frontend(tuner, i2CAdapter, resources);
+        Cxd2841er slave = new Cxd2841er(
                 i2CAdapter,
                 resources,
                 Cxd2841er.Xtal.SONY_XTAL_20500,
@@ -57,6 +58,7 @@ enum Rtl28xxSlaveType {
                 true,
                 true,
                 true);
+        return new Rtl2832pFrontend(master, rtl28xxDvbDevice, slave, true);
     });
 
     private final FrontendCreator frontendCreator;