[dvbtools-cvs] dvbstream dvbstream.c,1.18,1.19 tune.c,1.15,1.16 tune.h,1.6,1.7

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

Update of /cvsroot/dvbtools/dvbstream
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12523

Modified Files:
	dvbstream.c tune.c tune.h 
Log Message:
Remove references to fd_sec - it is not used with NEWSTRUCT

Index: dvbstream.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/dvbstream.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** dvbstream.c	19 Mar 2004 09:59:32 -0000	1.18
--- dvbstream.c	19 Mar 2004 16:53:56 -0000	1.19
***************
*** 93,97 ****
  char pol=0;
  
! int open_fe(int* fd_frontend,int* fd_sec) {
  
      if((*fd_frontend = open(frontenddev[card],O_RDWR | O_NONBLOCK)) < 0){
--- 93,97 ----
  char pol=0;
  
! int open_fe(int* fd_frontend) {
  
      if((*fd_frontend = open(frontenddev[card],O_RDWR | O_NONBLOCK)) < 0){
***************
*** 99,103 ****
          return -1;
      }
-     fd_sec=0;
      return 1;
  }
--- 99,102 ----
***************
*** 164,168 ****
    unsigned char hi_mappids[8192];
    unsigned char lo_mappids[8192];
-   int fd_sec;
    int fd_frontend;
    int pid,pid2;
--- 163,166 ----
***************
*** 313,317 ****
                  srate=atoi(&cmd[i])*1000UL;
                  fprintf(stderr,"Tuning to %ld,%ld,%c\n",freq,srate,pol);
!                 tune_it(fd_frontend,fd_sec,freq,srate,pol,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
                }
              }
--- 311,315 ----
                  srate=atoi(&cmd[i])*1000UL;
                  fprintf(stderr,"Tuning to %ld,%ld,%c\n",freq,srate,pol);
!                 tune_it(fd_frontend,freq,srate,pol,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
                }
              }
***************
*** 715,725 ****
  
    if ( (freq>100000000)) {
!     if (open_fe(&fd_frontend,0)) {
!       i=tune_it(fd_frontend,0,freq,srate,0,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
      }
    } else if ((freq!=0) && (pol!=0) && (srate!=0)) {
!     if (open_fe(&fd_frontend,&fd_sec)) {
        fprintf(stderr,"Tuning to %ld Hz\n",freq);
!       i=tune_it(fd_frontend,fd_sec,freq,srate,pol,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
      }
    }
--- 713,723 ----
  
    if ( (freq>100000000)) {
!     if (open_fe(&fd_frontend)) {
!       i=tune_it(fd_frontend,freq,srate,0,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
      }
    } else if ((freq!=0) && (pol!=0) && (srate!=0)) {
!     if (open_fe(&fd_frontend)) {
        fprintf(stderr,"Tuning to %ld Hz\n",freq);
!       i=tune_it(fd_frontend,freq,srate,pol,tone,specInv,diseqc,modulation,HP_CodeRate,TransmissionMode,guardInterval,bandWidth);
      }
    }
***************
*** 903,907 ****
    close(fd_dvr);
    close(fd_frontend);
-   if (fd_sec) close(fd_sec);
  
    if (do_analyse) {
--- 901,904 ----

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** tune.c	19 Mar 2004 09:59:33 -0000	1.15
--- tune.c	19 Mar 2004 16:53:56 -0000	1.16
***************
*** 175,179 ****
  }
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth) {
    int res, hi_lo, dfd;
    struct dvb_frontend_parameters feparams;
--- 175,179 ----
  }
  
! int tune_it(int fd_frontend, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth) {
    int res, hi_lo, dfd;
    struct dvb_frontend_parameters feparams;

Index: tune.h
===================================================================
RCS file: /cvsroot/dvbtools/dvbstream/tune.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tune.h	19 Mar 2004 09:59:33 -0000	1.6
--- tune.h	19 Mar 2004 16:53:56 -0000	1.7
***************
*** 6,10 ****
  #include "dvb_defaults.h"
  
! int tune_it(int fd_frontend, int fd_sec, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth);
  
  #endif
--- 6,10 ----
  #include "dvb_defaults.h"
  
! int tune_it(int fd_frontend, unsigned int freq, unsigned int srate, char pol, int tone, fe_spectral_inversion_t specInv, unsigned int diseqc,fe_modulation_t modulation,fe_code_rate_t HP_CodeRate,fe_transmit_mode_t TransmissionMode,fe_guard_interval_t guardInterval, fe_bandwidth_t bandwidth);
  
  #endif