Merge branch 'enable_experimental_unicable_support' into experimental
[enigma2.git] / lib / dvb_ci / dvbci.cpp
index 80573e899f8c19e3fd11b708d9facfba1b4fb26d..883fb5a47fd8373b2ce6b7589e34ca91588c837d 100644 (file)
@@ -6,6 +6,8 @@
 #include <lib/base/ebase.h>
 
 #include <lib/base/eerror.h>
+#include <lib/base/nconfig.h> // access to python config
+#include <lib/dvb/db.h>
 #include <lib/dvb/pmt.h>
 #include <lib/dvb_ci/dvbci.h>
 #include <lib/dvb_ci/dvbci_session.h>
 
 #include <dvbsi++/ca_program_map_section.h>
 
+//#define CIDEBUG 1
+
+#ifdef CIDEBUG
+       #define eDebugCI(x...) eDebug(x)
+#else
+       #define eDebugCI(x...)
+#endif
+
 eDVBCIInterfaces *eDVBCIInterfaces::instance = 0;
 
 eDVBCIInterfaces::eDVBCIInterfaces()
@@ -43,6 +53,22 @@ eDVBCIInterfaces::eDVBCIInterfaces()
                ++num_ci;
        }
 
+       for (eSmartPtrList<eDVBCISlot>::iterator it(m_slots.begin()); it != m_slots.end(); ++it)
+               it->setSource(TUNER_A);
+
+       if (num_ci > 1) // // FIXME .. we force DM8000 when more than one CI Slot is avail
+       {
+               setInputSource(0, TUNER_A);
+               setInputSource(1, TUNER_B);
+               setInputSource(2, TUNER_C);
+               setInputSource(3, TUNER_D);
+       }
+       else
+       {
+               setInputSource(0, TUNER_A);
+               setInputSource(1, TUNER_B);
+       }
+
        eDebug("done, found %d common interface slots", num_ci);
 }
 
@@ -61,29 +87,29 @@ eDVBCISlot *eDVBCIInterfaces::getSlot(int slotid)
                if(i->getSlotID() == slotid)
                        return i;
 
-       printf("FIXME: request for unknown slot\n");
+       eDebug("FIXME: request for unknown slot");
                        
        return 0;
 }
 
-int eDVBCIInterfaces::reset(int slotid)
+int eDVBCIInterfaces::getSlotState(int slotid)
 {
        eDVBCISlot *slot;
 
        if( (slot = getSlot(slotid)) == 0 )
-               return -1;
+               return eDVBCISlot::stateInvalid;
 
-       return slot->reset();
+       return slot->getState();
 }
 
-int eDVBCIInterfaces::enableTS(int slotid, int enable)
+int eDVBCIInterfaces::reset(int slotid)
 {
        eDVBCISlot *slot;
 
        if( (slot = getSlot(slotid)) == 0 )
                return -1;
 
-       return slot->enableTS(enable);
+       return slot->reset();
 }
 
 int eDVBCIInterfaces::initialize(int slotid)
@@ -93,19 +119,9 @@ int eDVBCIInterfaces::initialize(int slotid)
        if( (slot = getSlot(slotid)) == 0 )
                return -1;
 
-       slot->resetPrevSentCAPMTVersion();
-       PMTHandlerList::iterator it = m_pmt_handlers.begin();
-       while (it != m_pmt_handlers.end())
-       {
-               if ( it->cislot == slot )
-               {
-                       slot->sendCAPMT(it->pmthandler);  // send capmt
-                       break;
-               }
-               ++it;
-       }
+       slot->removeService();
 
-       return slot->initialize();
+       return sendCAPMT(slotid);
 }
 
 int eDVBCIInterfaces::sendCAPMT(int slotid)
@@ -115,19 +131,21 @@ int eDVBCIInterfaces::sendCAPMT(int slotid)
        if( (slot = getSlot(slotid)) == 0 )
                return -1;
 
-       slot->resetPrevSentCAPMTVersion();
        PMTHandlerList::iterator it = m_pmt_handlers.begin();
        while (it != m_pmt_handlers.end())
        {
-               if ( it->cislot == slot )
+               eDVBCISlot *tmp = it->cislot;
+               while (tmp && tmp != slot)
+                       tmp = tmp->linked_next;
+               if (tmp)
                {
-                       slot->sendCAPMT(it->pmthandler);  // send capmt
-                       return 0;
+                       tmp->sendCAPMT(it->pmthandler);  // send capmt
+                       break;
                }
                ++it;
        }
 
-       return -1;
+       return 0;
 }
 
 int eDVBCIInterfaces::startMMI(int slotid)
@@ -180,44 +198,352 @@ int eDVBCIInterfaces::cancelEnq(int slotid)
        return slot->cancelEnq();
 }
 
-void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler)
+void eDVBCIInterfaces::ciRemoved(eDVBCISlot *slot)
 {
-       CIPmtHandler new_handler(pmthandler);
-
-       eServiceReferenceDVB service;
-       pmthandler->getService(service);
-
-       eDebug("[eDVBCIInterfaces] addPMTHandler %s", service.toString().c_str());
+       if (slot->use_count)
+       {
+               eDebug("CI Slot %d: removed... usecount %d", slot->getSlotID(), slot->use_count);
+               for (PMTHandlerList::iterator it(m_pmt_handlers.begin());
+                       it != m_pmt_handlers.end(); ++it)
+               {
+                       if (it->cislot == slot) // remove the base slot
+                               it->cislot = slot->linked_next;
+                       else if (it->cislot)
+                       {
+                               eDVBCISlot *prevSlot = it->cislot, *hSlot = it->cislot->linked_next;
+                               while (hSlot)
+                               {
+                                       if (hSlot == slot) {
+                                               prevSlot->linked_next = slot->linked_next;
+                                               break;
+                                       }
+                                       prevSlot = hSlot;
+                                       hSlot = hSlot->linked_next;
+                               }
+                       }
+               }
+               if (slot->linked_next)
+                       slot->linked_next->setSource(slot->current_source);
+               else // last CI in chain
+                       setInputSource(slot->current_tuner, slot->current_source);
+               slot->linked_next = 0;
+               slot->use_count=0;
+               slot->plugged=true;
+               slot->user_mapped=false;
+               slot->removeService(0xFFFF);
+               recheckPMTHandlers();
+       }
+}
 
-       // HACK the first service get the CI..
-       eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin());
-       for (; ci_it != m_slots.end(); ++ci_it)
+static bool canDescrambleMultipleServices(int slotid)
+{
+       char configStr[255];
+       snprintf(configStr, 255, "config.ci.%d.canDescrambleMultipleServices", slotid);
+       std::string str;
+       ePythonConfigQuery::getConfigValue(configStr, str);
+       if ( str == "auto" )
        {
-               if (ci_it->use_count)
-                       continue;
-               ci_it->use_count=1;
-               new_handler.cislot = ci_it;
-               new_handler.cislot->resetPrevSentCAPMTVersion();
+               std::string appname = eDVBCI_UI::getInstance()->getAppName(slotid);
+               if (appname.find("AlphaCrypt") != std::string::npos)
+                       return true;
        }
+       else if (str == "yes")
+               return true;
+       return false;
+}
 
-       if (ci_it == m_slots.end())
+void eDVBCIInterfaces::recheckPMTHandlers()
+{
+       eDebugCI("recheckPMTHAndlers()");
+       for (PMTHandlerList::iterator it(m_pmt_handlers.begin());
+               it != m_pmt_handlers.end(); ++it)
        {
-               PMTHandlerList::iterator it = m_pmt_handlers.begin();
-               while (it != m_pmt_handlers.end())
+               CAID_LIST caids;
+               ePtr<eDVBService> service;
+               eServiceReferenceDVB ref;
+               eDVBCISlot *tmp = it->cislot;
+               eDVBServicePMTHandler *pmthandler = it->pmthandler;
+               eDVBServicePMTHandler::program p;
+               bool plugged_cis_exist = false;
+
+               pmthandler->getServiceReference(ref);
+               pmthandler->getService(service);
+
+               eDebugCI("recheck %p %s", pmthandler, ref.toString().c_str());
+               for (eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it)
+                       if (ci_it->plugged && ci_it->getCAManager())
+                       {
+                               eDebug("Slot %d plugged", ci_it->getSlotID());
+                               ci_it->plugged = false;
+                               plugged_cis_exist = true;
+                       }
+
+               // check if this pmt handler has already assigned CI(s) .. and this CI(s) are already running
+               if (!plugged_cis_exist)
                {
-                       eServiceReferenceDVB ref;
-                       it->pmthandler->getService(ref);
-                       if ( service == ref && it->cislot )
+                       while(tmp)
                        {
-                               new_handler.cislot = it->cislot;
-                               ++new_handler.cislot->use_count;
-                               break;
+                               if (!tmp->running_services.empty())
+                                       break;
+                               tmp=tmp->linked_next;
+                       }
+                       if (tmp) // we dont like to change tsmux for running services
+                       {
+                               eDebugCI("already assigned and running CI!\n");
+                               continue;
+                       }
+               }
+
+               if (!pmthandler->getProgramInfo(p))
+               {
+                       int cnt=0;
+                       for (caidSet::reverse_iterator x(p.caids.rbegin()); x != p.caids.rend(); ++x, ++cnt)
+                               caids.push_front(*x);
+                       if (service && cnt)
+                               service->m_ca = caids;
+               }
+
+               if (service)
+                       caids = service->m_ca;
+
+               if (caids.empty())
+                       continue; // unscrambled service
+
+               for (eSmartPtrList<eDVBCISlot>::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it)
+               {
+                       eDebugCI("check Slot %d", ci_it->getSlotID());
+                       bool useThis=false;
+                       bool user_mapped=true;
+                       eDVBCICAManagerSession *ca_manager = ci_it->getCAManager();
+
+                       if (ca_manager)
+                       {
+                               int mask=0;
+                               if (!ci_it->possible_services.empty())
+                               {
+                                       mask |= 1;
+                                       serviceSet::iterator it = ci_it->possible_services.find(ref);
+                                       if (it != ci_it->possible_services.end())
+                                       {
+                                               eDebug("'%s' is in service list of slot %d... so use it", ref.toString().c_str(), ci_it->getSlotID());
+                                               useThis = true;
+                                       }
+                                       else // check parent
+                                       {
+                                               eServiceReferenceDVB parent_ref = ref.getParentServiceReference();
+                                               if (parent_ref)
+                                               {
+                                                       it = ci_it->possible_services.find(ref);
+                                                       if (it != ci_it->possible_services.end())
+                                                       {
+                                                               eDebug("parent '%s' of '%s' is in service list of slot %d... so use it",
+                                                                       parent_ref.toString().c_str(), ref.toString().c_str(), ci_it->getSlotID());
+                                                               useThis = true;
+                                                       }
+                                               }
+                                       }
+                               }
+                               if (!useThis && !ci_it->possible_providers.empty())
+                               {
+                                       eDVBNamespace ns = ref.getDVBNamespace();
+                                       mask |= 2;
+                                       if (!service) // subservice?
+                                       {
+                                               eServiceReferenceDVB parent_ref = ref.getParentServiceReference();
+                                               eDVBDB::getInstance()->getService(parent_ref, service);
+                                       }
+                                       if (service)
+                                       {
+                                               providerSet::iterator it = ci_it->possible_providers.find(providerPair(service->m_provider_name, ns.get()));
+                                               if (it != ci_it->possible_providers.end())
+                                               {
+                                                       eDebug("'%s/%08x' is in provider list of slot %d... so use it", service->m_provider_name.c_str(), ns.get(), ci_it->getSlotID());
+                                                       useThis = true;
+                                               }
+                                       }
+                               }
+                               if (!useThis && !ci_it->possible_caids.empty())
+                               {
+                                       mask |= 4;
+                                       for (CAID_LIST::iterator ca(caids.begin()); ca != caids.end(); ++ca)
+                                       {
+                                               caidSet::iterator it = ci_it->possible_caids.find(*ca);
+                                               if (it != ci_it->possible_caids.end())
+                                               {
+                                                       eDebug("caid '%04x' is in caid list of slot %d... so use it", *ca, ci_it->getSlotID());
+                                                       useThis = true;
+                                                       break;
+                                               }
+                                       }
+                               }
+                               if (!useThis && !mask)
+                               {
+                                       const std::vector<uint16_t> &ci_caids = ca_manager->getCAIDs();
+                                       for (CAID_LIST::iterator ca(caids.begin()); ca != caids.end(); ++ca)
+                                       {
+                                               std::vector<uint16_t>::const_iterator z =
+                                                       std::lower_bound(ci_caids.begin(), ci_caids.end(), *ca);
+                                               if ( z != ci_caids.end() && *z == *ca )
+                                               {
+                                                       eDebug("The CI in Slot %d has said it can handle caid %04x... so use it", ci_it->getSlotID(), *z);
+                                                       useThis = true;
+                                                       user_mapped = false;
+                                                       break;
+                                               }
+                                       }
+                               }
+                       }
+
+                       if (useThis)
+                       {
+                               // check if this CI is already assigned to this pmthandler
+                               eDVBCISlot *tmp = it->cislot;
+                               while(tmp)
+                               {
+                                       if (tmp == ci_it)
+                                               break;
+                                       tmp=tmp->linked_next;
+                               }
+                               if (tmp) // ignore already assigned cislots...
+                               {
+                                       eDebugCI("already assigned!");
+                                       continue;
+                               }
+                               eDebugCI("current slot %d usecount %d", ci_it->getSlotID(), ci_it->use_count);
+                               if (ci_it->use_count)  // check if this CI can descramble more than one service
+                               {
+                                       bool found = false;
+                                       useThis = false;
+                                       PMTHandlerList::iterator tmp = m_pmt_handlers.begin();
+                                       while (!found && tmp != m_pmt_handlers.end())
+                                       {
+                                               eDebugCI(".");
+                                               eDVBCISlot *tmp_cislot = tmp->cislot;
+                                               while (!found && tmp_cislot)
+                                               {
+                                                       eDebugCI("..");
+                                                       eServiceReferenceDVB ref2;
+                                                       tmp->pmthandler->getServiceReference(ref2);
+                                                       if ( tmp_cislot == ci_it && it->pmthandler != tmp->pmthandler )
+                                                       {
+                                                               eDebugCI("check pmthandler %s for same service/tp", ref2.toString().c_str());
+                                                               eDVBChannelID s1, s2;
+                                                               if (ref != ref2)
+                                                               {
+                                                                       eDebugCI("different services!");
+                                                                       ref.getChannelID(s1);
+                                                                       ref2.getChannelID(s2);
+                                                               }
+                                                               if (ref == ref2 || (s1 == s2 && canDescrambleMultipleServices(tmp_cislot->getSlotID())))
+                                                               {
+                                                                       found = true;
+                                                                       eDebugCI("found!");
+                                                                       eDVBCISlot *tmpci = it->cislot = tmp->cislot;
+                                                                       while(tmpci)
+                                                                       {
+                                                                               ++tmpci->use_count;
+                                                                               eDebug("(2)CISlot %d, usecount now %d", tmpci->getSlotID(), tmpci->use_count);
+                                                                               tmpci=tmpci->linked_next;
+                                                                       }
+                                                               }
+                                                       }
+                                                       tmp_cislot=tmp_cislot->linked_next;
+                                               }
+                                               eDebugCI("...");
+                                               ++tmp;
+                                       }
+                               }
+
+                               if (useThis)
+                               {
+                                       if (ci_it->user_mapped)  // we dont like to link user mapped CIs
+                                       {
+                                               eDebugCI("user mapped CI already in use... dont link!");
+                                               continue;
+                                       }
+
+                                       ++ci_it->use_count;
+                                       eDebug("(1)CISlot %d, usecount now %d", ci_it->getSlotID(), ci_it->use_count);
+
+                                       data_source ci_source=CI_A;
+                                       switch(ci_it->getSlotID())
+                                       {
+                                               case 0: ci_source = CI_A; break;
+                                               case 1: ci_source = CI_B; break;
+                                               case 2: ci_source = CI_C; break;
+                                               case 3: ci_source = CI_D; break;
+                                               default:
+                                                       eDebug("try to get source for CI %d!!\n", ci_it->getSlotID());
+                                                       break;
+                                       }
+
+                                       if (!it->cislot)
+                                       {
+                                               int tunernum = -1;
+                                               eUsePtr<iDVBChannel> channel;
+                                               if (!pmthandler->getChannel(channel))
+                                               {
+                                                       ePtr<iDVBFrontend> frontend;
+                                                       if (!channel->getFrontend(frontend))
+                                                       {
+                                                               eDVBFrontend *fe = (eDVBFrontend*) &(*frontend);
+                                                               tunernum = fe->getSlotID();
+                                                       }
+                                               }
+                                               ASSERT(tunernum != -1);
+                                               data_source tuner_source = TUNER_A;
+                                               switch (tunernum)
+                                               {
+                                                       case 0: tuner_source = TUNER_A; break;
+                                                       case 1: tuner_source = TUNER_B; break;
+                                                       case 2: tuner_source = TUNER_C; break;
+                                                       case 3: tuner_source = TUNER_D; break;
+                                                       default:
+                                                               eDebug("try to get source for tuner %d!!\n", tunernum);
+                                                               break;
+                                               }
+                                               ci_it->current_tuner = tunernum;
+                                               setInputSource(tunernum, ci_source);
+                                               ci_it->setSource(tuner_source);
+                                       }
+                                       else
+                                       {
+                                               ci_it->current_tuner = it->cislot->current_tuner;
+                                               ci_it->linked_next = it->cislot;
+                                               ci_it->setSource(ci_it->linked_next->current_source);
+                                               ci_it->linked_next->setSource(ci_source);
+                                       }
+                                       it->cislot = ci_it;
+                                       eDebugCI("assigned!");
+                                       gotPMT(pmthandler);
+                               }
+
+                               if (it->cislot && user_mapped) // CI assigned to this pmthandler in this run.. and user mapped? then we break here.. we dont like to link other CIs to user mapped CIs
+                               {
+                                       eDebugCI("user mapped CI assigned... dont link CIs!");
+                                       break;
+                               }
                        }
-                       ++it;
                }
        }
+}
+
+void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler)
+{
+       // check if this pmthandler is already registered
+       PMTHandlerList::iterator it = m_pmt_handlers.begin();
+       while (it != m_pmt_handlers.end())
+       {
+               if ( *it++ == pmthandler )
+                       return;
+       }
+
+       eServiceReferenceDVB ref;
+       pmthandler->getServiceReference(ref);
+       eDebug("[eDVBCIInterfaces] addPMTHandler %s", ref.toString().c_str());
 
-       m_pmt_handlers.push_back(new_handler);
+       m_pmt_handlers.push_back(CIPmtHandler(pmthandler));
+       recheckPMTHandlers();
 }
 
 void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler)
@@ -226,32 +552,69 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler)
        if (it != m_pmt_handlers.end())
        {
                eDVBCISlot *slot = it->cislot;
-//             eDVBServicePMTHandler *pmthandler = it->pmthandler;
+               eDVBCISlot *base_slot = slot;
+               eDVBServicePMTHandler *pmthandler = it->pmthandler;
                m_pmt_handlers.erase(it);
-               if (slot && !--slot->use_count)
+
+               eServiceReferenceDVB service_to_remove;
+               pmthandler->getServiceReference(service_to_remove);
+
+               bool sameServiceExist=false;
+               for (PMTHandlerList::iterator i=m_pmt_handlers.begin(); i != m_pmt_handlers.end(); ++i)
                {
-#if 0
-                       eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt");
-                       std::vector<uint16_t> caids;
-                       caids.push_back(0xFFFF);
-                       slot->resetPrevSentCAPMTVersion();
-                       slot->sendCAPMT(pmthandler, caids);
-#endif
-       // check if another service is running
-                       it = m_pmt_handlers.begin();
-                       while (it != m_pmt_handlers.end())
+                       if (i->cislot)
                        {
-                               if ( !it->cislot )
+                               eServiceReferenceDVB ref;
+                               i->pmthandler->getServiceReference(ref);
+                               if ( ref == service_to_remove )
                                {
-                                       it->cislot = slot;
-                                       ++slot->use_count;
-                                       slot->resetPrevSentCAPMTVersion();
-                                       slot->sendCAPMT(it->pmthandler);
+                                       sameServiceExist=true;
                                        break;
                                }
-                               ++it;
                        }
                }
+
+               while(slot)
+               {
+                       eDVBCISlot *next = slot->linked_next;
+                       if (!sameServiceExist)
+                       {
+                               eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt",
+                                       service_to_remove.toString().c_str());
+                               std::vector<uint16_t> caids;
+                               caids.push_back(0xFFFF);
+                               slot->sendCAPMT(pmthandler, caids);  // send a capmt without caids to remove a running service
+                               slot->removeService(service_to_remove.getServiceID().get());
+                       }
+
+                       if (!--slot->use_count)
+                       {
+                               if (slot->linked_next)
+                                       slot->linked_next->setSource(slot->current_source);
+                               else
+                                       setInputSource(slot->current_tuner, slot->current_source);
+
+                               if (base_slot != slot)
+                               {
+                                       eDVBCISlot *tmp = it->cislot;
+                                       while(tmp->linked_next != slot)
+                                               tmp = tmp->linked_next;
+                                       ASSERT(tmp);
+                                       if (slot->linked_next)
+                                               tmp->linked_next = slot->linked_next;
+                                       else
+                                               tmp->linked_next = 0;
+                               }
+                               else // removed old base slot.. update ptr
+                                       base_slot = slot->linked_next;
+                               slot->linked_next = 0;
+                               slot->user_mapped = false;
+                       }
+                       eDebug("(3) slot %d usecount is now %d", slot->getSlotID(), slot->use_count);
+                       slot = next;
+               }
+               // check if another service is waiting for the CI
+               recheckPMTHandlers();
        }
 }
 
@@ -259,9 +622,17 @@ void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler)
 {
        eDebug("[eDVBCIInterfaces] gotPMT");
        PMTHandlerList::iterator it=std::find(m_pmt_handlers.begin(), m_pmt_handlers.end(), pmthandler);
-       eServiceReferenceDVB service;
-       if ( it != m_pmt_handlers.end() && it->cislot)
-               it->cislot->sendCAPMT(pmthandler);
+       if (it != m_pmt_handlers.end() && it->cislot)
+       {
+               eDVBCISlot *tmp = it->cislot;
+               while(tmp)
+               {
+                       eDebugCI("check slot %d %d %d", tmp->getSlotID(), tmp->running_services.empty(), canDescrambleMultipleServices(tmp->getSlotID()));
+                       if (tmp->running_services.empty() || canDescrambleMultipleServices(tmp->getSlotID()))
+                               tmp->sendCAPMT(pmthandler);
+                       tmp = tmp->linked_next;
+               }
+       }
 }
 
 int eDVBCIInterfaces::getMMIState(int slotid)
@@ -270,72 +641,385 @@ int eDVBCIInterfaces::getMMIState(int slotid)
 
        if( (slot = getSlot(slotid)) == 0 )
                return -1;
-       
+
        return slot->getMMIState();
 }
 
+int eDVBCIInterfaces::setInputSource(int tuner_no, data_source source)
+{
+//     eDebug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+//     eDebug("eDVBCIInterfaces::setInputSource(%d %d)", tuner_no, (int)source);
+       if (getNumOfSlots() > 1) // FIXME .. we force DM8000 when more than one CI Slot is avail
+       {
+               char buf[64];
+               snprintf(buf, 64, "/proc/stb/tsmux/input%d", tuner_no);
+
+               FILE *input=0;
+               if((input = fopen(buf, "wb")) == NULL) {
+                       eDebug("cannot open %s", buf);
+                       return 0;
+               }
+
+               if (tuner_no > 3)
+                       eDebug("setInputSource(%d, %d) failed... dm8000 just have four inputs", tuner_no, (int)source);
+
+               switch(source)
+               {
+                       case CI_A:
+                               fprintf(input, "CI0");
+                               break;
+                       case CI_B:
+                               fprintf(input, "CI1");
+                               break;
+                       case CI_C:
+                               fprintf(input, "CI2");
+                       break;
+                       case CI_D:
+                               fprintf(input, "CI3");
+                               break;
+                       case TUNER_A:
+                               fprintf(input, "A");
+                               break;
+                       case TUNER_B:
+                               fprintf(input, "B");
+                               break;
+                       case TUNER_C:
+                               fprintf(input, "C");
+                               break;
+                       case TUNER_D:
+                               fprintf(input, "D");
+                               break;
+                       default:
+                               eDebug("setInputSource for input %d failed!!!\n", (int)source);
+                               break;
+               }
+
+               fclose(input);
+       }
+       else  // DM7025
+       {
+               char buf[64];
+               snprintf(buf, 64, "/proc/stb/tsmux/input%d", tuner_no);
+
+               if (tuner_no > 1)
+                       eDebug("setInputSource(%d, %d) failed... dm7025 just have two inputs", tuner_no, (int)source);
+
+               FILE *input=0;
+               if((input = fopen(buf, "wb")) == NULL) {
+                       eDebug("cannot open %s", buf);
+                       return 0;
+               }
+
+               switch(source)
+               {
+                       case CI_A:
+                               fprintf(input, "CI");
+                               break;
+                       case TUNER_A:
+                               fprintf(input, "A");
+                               break;
+                       case TUNER_B:
+                               fprintf(input, "B");
+                               break;
+                       default:
+                               eDebug("setInputSource for input %d failed!!!\n", (int)source);
+                               break;
+               }
+
+               fclose(input);
+       }
+       eDebug("eDVBCIInterfaces->setInputSource(%d, %d)", tuner_no, (int)source);
+       return 0;
+}
+
+PyObject *eDVBCIInterfaces::getDescrambleRules(int slotid)
+{
+       eDVBCISlot *slot = getSlot(slotid);
+       if (!slot)
+       {
+               char tmp[255];
+               snprintf(tmp, 255, "eDVBCIInterfaces::getDescrambleRules try to get rules for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+               PyErr_SetString(PyExc_StandardError, tmp);
+               return 0;
+       }
+       ePyObject tuple = PyTuple_New(3);
+       int caids = slot->possible_caids.size();
+       int services = slot->possible_services.size();
+       int providers = slot->possible_providers.size();
+       ePyObject caid_list = PyList_New(caids);
+       ePyObject service_list = PyList_New(services);
+       ePyObject provider_list = PyList_New(providers);
+       caidSet::iterator caid_it(slot->possible_caids.begin());
+       while(caids)
+       {
+               --caids;
+               PyList_SET_ITEM(caid_list, caids, PyLong_FromLong(*caid_it));
+               ++caid_it;
+       }
+       serviceSet::iterator ref_it(slot->possible_services.begin());
+       while(services)
+       {
+               --services;
+               PyList_SET_ITEM(service_list, services, PyString_FromString(ref_it->toString().c_str()));
+               ++ref_it;
+       }
+       providerSet::iterator provider_it(slot->possible_providers.begin());
+       while(providers)
+       {
+               ePyObject tuple = PyTuple_New(2);
+               PyTuple_SET_ITEM(tuple, 0, PyString_FromString(provider_it->first.c_str()));
+               PyTuple_SET_ITEM(tuple, 1, PyLong_FromUnsignedLong(provider_it->second));
+               --providers;
+               PyList_SET_ITEM(provider_list, providers, tuple);
+               ++provider_it;
+       }
+       PyTuple_SET_ITEM(tuple, 0, service_list);
+       PyTuple_SET_ITEM(tuple, 1, provider_list);
+       PyTuple_SET_ITEM(tuple, 2, caid_list);
+       return tuple;
+}
+
+const char *PyObject_TypeStr(PyObject *o)
+{
+       return o->ob_type && o->ob_type->tp_name ? o->ob_type->tp_name : "unknown object type";
+}
+
+RESULT eDVBCIInterfaces::setDescrambleRules(int slotid, SWIG_PYOBJECT(ePyObject) obj )
+{
+       eDVBCISlot *slot = getSlot(slotid);
+       if (!slot)
+       {
+               char tmp[255];
+               snprintf(tmp, 255, "eDVBCIInterfaces::setDescrambleRules try to set rules for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+               PyErr_SetString(PyExc_StandardError, tmp);
+               return -1;
+       }
+       if (!PyTuple_Check(obj))
+       {
+               char tmp[255];
+               snprintf(tmp, 255, "2nd argument of setDescrambleRules is not a tuple.. it is a '%s'!!", PyObject_TypeStr(obj));
+               PyErr_SetString(PyExc_StandardError, tmp);
+               return -1;
+       }
+       if (PyTuple_Size(obj) != 3)
+       {
+               const char *errstr = "eDVBCIInterfaces::setDescrambleRules not enough entrys in argument tuple!!\n"
+                       "first argument should be a pythonlist with possible services\n"
+                       "second argument should be a pythonlist with possible providers/dvbnamespace tuples\n"
+                       "third argument should be a pythonlist with possible caids";
+               PyErr_SetString(PyExc_StandardError, errstr);
+               return -1;
+       }
+       ePyObject service_list = PyTuple_GET_ITEM(obj, 0);
+       ePyObject provider_list = PyTuple_GET_ITEM(obj, 1);
+       ePyObject caid_list = PyTuple_GET_ITEM(obj, 2);
+       if (!PyList_Check(service_list) || !PyList_Check(provider_list) || !PyList_Check(caid_list))
+       {
+               char errstr[512];
+               snprintf(errstr, 512, "eDVBCIInterfaces::setDescrambleRules incorrect data types in argument tuple!!\n"
+                       "first argument(%s) should be a pythonlist with possible services (reference strings)\n"
+                       "second argument(%s) should be a pythonlist with possible providers (providername strings)\n"
+                       "third argument(%s) should be a pythonlist with possible caids (ints)",
+                       PyObject_TypeStr(service_list), PyObject_TypeStr(provider_list), PyObject_TypeStr(caid_list));
+               PyErr_SetString(PyExc_StandardError, errstr);
+               return -1;
+       }
+       slot->possible_caids.clear();
+       slot->possible_services.clear();
+       slot->possible_providers.clear();
+       int size = PyList_Size(service_list);
+       while(size)
+       {
+               --size;
+               ePyObject refstr = PyList_GET_ITEM(service_list, size);
+               if (!PyString_Check(refstr))
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules entry in service list is not a string.. it is '%s'!!", PyObject_TypeStr(refstr));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               char *tmpstr = PyString_AS_STRING(refstr);
+               eServiceReference ref(tmpstr);
+               if (ref.valid())
+                       slot->possible_services.insert(ref);
+               else
+                       eDebug("eDVBCIInterfaces::setDescrambleRules '%s' is not a valid service reference... ignore!!", tmpstr);
+       };
+       size = PyList_Size(provider_list);
+       while(size)
+       {
+               --size;
+               ePyObject tuple = PyList_GET_ITEM(provider_list, size);
+               if (!PyTuple_Check(tuple))
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules entry in provider list is not a tuple it is '%s'!!", PyObject_TypeStr(tuple));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               if (PyTuple_Size(tuple) != 2)
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules provider tuple has %d instead of 2 entries!!", PyTuple_Size(tuple));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               if (!PyString_Check(PyTuple_GET_ITEM(tuple, 0)))
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules 1st entry in provider tuple is not a string it is '%s'", PyObject_TypeStr(PyTuple_GET_ITEM(tuple, 0)));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               if (!PyLong_Check(PyTuple_GET_ITEM(tuple, 1)))
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules 2nd entry in provider tuple is not a long it is '%s'", PyObject_TypeStr(PyTuple_GET_ITEM(tuple, 1)));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               char *tmpstr = PyString_AS_STRING(PyTuple_GET_ITEM(tuple, 0));
+               uint32_t orbpos = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(tuple, 1));
+               if (strlen(tmpstr))
+                       slot->possible_providers.insert(std::pair<std::string, uint32_t>(tmpstr, orbpos));
+               else
+                       eDebug("eDVBCIInterfaces::setDescrambleRules ignore invalid entry in provider tuple (string is empty)!!");
+       };
+       size = PyList_Size(caid_list);
+       while(size)
+       {
+               --size;
+               ePyObject caid = PyList_GET_ITEM(caid_list, size);
+               if (!PyLong_Check(caid))
+               {
+                       char buf[255];
+                       snprintf(buf, 255, "eDVBCIInterfaces::setDescrambleRules entry in caid list is not a long it is '%s'!!", PyObject_TypeStr(caid));
+                       PyErr_SetString(PyExc_StandardError, buf);
+                       return -1;
+               }
+               int tmpcaid = PyLong_AsLong(caid);
+               if (tmpcaid > 0 && tmpcaid < 0x10000)
+                       slot->possible_caids.insert(tmpcaid);
+               else
+                       eDebug("eDVBCIInterfaces::setDescrambleRules %d is not a valid caid... ignore!!", tmpcaid);
+       };
+       return 0;
+}
+
+PyObject *eDVBCIInterfaces::readCICaIds(int slotid)
+{
+       eDVBCISlot *slot = getSlot(slotid);
+       if (!slot)
+       {
+               char tmp[255];
+               snprintf(tmp, 255, "eDVBCIInterfaces::readCICaIds try to get CAIds for CI Slot %d... but just %d slots are available", slotid, m_slots.size());
+               PyErr_SetString(PyExc_StandardError, tmp);
+       }
+       else
+       {
+               int idx=0;
+               eDVBCICAManagerSession *ca_manager = slot->getCAManager();
+               const std::vector<uint16_t> *ci_caids = ca_manager ? &ca_manager->getCAIDs() : 0;
+               ePyObject list = PyList_New(ci_caids ? ci_caids->size() : 0);
+               if (ci_caids)
+               {
+                       for (std::vector<uint16_t>::const_iterator it = ci_caids->begin(); it != ci_caids->end(); ++it)
+                               PyList_SET_ITEM(list, idx++, PyLong_FromLong(*it));
+               }
+               return list;
+       }
+       return 0;
+}
+
+int eDVBCIInterfaces::setCIClockRate(int slotid, int rate)
+{
+       eDVBCISlot *slot = getSlot(slotid);
+       if (slot)
+               return slot->setClockRate(rate);
+       return -1;
+}
+
 int eDVBCISlot::send(const unsigned char *data, size_t len)
 {
-       int res;
+       int res=0;
        //int i;
-       //printf("< ");
+       //eDebugNoNewLine("< ");
        //for(i=0;i<len;i++)
-       //      printf("%02x ",data[i]);
-       //printf("\n");
-
-       res = ::write(fd, data, len);
+       //      eDebugNoNewLine("%02x ",data[i]);
+       //eDebug("");
 
-       //printf("write() %d\n",res);
+       if (sendqueue.empty())
+               res = ::write(fd, data, len);
 
-       notifier->setRequested(eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write);
+       if (res < 0 || (unsigned int)res != len)
+       {
+               unsigned char *d = new unsigned char[len];
+               memcpy(d, data, len);
+               sendqueue.push( queueData(d, len) );
+               notifier->setRequested(eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write);
+       }
 
        return res;
 }
 
 void eDVBCISlot::data(int what)
 {
+       eDebugCI("CISlot %d what %d\n", getSlotID(), what);
        if(what == eSocketNotifier::Priority) {
                if(state != stateRemoved) {
                        state = stateRemoved;
-                       enableTS(0);
-                       printf("ci removed\n");
+                       while(sendqueue.size())
+                       {
+                               delete [] sendqueue.top().data;
+                               sendqueue.pop();
+                       }
+                       eDVBCISession::deleteSessions(this);
+                       eDVBCIInterfaces::getInstance()->ciRemoved(this);
                        notifier->setRequested(eSocketNotifier::Read);
-                       //HACK
-                       eDVBCI_UI::getInstance()->setState(0,0);
+                       eDVBCI_UI::getInstance()->setState(getSlotID(),0);
                }
                return;
        }
 
-       __u8 data[4096];
-       int r;
-       r = ::read(fd, data, 4096);
+       if (state == stateInvalid)
+               reset();
 
        if(state != stateInserted) {
+               eDebug("ci inserted in slot %d", getSlotID());
                state = stateInserted;
-               eDebug("ci inserted");
-
-               //HACK
-               eDVBCI_UI::getInstance()->setState(0,1);
-
+               eDVBCI_UI::getInstance()->setState(getSlotID(),1);
+               notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority);
                /* enable PRI to detect removal or errors */
-               notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Write);
        }
 
-       if(r > 0) {
-               //int i;
-               //printf("> ");
-               //for(i=0;i<r;i++)
-               //      printf("%02x ",data[i]);
-               //printf("\n");
-               eDVBCISession::receiveData(this, data, r);
-               notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority|eSocketNotifier::Write);
-               return;
+       if (what & eSocketNotifier::Read) {
+               __u8 data[4096];
+               int r;
+               r = ::read(fd, data, 4096);
+               if(r > 0) {
+//                     int i;
+//                     eDebugNoNewLine("> ");
+//                     for(i=0;i<r;i++)
+//                             eDebugNoNewLine("%02x ",data[i]);
+//                     eDebug("");
+                       eDVBCISession::receiveData(this, data, r);
+                       eDVBCISession::pollAll();
+                       return;
+               }
        }
-
-       if(what == eSocketNotifier::Write) {
-               if(eDVBCISession::pollAll() == 0) {
-                       notifier->setRequested(eSocketNotifier::Read | eSocketNotifier::Priority);
+       else if (what & eSocketNotifier::Write) {
+               if (!sendqueue.empty()) {
+                       const queueData &qe = sendqueue.top();
+                       int res = ::write(fd, qe.data, qe.len);
+                       if (res >= 0 && (unsigned int)res == qe.len)
+                       {
+                               delete [] qe.data;
+                               sendqueue.pop();
+                       }
                }
+               else
+                       notifier->setRequested(eSocketNotifier::Read|eSocketNotifier::Priority);
        }
 }
 
@@ -349,20 +1033,26 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr)
        mmi_session = 0;
        ca_manager = 0;
        use_count = 0;
+       linked_next = 0;
+       user_mapped = false;
+       plugged = true;
        
        slotid = nr;
 
        sprintf(filename, "/dev/ci%d", nr);
 
+//     possible_caids.insert(0x1702);
+//     possible_providers.insert(providerPair("PREMIERE", 0xC00000));
+//     possible_services.insert(eServiceReference("1:0:1:2A:4:85:C00000:0:0:0:"));
+
        fd = ::open(filename, O_RDWR | O_NONBLOCK);
 
-       eDebug("eDVBCISlot has fd %d", fd);
-       
-       state = stateInserted;
+       eDebugCI("CI Slot %d has fd %d", getSlotID(), fd);
+       state = stateInvalid;
 
        if (fd >= 0)
        {
-               notifier = new eSocketNotifier(context, fd, eSocketNotifier::Read | eSocketNotifier::Priority);
+               notifier = eSocketNotifier::create(context, fd, eSocketNotifier::Read | eSocketNotifier::Priority | eSocketNotifier::Write);
                CONNECT(notifier->activated, eDVBCISlot::data);
        } else
        {
@@ -372,7 +1062,7 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr)
 
 eDVBCISlot::~eDVBCISlot()
 {
-       enableTS(0);
+       eDVBCISession::deleteSessions(this);
 }
 
 void eDVBCISlot::setAppManager( eDVBCIApplicationManagerSession *session )
@@ -397,24 +1087,30 @@ int eDVBCISlot::getSlotID()
 
 int eDVBCISlot::reset()
 {
-       printf("edvbcislot: reset requested\n");
+       eDebug("CI Slot %d: reset requested", getSlotID());
 
-       enableTS(0);
+       if (state == stateInvalid)
+       {
+               unsigned char buf[256];
+               eDebug("ci flush");
+               while(::read(fd, buf, 256)>0);
+               state = stateResetted;
+       }
 
-       ioctl(fd, 0);
+       while(sendqueue.size())
+       {
+               delete [] sendqueue.top().data;
+               sendqueue.pop();
+       }
 
-       return 0;
-}
+       ioctl(fd, 0);
 
-int eDVBCISlot::initialize()
-{
-       printf("edvbcislot: initialize()\n");
        return 0;
 }
 
 int eDVBCISlot::startMMI()
 {
-       printf("edvbcislot: startMMI()\n");
+       eDebug("CI Slot %d: startMMI()", getSlotID());
        
        if(application_manager)
                application_manager->startMMI();
@@ -424,7 +1120,7 @@ int eDVBCISlot::startMMI()
 
 int eDVBCISlot::stopMMI()
 {
-       printf("edvbcislot: stopMMI()\n");
+       eDebug("CI Slot %d: stopMMI()", getSlotID());
 
        if(mmi_session)
                mmi_session->stopMMI();
@@ -434,7 +1130,7 @@ int eDVBCISlot::stopMMI()
 
 int eDVBCISlot::answerText(int answer)
 {
-       printf("edvbcislot: answerText(%d)\n", answer);
+       eDebug("CI Slot %d: answerText(%d)", getSlotID(), answer);
 
        if(mmi_session)
                mmi_session->answerText(answer);
@@ -452,13 +1148,17 @@ int eDVBCISlot::getMMIState()
 
 int eDVBCISlot::answerEnq(char *value)
 {
-       printf("edvbcislot: answerENQ(%s)\n", value);
+       eDebug("CI Slot %d: answerENQ(%s)", getSlotID(), value);
+
+       if(mmi_session)
+               mmi_session->answerEnq(value);
+
        return 0;
 }
 
 int eDVBCISlot::cancelEnq()
 {
-       printf("edvbcislot: cancelENQ\n");
+       eDebug("CI Slot %d: cancelENQ", getSlotID());
 
        if(mmi_session)
                mmi_session->cancelEnq();
@@ -482,25 +1182,42 @@ int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vector<u
                eDVBTableSpec table_spec;
                ptr->getSpec(table_spec);
                int pmt_version = table_spec.version & 0x1F; // just 5 bits
-               if ( pmt_version == prev_sent_capmt_version )
+
+               eServiceReferenceDVB ref;
+               pmthandler->getServiceReference(ref);
+               uint16_t program_number = ref.getServiceID().get();
+               std::map<uint16_t, uint8_t>::iterator it =
+                       running_services.find(program_number);
+               bool sendEmpty = caids.size() == 1 && caids[0] == 0xFFFF;
+
+               if ( it != running_services.end() &&
+                       (pmt_version == it->second) &&
+                       !sendEmpty )
                {
-                       eDebug("[eDVBCISlot] dont sent self capmt version twice");
+                       eDebug("[eDVBCISlot] dont send self capmt version twice");
                        return -1;
                }
+
                std::vector<ProgramMapSection*>::const_iterator i=ptr->getSections().begin();
                if ( i == ptr->getSections().end() )
                        return -1;
                else
                {
                        unsigned char raw_data[2048];
-                       CaProgramMapSection capmt(*i++, prev_sent_capmt_version != 0xFF ? 0x05 /*update*/ : 0x03 /*only*/, 0x01, caids );
+
+//                     eDebug("send %s capmt for service %04x to slot %d",
+//                             it != running_services.end() ? "UPDATE" : running_services.empty() ? "ONLY" : "ADD",
+//                             program_number, slotid);
+
+                       CaProgramMapSection capmt(*i++,
+                               it != running_services.end() ? 0x05 /*update*/ : running_services.empty() ? 0x03 /*only*/ : 0x04 /*add*/, 0x01, caids );
                        while( i != ptr->getSections().end() )
                        {
                //                      eDebug("append");
                                capmt.append(*i++);
                        }
                        capmt.writeToBuffer(raw_data);
-#if 1
+
 // begin calc capmt length
                        int wp=0;
                        int hlen;
@@ -521,39 +1238,112 @@ int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vector<u
                                hlen = 4;
                        }
 // end calc capmt length
-                       eDebug("ca_manager %p dump capmt:", ca_manager);
-                       for(int i=0;i<wp;i++)
-                               eDebugNoNewLine("%02x ", raw_data[i]);
-                       eDebug("");
-#endif
+
+                       if (sendEmpty)
+                       {
+//                             eDebugNoNewLine("SEND EMPTY CAPMT.. old version is %02x", raw_data[hlen+3]);
+                               if (sendEmpty && running_services.size() == 1)  // check if this is the capmt for the last running service
+                                       raw_data[hlen] = 0x03; // send only instead of update... because of strange effects with alphacrypt
+                               raw_data[hlen+3] &= ~0x3E;
+                               raw_data[hlen+3] |= ((pmt_version+1) & 0x1F) << 1;
+//                             eDebug(" new version is %02x", raw_data[hlen+3]);
+                       }
+
+//                     eDebug("ca_manager %p dump capmt:", ca_manager);
+//                     for(int i=0;i<wp;i++)
+//                             eDebugNoNewLine("%02x ", raw_data[i]);
+//                     eDebug("");
+
                        //dont need tag and lenfield
                        ca_manager->sendCAPMT(raw_data + hlen, wp - hlen);
-                       prev_sent_capmt_version = pmt_version;
+                       running_services[program_number] = pmt_version;
                }
        }
        return 0;
 }
 
-int eDVBCISlot::enableTS(int enable)
+void eDVBCISlot::removeService(uint16_t program_number)
 {
-       printf("eDVBCISlot::enableTS(%d)\n", enable);
+       if (program_number == 0xFFFF)
+               running_services.clear();  // remove all
+       else
+               running_services.erase(program_number);  // remove single service
+}
 
-       FILE *f;
-       if((f = fopen("/proc/stb/tsmux/input0", "wb")) == NULL) {
-               printf("cannot open /proc/stb/tsmux/input0\n");
-               return 0;
+int eDVBCISlot::setSource(data_source source)
+{
+       current_source = source;
+       if (eDVBCIInterfaces::getInstance()->getNumOfSlots() > 1) // FIXME .. we force DM8000 when more than one CI Slot is avail
+       {
+               char buf[64];
+               snprintf(buf, 64, "/proc/stb/tsmux/ci%d_input", slotid);
+               FILE *ci = fopen(buf, "wb");
+               switch(source)
+               {
+                       case CI_A:
+                               fprintf(ci, "CI0");
+                               break;
+                       case CI_B:
+                               fprintf(ci, "CI1");
+                               break;
+                       case CI_C:
+                               fprintf(ci, "CI2");
+                               break;
+                       case CI_D:
+                               fprintf(ci, "CI3");
+                               break;
+                       case TUNER_A:
+                               fprintf(ci, "A");
+                               break;
+                       case TUNER_B:
+                               fprintf(ci, "B");
+                               break;
+                       case TUNER_C:
+                               fprintf(ci, "C");
+                               break;
+                               case TUNER_D:
+                               fprintf(ci, "D");
+                               break;
+                       default:
+                               eDebug("CI Slot %d: setSource %d failed!!!\n", getSlotID(), (int)source);
+                               break;
+               }
+               fclose(ci);
        }
-
-       fprintf(f, "%s", enable?"CI":"A");
-
-       fclose(f);
-
+       else // DM7025
+       {
+//             eDebug("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+//             eDebug("eDVBCISlot::enableTS(%d %d)", enable, (int)source);
+               FILE *ci = fopen("/proc/stb/tsmux/input2", "wb");
+               if(ci == NULL) {
+                       eDebug("cannot open /proc/stb/tsmux/input2");
+                       return 0;
+               }
+               if (source != TUNER_A && source != TUNER_B)
+                       eDebug("CI Slot %d: setSource %d failed!!!\n", getSlotID(), (int)source);
+               else
+                       fprintf(ci, "%s", source==TUNER_A ? "A" : "B");  // configure CI data source (TunerA, TunerB)
+               fclose(ci);
+       }
+       eDebug("CI Slot %d setSource(%d)", getSlotID(), (int)source);
        return 0;
 }
 
-void eDVBCISlot::resendCAPMT()
+int eDVBCISlot::setClockRate(int rate)
 {
-       eDVBCIInterfaces::getInstance()->sendCAPMT(slotid);
+       char buf[64];
+       snprintf(buf, 64, "/proc/stb/tsmux/ci%d_tsclk", slotid);
+       FILE *ci = fopen(buf, "wb");
+       if (ci)
+       {
+               if (rate)
+                       fprintf(ci, "high");
+               else
+                       fprintf(ci, "normal");
+               fclose(ci);
+               return 0;
+       }
+       return -1;
 }
 
 eAutoInitP0<eDVBCIInterfaces> init_eDVBCIInterfaces(eAutoInitNumbers::dvb, "CI Slots");