[dvbtools-cvs] dvbtune tune.c,1.6,1.7 dvb_defaults.h,1.1,1.2

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

Update of /cvsroot/dvbtools/dvbtune
In directory usw-pr-cvs1:/tmp/cvs-serv24277

Modified Files:
	tune.c dvb_defaults.h 
Log Message:
moved slof,lof1,lof2 to dvb_defauls.h and renamed to upper-case

Index: tune.c
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/tune.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** tune.c	28 Jun 2002 06:38:09 -0000	1.6
--- tune.c	29 Jun 2002 10:07:21 -0000	1.7
***************
*** 34,41 ****
  #include "dvb_defaults.h"
  
- #define slof (11700*1000UL)
- #define lof1 (9750*1000UL)
- #define lof2 (10600*1000UL)
- 
  int OSTSelftest(int fd)
  {
--- 34,37 ----
***************
*** 193,201 ****
        if (freq > 2200000) {
          // this must be an absolute frequency
!         if (freq < slof) {
!           feparams.Frequency=(freq-lof1);
            if (tone < 0) tone = SEC_TONE_OFF;
          } else {
!           feparams.Frequency=(freq-lof2);
            if (tone < 0) tone = SEC_TONE_ON;
          }
--- 189,197 ----
        if (freq > 2200000) {
          // this must be an absolute frequency
!         if (freq < SLOF) {
!           feparams.Frequency=(freq-LOF1);
            if (tone < 0) tone = SEC_TONE_OFF;
          } else {
!           feparams.Frequency=(freq-LOF2);
            if (tone < 0) tone = SEC_TONE_ON;
          }
***************
*** 310,314 ****
             break;
           case FE_QPSK:
!            fprintf(stderr,"Event:  Frequency: %d\n",(unsigned int)((event.u.completionEvent.Frequency)+(tone==SEC_TONE_OFF ? lof1 : lof2)));
             fprintf(stderr,"        SymbolRate: %d\n",event.u.completionEvent.u.qpsk.SymbolRate);
             fprintf(stderr,"        FEC_inner:  %d\n",event.u.completionEvent.u.qpsk.FEC_inner);
--- 306,310 ----
             break;
           case FE_QPSK:
!            fprintf(stderr,"Event:  Frequency: %d\n",(unsigned int)((event.u.completionEvent.Frequency)+(tone==SEC_TONE_OFF ? LOF1 : LOF2)));
             fprintf(stderr,"        SymbolRate: %d\n",event.u.completionEvent.u.qpsk.SymbolRate);
             fprintf(stderr,"        FEC_inner:  %d\n",event.u.completionEvent.u.qpsk.FEC_inner);

Index: dvb_defaults.h
===================================================================
RCS file: /cvsroot/dvbtools/dvbtune/dvb_defaults.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dvb_defaults.h	27 Jun 2002 18:41:40 -0000	1.1
--- dvb_defaults.h	29 Jun 2002 10:07:21 -0000	1.2
***************
*** 25,28 ****
--- 25,39 ----
  #define _DVB_DEFAULTS_H
  
+ /* DVB-S */
+ 
+ // With a diseqc system you may need different values per LNB.  I hope
+ // no-one ever asks for that :-)
+ 
+ #define SLOF (11700*1000UL)
+ #define LOF1 (9750*1000UL)
+ #define LOF2 (10600*1000UL)
+ 
+ /* DVB-T */
+ 
  /* Either uncomment one of the following lines, or add it to your
     "make" command.  e.g.