X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d6dcd4c3f46f4453e3978b865650ca756db987e6..bac62ae64bc2b0cba82a26daec4b3623cae3a859:/lib/dvb_ci/dvbci.cpp diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp index 59425bbc..b15fcce3 100644 --- a/lib/dvb_ci/dvbci.cpp +++ b/lib/dvb_ci/dvbci.cpp @@ -72,20 +72,64 @@ int eDVBCIInterfaces::reset(int slotid) if( (slot = getSlot(slotid)) == 0 ) return -1; - + return slot->reset(); } +int eDVBCIInterfaces::enableTS(int slotid, int enable) +{ + eDVBCISlot *slot; + + if( (slot = getSlot(slotid)) == 0 ) + return -1; + + return slot->enableTS(enable); +} + int eDVBCIInterfaces::initialize(int slotid) { eDVBCISlot *slot; 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; + } + return slot->initialize(); } +int eDVBCIInterfaces::sendCAPMT(int slotid) +{ + eDVBCISlot *slot; + + 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 + return 0; + } + ++it; + } + + return -1; +} + int eDVBCIInterfaces::startMMI(int slotid) { eDVBCISlot *slot; @@ -143,45 +187,70 @@ void eDVBCIInterfaces::addPMTHandler(eDVBServicePMTHandler *pmthandler) eServiceReferenceDVB service; pmthandler->getService(service); - PMTHandlerSet::iterator it = m_pmt_handlers.begin(); - while (it != m_pmt_handlers.end()) + eDebug("[eDVBCIInterfaces] addPMTHandler %s", service.toString().c_str()); + + // HACK the first service get the CI.. + eSmartPtrList::iterator ci_it(m_slots.begin()); + for (; ci_it != m_slots.end(); ++ci_it) + { + if (ci_it->use_count) + continue; + ci_it->use_count=1; + new_handler.cislot = ci_it; + new_handler.cislot->resetPrevSentCAPMTVersion(); + } + + if (ci_it == m_slots.end()) { - eServiceReferenceDVB ref; - it->pmthandler->getService(ref); - if ( service == ref && it->usedby ) - new_handler.usedby = it->usedby; - break; + PMTHandlerList::iterator it = m_pmt_handlers.begin(); + while (it != m_pmt_handlers.end()) + { + eServiceReferenceDVB ref; + it->pmthandler->getService(ref); + if ( service == ref && it->cislot ) + { + new_handler.cislot = it->cislot; + ++new_handler.cislot->use_count; + break; + } + ++it; + } } - m_pmt_handlers.insert(new_handler); + + m_pmt_handlers.push_back(new_handler); } void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler) { - PMTHandlerSet::iterator it=m_pmt_handlers.find(pmthandler); + PMTHandlerList::iterator it=std::find(m_pmt_handlers.begin(),m_pmt_handlers.end(),pmthandler); if (it != m_pmt_handlers.end()) { - eDVBCISlot *slot = it->usedby; - eDVBServicePMTHandler *pmthandler = it->pmthandler; + eDVBCISlot *slot = it->cislot; +// eDVBServicePMTHandler *pmthandler = it->pmthandler; m_pmt_handlers.erase(it); - if (slot) + if (slot && !--slot->use_count) { - eServiceReferenceDVB removed_service; - pmthandler->getService(removed_service); - PMTHandlerSet::iterator it=m_pmt_handlers.begin(); +#if 0 + eDebug("[eDVBCIInterfaces] remove last pmt handler for service %s send empty capmt"); + std::vector 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()) { - eServiceReferenceDVB ref; - it->pmthandler->getService(ref); - if (ref == removed_service) + if ( !it->cislot ) + { + it->cislot = slot; + ++slot->use_count; + slot->resetPrevSentCAPMTVersion(); + slot->sendCAPMT(it->pmthandler); break; + } ++it; } - if ( it == m_pmt_handlers.end() && slot->getPrevSentCAPMTVersion() != 0xFF ) - { - std::vector caids; - caids.push_back(0xFFFF); - slot->sendCAPMT(pmthandler, caids); - } } } } @@ -189,26 +258,10 @@ void eDVBCIInterfaces::removePMTHandler(eDVBServicePMTHandler *pmthandler) void eDVBCIInterfaces::gotPMT(eDVBServicePMTHandler *pmthandler) { eDebug("[eDVBCIInterfaces] gotPMT"); - PMTHandlerSet::iterator it=m_pmt_handlers.find(pmthandler); + PMTHandlerList::iterator it=std::find(m_pmt_handlers.begin(), m_pmt_handlers.end(), pmthandler); eServiceReferenceDVB service; - if ( it != m_pmt_handlers.end() ) - { - eDebug("[eDVBCIInterfaces] usedby %p", it->usedby); - if (!it->usedby) - { - // HACK this assigns ALL RUNNING SERVICES to the first free CI !!! - for (eSmartPtrList::iterator ci_it(m_slots.begin()); ci_it != m_slots.end(); ++ci_it) - { - eDVBCISlot **usedby = &it->usedby; - *usedby = ci_it; - (*usedby)->resetPrevSentCAPMTVersion(); - break; - - } - } - if (it->usedby) - it->usedby->sendCAPMT(pmthandler); - } + if ( it != m_pmt_handlers.end() && it->cislot) + it->cislot->sendCAPMT(pmthandler); } int eDVBCIInterfaces::getMMIState(int slotid) @@ -244,6 +297,7 @@ void eDVBCISlot::data(int what) if(what == eSocketNotifier::Priority) { if(state != stateRemoved) { state = stateRemoved; + enableTS(0); printf("ci removed\n"); notifier->setRequested(eSocketNotifier::Read); //HACK @@ -294,6 +348,7 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr) application_manager = 0; mmi_session = 0; ca_manager = 0; + use_count = 0; slotid = nr; @@ -317,6 +372,22 @@ eDVBCISlot::eDVBCISlot(eMainloop *context, int nr) eDVBCISlot::~eDVBCISlot() { + enableTS(0); +} + +void eDVBCISlot::setAppManager( eDVBCIApplicationManagerSession *session ) +{ + application_manager=session; +} + +void eDVBCISlot::setMMIManager( eDVBCIMMISession *session ) +{ + mmi_session = session; +} + +void eDVBCISlot::setCAManager( eDVBCICAManagerSession *session ) +{ + ca_manager = session; } int eDVBCISlot::getSlotID() @@ -328,6 +399,8 @@ int eDVBCISlot::reset() { printf("edvbcislot: reset requested\n"); + enableTS(0); + ioctl(fd, 0); return 0; @@ -395,7 +468,12 @@ int eDVBCISlot::cancelEnq() int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vector &ids) { - const std::vector &caids = ids.empty() && ca_manager ? ca_manager->getCAIDs() : ids; + if (!ca_manager) + { + eDebug("no ca_manager (no CI plugged?)"); + return -1; + } + const std::vector &caids = ids.empty() ? ca_manager->getCAIDs() : ids; ePtr > ptr; if (pmthandler->getPMT(ptr)) return -1; @@ -443,23 +521,39 @@ int eDVBCISlot::sendCAPMT(eDVBServicePMTHandler *pmthandler, const std::vectorsendCAPMT(raw_data + hlen, wp - hlen); - prev_sent_capmt_version = pmt_version; - } + //dont need tag and lenfield + ca_manager->sendCAPMT(raw_data + hlen, wp - hlen); + prev_sent_capmt_version = pmt_version; } } } +int eDVBCISlot::enableTS(int enable) +{ + printf("eDVBCISlot::enableTS(%d)\n", enable); + + FILE *f; + if((f = fopen("/proc/stb/tsmux/input0", "wb")) == NULL) { + printf("cannot open /proc/stb/tsmux/input0\n"); + return 0; + } + + fprintf(f, "%s", enable?"CI":"A"); + + fclose(f); + + return 0; +} + +void eDVBCISlot::resendCAPMT() +{ + eDVBCIInterfaces::getInstance()->sendCAPMT(slotid); +} + eAutoInitP0 init_eDVBCIInterfaces(eAutoInitNumbers::dvb, "CI Slots");