add stuff

diff --git a/lib/dvb_ci/dvbci.cpp b/lib/dvb_ci/dvbci.cpp
index 74fa66c794afc8eb879f1c90625d611ee09f0435..6fa8e2ec8c0d17678030471ad6c8f19dcfea7358 100644 (file)
--- a/lib/dvb_ci/dvbci.cpp
+++ b/lib/dvb_ci/dvbci.cpp
@@ -71,6 +71,16 @@ int eDVBCIInterfaces::reset(int slotid)
        return slot->reset();
 }
 
        return slot->reset();
 }
 

+int eDVBCIInterfaces::initialize(int slotid)
+{
+       eDVBCISlot *slot;
+
+       if( (slot = getSlot(slotid)) == 0 )
+               return -1;
+       
+       return slot->initialize();
+}
+

 int eDVBCIInterfaces::startMMI(int slotid)
 {
        eDVBCISlot *slot;
 int eDVBCIInterfaces::startMMI(int slotid)
 {
        eDVBCISlot *slot;


@@ -81,6 +91,16 @@ int eDVBCIInterfaces::startMMI(int slotid)
        return slot->startMMI();
 }
 
        return slot->startMMI();
 }
 

+int eDVBCIInterfaces::answerMMI(int slotid, int answer, char *value)
+{
+       eDVBCISlot *slot;
+
+       if( (slot = getSlot(slotid)) == 0 )
+               return -1;
+       
+       return slot->answerMMI(answer, value);
+}
+

 int eDVBCISlot::send(const unsigned char *data, size_t len)
 {
        int res;
 int eDVBCISlot::send(const unsigned char *data, size_t len)
 {
        int res;


@@ -189,10 +209,22 @@ int eDVBCISlot::reset()
        return 0;
 }
 
        return 0;
 }
 

+int eDVBCISlot::initialize()
+{
+       printf("edvbcislot: initialize()\n");
+       return 0;
+}
+

 int eDVBCISlot::startMMI()
 {
        printf("edvbcislot: startMMI()\n");
        return 0;
 }
 
 int eDVBCISlot::startMMI()
 {
        printf("edvbcislot: startMMI()\n");
        return 0;
 }
 

+int eDVBCISlot::answerMMI(int answer, char *value)
+{
+       printf("edvbcislot: answerMMI()\n");
+       return 0;
+}
+

 eAutoInitP0<eDVBCIInterfaces> init_eDVBCIInterfaces(eAutoInitNumbers::dvb, "CI Slots");
 eAutoInitP0<eDVBCIInterfaces> init_eDVBCIInterfaces(eAutoInitNumbers::dvb, "CI Slots");

diff --git a/lib/dvb_ci/dvbci.h b/lib/dvb_ci/dvbci.h
index 7b8a8e252ffc28e46e15e0e1fe2388f5de09dde4..c6166555b895d7055f4f8d38332e5624639f89fd 100644 (file)
--- a/lib/dvb_ci/dvbci.h
+++ b/lib/dvb_ci/dvbci.h
@@ -29,7 +29,9 @@ public:
        
        int getSlotID();
        int reset();
        
        int getSlotID();
        int reset();

+       int initialize();

        int startMMI();
        int startMMI();

+       int answerMMI(int answer, char *value);

 };
 
 class eDVBCIInterfaces
 };
 
 class eDVBCIInterfaces


@@ -46,7 +48,9 @@ public:
        static eDVBCIInterfaces *getInstance();
        
        int reset(int slot);
        static eDVBCIInterfaces *getInstance();
        
        int reset(int slot);

+       int initialize(int slot);

        int startMMI(int slot);
        int startMMI(int slot);

+       int answerMMI(int slot, int answer, char *value);

 };
 
 #endif
 };
 
 #endif

diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index 24139de28f3d8e62a718b25f0a7f70b8ee336c0c..56236afddea3dd74e9dff65602c543fdb59e5c37 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -65,5 +65,15 @@ int eDVBCI_UI::startMMI(int slot)
        eDVBCIInterfaces::getInstance()->startMMI(slot);
 }
 
        eDVBCIInterfaces::getInstance()->startMMI(slot);
 }
 

+int eDVBCI_UI::initialize(int slot)
+{
+       eDVBCIInterfaces::getInstance()->initialize(slot);
+}
+
+int eDVBCI_UI::answerMMI(int slot, int answer, char *value=0)
+{
+       eDVBCIInterfaces::getInstance()->answerMMI(slot, answer, value);
+}
+

 //FIXME: correct "run/startlevel"
 eAutoInitP0<eDVBCI_UI> init_dvbciui(eAutoInitNumbers::rc, "DVB-CI UI");
 //FIXME: correct "run/startlevel"
 eAutoInitP0<eDVBCI_UI> init_dvbciui(eAutoInitNumbers::rc, "DVB-CI UI");

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index 79f5e03f6f6133a5e9d7e6837bba56e26910632c..66eadf17023848df8a02b06230e049845e8e0fb9 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -22,7 +22,9 @@ public:
        std::string getAppName(int slot);
        void setAppName(int slot, const char *name);
        void setReset(int slot);
        std::string getAppName(int slot);
        void setAppName(int slot, const char *name);
        void setReset(int slot);

+       int initialize(int slot);

        int startMMI(int slot);
        int startMMI(int slot);

+       int answerMMI(int slot, int answer, char *val);

 };
 
 #endif
 };
 
 #endif