[Bdadev-cvs] NovaTDriver device.cpp,1.7,1.8 l64781.cpp,1.7,1.8

[<ad...@us...>]

Update of /cvsroot/bdadev/NovaTDriver
In directory sc8-pr-cvs1:/tmp/cvs-serv31190

Modified Files:
	device.cpp l64781.cpp 
Log Message:
Changes to ties up to chip spec more closely


Index: device.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** device.cpp	7 Mar 2003 08:04:12 -0000	1.7
--- device.cpp	10 Mar 2003 18:36:21 -0000	1.8
***************
*** 308,311 ****
--- 308,313 ----
  	}
  	if((ToState!=KSSTATE_STOP)&&(FromState==KSSTATE_STOP)) {
+ 		Tuner_SetFrequency((PKSDEVICE)Pin->Context);
+         L64781_UpdateParameters((PKSDEVICE)Pin->Context);
  		NTSTATUS result=SAA7146_StartStream((PKSDEVICE)Pin->Context);
  		if(result!=STATUS_SUCCESS) {
***************
*** 313,318 ****
  			return result;
  		}
- 		Tuner_SetFrequency((PKSDEVICE)Pin->Context);
-         L64781_UpdateParameters((PKSDEVICE)Pin->Context);
          //StartMonitoringThread((PKSDEVICE)Pin->Context);
  	}
--- 315,318 ----
***************
*** 328,331 ****
--- 328,334 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.8  2003/03/10 18:36:21  adcockj
+  * Changes to ties up to chip spec more closely
+  *
   * Revision 1.7  2003/03/07 08:04:12  adcockj
   * Temp remove monitoring thread

Index: l64781.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** l64781.cpp	7 Mar 2003 08:04:14 -0000	1.7
--- l64781.cpp	10 Mar 2003 18:36:22 -0000	1.8
***************
*** 115,120 ****
  	data->demodulator.HP_coderate=BDA_BCC_RATE_2_3;
  	data->demodulator.modulation=BDA_MOD_64QAM;
! 	data->demodulator.HP_coderate=BDA_BCC_RATE_3_4;
! 	data->demodulator.modulation=BDA_MOD_16QAM;
  	data->demodulator.transmit_mode=BDA_XMIT_MODE_2K;
  	data->demodulator.guard_interval=BDA_GUARD_1_32;
--- 115,120 ----
  	data->demodulator.HP_coderate=BDA_BCC_RATE_2_3;
  	data->demodulator.modulation=BDA_MOD_64QAM;
! 	//data->demodulator.HP_coderate=BDA_BCC_RATE_3_4;
! 	//data->demodulator.modulation=BDA_MOD_16QAM;
  	data->demodulator.transmit_mode=BDA_XMIT_MODE_2K;
  	data->demodulator.guard_interval=BDA_GUARD_1_32;
***************
*** 132,136 ****
  	L64781_WriteRegister(device,0x0B,0x81);		// Use internal ADC
  	L64781_WriteRegister(device,0x0C,0x84);		// AGC loop gain, and polarity is positive
! 	L64781_WriteRegister(device,0x0D,0x8C);		// Internal ADC outpus two's complement
  //	L64781_WriteRegister(device,0x19,0x92);
  	L64781_WriteRegister(device,0x1E,0x09);		// Everything is two's complement, soft bit and CSI_OUT
--- 132,136 ----
  	L64781_WriteRegister(device,0x0B,0x81);		// Use internal ADC
  	L64781_WriteRegister(device,0x0C,0x84);		// AGC loop gain, and polarity is positive
! 	L64781_WriteRegister(device,0x0D,0x8E);		// Internal ADC outpus two's complement
  //	L64781_WriteRegister(device,0x19,0x92);
  	L64781_WriteRegister(device,0x1E,0x09);		// Everything is two's complement, soft bit and CSI_OUT
***************
*** 174,178 ****
  void L64781_UpdateSPIBias(PKSDEVICE device,int bandwidth,int constellation,int transmissionmode,int hp_coderate,int guardinterval, int inverted)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("L64781 Parameters: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), GuardInterval(%i)",bandwidth,constellation,transmissionmode,hp_coderate,guardinterval));
  
  	static const unsigned __int8 fec_tab[]={1,2,3,5,7,};
--- 174,185 ----
  void L64781_UpdateSPIBias(PKSDEVICE device,int bandwidth,int constellation,int transmissionmode,int hp_coderate,int guardinterval, int inverted)
  {
!     for(BYTE i(0); i < 0x3e; ++i)
!     {
!         int Reg = L64781_ReadRegister(device,i);
!         _DbgPrintF(DEBUGLVL_TERSE, ("L64781 Reg %02x = (%02x)",i,Reg));
!     }
! 
!     
!     _DbgPrintF(DEBUGLVL_TERSE, ("L64781 Parameters: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), GuardInterval(%i)",bandwidth,constellation,transmissionmode,hp_coderate,guardinterval));
  
  	static const unsigned __int8 fec_tab[]={1,2,3,5,7,};
***************
*** 338,343 ****
  	L64781_WriteRegister(device,0x23,(ddfs_offset_fixed>>8)&0x3F);
  
  	// From Linux source - This works up to 20000 ppm, it overflows if too large ppm!
! 	init_freq=(((8UL<<24)+(8UL<<19)/25*ppm/(15625/25))/p_bandwidth&0xFFFFFF);
  
      L64781_WriteRegister(device,0x16,init_freq&0xFF);
--- 345,354 ----
  	L64781_WriteRegister(device,0x23,(ddfs_offset_fixed>>8)&0x3F);
  
+     unsigned __int64 qwInitFreq=(unsigned __int64)((8-p_bandwidth)*1000000 + 8*ppm);
+     qwInitFreq*=(unsigned __int64)(1<<25);
+     qwInitFreq/=(unsigned __int64)(p_bandwidth*1000000);
+     init_freq=(unsigned __int32)qwInitFreq;
  	// From Linux source - This works up to 20000 ppm, it overflows if too large ppm!
! 	//init_freq=(((8UL<<24)+(8UL<<19)/25*ppm/(15625/25))/p_bandwidth&0xFFFFFF);
  
      L64781_WriteRegister(device,0x16,init_freq&0xFF);
***************
*** 402,405 ****
--- 413,419 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.8  2003/03/10 18:36:22  adcockj
+  * Changes to ties up to chip spec more closely
+  *
   * Revision 1.7  2003/03/07 08:04:14  adcockj
   * Temp remove monitoring thread