[vlc-devel] commit: en50221: Backport changes needed for Powercam PRO CAMs ( Marian Ďurkovič )

[git version control]

vlc | branch: 1.0-bugfix | Marian Ďurkovič <md at bts.sk> | Thu Oct 29 14:07:42 2009 +0100| [d1ee03008e6eb41f4e0b943f124e378c950ddb6e] | committer: Marian Ďurkovič 

en50221: Backport changes needed for Powercam PRO CAMs

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1ee03008e6eb41f4e0b943f124e378c950ddb6e
---

 modules/access/dvb/en50221.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/access/dvb/en50221.c b/modules/access/dvb/en50221.c
index fbf2147..f7c99a9 100644
--- a/modules/access/dvb/en50221.c
+++ b/modules/access/dvb/en50221.c
@@ -79,6 +79,7 @@
 #undef DEBUG_TPDU
 #define HLCI_WAIT_CAM_READY 0
 #define CAM_PROG_MAX MAX_PROGRAMS
+//#define CAPMT_WAIT 100             /* uncomment this for slow CAMs */
 
 static void ResourceManagerOpen( access_t * p_access, int i_session_id );
 static void ApplicationInformationOpen( access_t * p_access, int i_session_id );
@@ -957,7 +958,7 @@ static void ApplicationInformationOpen( access_t * p_access, int i_session_id )
  * Conditional Access
  */
 
-#define MAX_CASYSTEM_IDS 16
+#define MAX_CASYSTEM_IDS 64
 
 typedef struct
 {
@@ -967,7 +968,7 @@ typedef struct
 static bool CheckSystemID( system_ids_t *p_ids, uint16_t i_id )
 {
     int i = 0;
-    if( !p_ids ) return true;
+    if( !p_ids ) return true;      /* dummy session for high-level CI intf */
 
     while ( p_ids->pi_system_ids[i] )
     {
@@ -1237,6 +1238,9 @@ static void CAPMTAdd( access_t * p_access, int i_session_id,
         return;
     }
  
+#ifdef CAPMT_WAIT
+    msleep( CAPMT_WAIT * 1000 );
+#endif
  
     msg_Dbg( p_access, "adding CAPMT for SID %d on session %d",
              p_pmt->i_program_number, i_session_id );