[dvbtools-cvs] dvbtune dvbtune.c,1.18,1.19

[<lin...@us...>]

Update of /cvsroot/dvbtools/dvbtune
In directory sc8-pr-cvs1:/tmp/cvs-serv11252

Modified Files:
	dvbtune.c 
Log Message:
Process more SI descriptors

Index: dvbtune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvbtune.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dvbtune.c	28 Jan 2003 19:55:46 -0000	1.18
--- dvbtune.c	9 Oct 2003 18:20:52 -0000	1.19
***************
*** 72,75 ****
--- 72,76 ----
  #define IRDETO_CA_SYSTEM	0x602
  #define BETA_CA_SYSTEM		0x1702
+ #define NAGRA_CA_SYSTEM		0x1800
  
  int fd_demuxv,fd_demuxa,fd_demuxtt,fd_demuxsi,fd_demuxrec,fd_demuxd;
***************
*** 467,481 ****
               switch(k) {
                 case SECA_CA_SYSTEM:
!                  for (j=2;j<descriptor_length;j+=15) {
!                    pid=(buf[i+j]&0x1f<<8)|buf[i+j+1];
!                    id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"0x%04x\" ecm_id=\"0x%04x\"/>\n",pid,id);
!                  }
!                  break;
                 case VIACCESS_1_CA_SYSTEM:
                   for (j=2;j<descriptor_length;j+=15) {
!                    pid=(buf[i+j]&0x1f<<8)|buf[i+j+1];
                     id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"0x%04x\" ecm_id=\"0x%04x\"/>\n",pid,id);
                   }
                   break;
--- 468,478 ----
               switch(k) {
                 case SECA_CA_SYSTEM:
!                case NAGRA_CA_SYSTEM:
                 case VIACCESS_1_CA_SYSTEM:
                   for (j=2;j<descriptor_length;j+=15) {
!                    pid=((buf[i+j]&0x1f)<<8)|buf[i+j+1];
                     id=(buf[i+j+2]<<8) | buf[i+j+3];
!                    printf("ecm_pid=\"%d\" ecm_id=\"%d\" ",pid,id);
!                    printf("%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x />\n",buf[i],buf[i+1],buf[i+2],buf[i+3],buf[i+4],buf[i+5],buf[i+6],buf[i+7],buf[i+8],buf[i+9],buf[i+10],buf[i+11],buf[i+12],buf[i+13],buf[i+14]);
                   }
                   break;