[Bdadev-cvs] NovaTDriver Nova-T.inf,1.1.1.1,1.2 NovaTDriver.dsp,1.1,1.2 automation.cpp,1.2,1.3 device.cpp,1.2,1.3 driver.cpp,1.2,1.3 l64781.cpp,1.2,1.3 l64781.h,1.2,1.3 saa7146.cpp,1.2,1.3 tuner.cpp,1.2,1.3 tuner.h,1.2,1.3

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

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

Modified Files:
	Nova-T.inf NovaTDriver.dsp automation.cpp device.cpp 
	driver.cpp l64781.cpp l64781.h saa7146.cpp tuner.cpp tuner.h 
Log Message:
Tidy up debug logging ready for release
Make changes only on Commit method
Extra logging in Checked build


Index: Nova-T.inf
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/Nova-T.inf,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Nova-T.inf	14 Feb 2003 19:13:40 -0000	1.1.1.1
--- Nova-T.inf	27 Feb 2003 16:50:51 -0000	1.2
***************
*** 1,5 ****
  ; NovaT.INF  -- This file installs NovaT.sys
  ;
! ;
  [Version]
  signature="$CHICAGO$"
--- 1,5 ----
  ; NovaT.INF  -- This file installs NovaT.sys
  ;
! ; $Id$
  [Version]
  signature="$CHICAGO$"
***************
*** 39,43 ****
  [NovaT.Device.NT]
  Include    = ks.inf, kscaptur.inf, bda.inf
! Needs      = KS.Registration.NT,KSCAPTUR.Registration.NT,BDA.Registration.NT
  AddReg     = NovaT.AddReg
  CopyFiles  = NovaT.CopyDrivers
--- 39,43 ----
  [NovaT.Device.NT]
  Include    = ks.inf, kscaptur.inf, bda.inf
! Needs      = KS.Registration.NT,KSCAPTUR.Registration.NT,BDA.Installation.NT
  AddReg     = NovaT.AddReg
  CopyFiles  = NovaT.CopyDrivers
***************
*** 58,79 ****
  HNTbda.sys
  
- ; [NovaT.CopyInf]
- ; NovaT.Inf
- 
- ; [NovaT.KnownFiles]
- ; NovaT.sys=safe
- 
  [NovaT.AddReg]
  HKR,,DevLoader,,*ntkern
  HKR,,NTMPDriver,,HNTbda.sys
  HKR,,PageOutWhenUnopened,3,01
  
  [NovaT.Device.Interfaces]
! AddInterface=%BDAcatID%,%KSNAME_Filter%,NovaT.Interfaces,
! AddInterface=%GUID.BdaDeviceControl%,%KSNAME_Filter%,BdaDevice,
  
  [NovaT.Device.NT.Interfaces]
! AddInterface=%BDAcatID%,%KSNAME_Filter%,NovaT.Interfaces,
! AddInterface=%GUID.BdaDeviceControl%,%KSNAME_Filter%,BdaDevice,
  
  [NovaT.Interfaces]
--- 58,82 ----
  HNTbda.sys
  
  [NovaT.AddReg]
  HKR,,DevLoader,,*ntkern
  HKR,,NTMPDriver,,HNTbda.sys
  HKR,,PageOutWhenUnopened,3,01
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{1A9333B6-3704-4b18-A6DD-E1979FC56970}
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{1A9333B6-3704-4b18-A6DD-E1979FC56970},Display,0x00010001,0
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{1A9333B6-3704-4b18-A6DD-E1979FC56970},Name,,"Tuner Node"
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{F65394A2-A018-4307-8D12-35AA494A406F}
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{F65394A2-A018-4307-8D12-35AA494A406F},Display,0x00010001,0
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{F65394A2-A018-4307-8D12-35AA494A406F},Name,,"Demodulator Node"
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{870E4D6F-77E7-4c40-ADE3-BEF8708A9D52}
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{870E4D6F-77E7-4c40-ADE3-BEF8708A9D52},Display,0x00010001,0
+ HKLM,System\CurrentControlSet\Control\MediaCategories\{870E4D6F-77E7-4c40-ADE3-BEF8708A9D52},Name,,"Antenna In Pin"
  
  [NovaT.Device.Interfaces]
! AddInterface=%GUID.TunerCatID%,"GLOBAL",NovaT.Interfaces,
! AddInterface=%GUID.BdaReceiverCtrl%,"GLOBAL",NovaT.Interfaces,
  
  [NovaT.Device.NT.Interfaces]
! AddInterface=%GUID.TunerCatID%,"GLOBAL",NovaT.Interfaces,
! AddInterface=%GUID.BdaReceiverCtrl%,"GLOBAL",NovaT.Interfaces,
  
  [NovaT.Interfaces]
***************
*** 84,93 ****
  HKR,,FriendlyName,,%NovaT.FriendlyName%
  
- ; [BdaDevice]
- ; AddReg=BdaDevice.AddReg
- 
- ; [BdaDevice.AddReg]
- 
- 
  
  [Strings]
--- 87,90 ----
***************
*** 104,108 ****
  ;
  Plugin_BdaDevice        ="BDA Device Control Plug-in"
! BDAcatID                ="{FD0A5AF4-B41D-11d2-9C95-00C04F7971E0}"
  AMcatID                 ="{DA4E3DA0-D07D-11d0-BD50-00A0C911CE86}"
  BDAReceivers            ="BDA Streaming Receiver Components"
--- 101,105 ----
  ;
  Plugin_BdaDevice        ="BDA Device Control Plug-in"
! GUID.TunerCatID         ="{71985F48-1CA1-11d3-9CC8-00C04F7971E0}"
  AMcatID                 ="{DA4E3DA0-D07D-11d0-BD50-00A0C911CE86}"
  BDAReceivers            ="BDA Streaming Receiver Components"
***************
*** 110,114 ****
  Pin.BdaTransport        ="BDA Transport Stream"
  GUID.BdaTransport       ="{78216A81-CFA8-493e-9711-36A61C08BD9D}"
! GUID.BdaDeviceControl   ="{FD0A5AF3-B41D-11d2-9C95-00C04F7971E0}"
  
  ;
--- 107,111 ----
  Pin.BdaTransport        ="BDA Transport Stream"
  GUID.BdaTransport       ="{78216A81-CFA8-493e-9711-36A61C08BD9D}"
! GUID.BdaReceiverCtrl    ="{FD0A5AF3-B41D-11d2-9C95-00C04F7971E0}"
  
  ;
***************
*** 159,160 ****
--- 156,165 ----
  SPSVCINST_ASSOCSERVICE      = 0x2
  
+ ;***********************************************************************
+ ; $Log$
+ ; Revision 1.2  2003/02/27 16:50:51  adcockj
+ ; Tidy up debug logging ready for release
+ ; Make changes only on Commit method
+ ; Extra logging in Checked build
+ ;
+ ;***********************************************************************
\ No newline at end of file

Index: NovaTDriver.dsp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/NovaTDriver.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NovaTDriver.dsp	17 Feb 2003 11:07:11 -0000	1.1
--- NovaTDriver.dsp	27 Feb 2003 16:50:52 -0000	1.2
***************
*** 182,185 ****
--- 182,189 ----
  # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
  # End Group
+ # Begin Source File
+ 
+ SOURCE=".\Nova-T.inf"
+ # End Source File
  # End Target
  # End Project

Index: automation.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** automation.cpp	17 Feb 2003 11:07:11 -0000	1.2
--- automation.cpp	27 Feb 2003 16:50:52 -0000	1.3
***************
*** 29,36 ****
  // which actually do the work elsewhere in the driver.
  
! // One problem is that the driver should keep a note of all requested changes
! // and only validate them when FilterCommitChanges() and such are called, but
! // currently those functions do nothing and it just validates/makes changes
! // immediately.
  
  #define GETDEVICEFROMIRP(irp)	KsPinGetDevice(KsGetPinFromIrp(irp))
--- 29,34 ----
  // which actually do the work elsewhere in the driver.
  
! // drivers should keep a note of all requested changes and only do them
! // when FilterCommitChanges() is called
  
  #define GETDEVICEFROMIRP(irp)	KsPinGetDevice(KsGetPinFromIrp(irp))
***************
*** 49,55 ****
  	if(frequency!=GETCONTEXT(device)->tuner.frequency) {
  		GETCONTEXT(device)->tuner.frequency=frequency;
! 		Tuner_SetFrequency(device);
  	}
! 	DbgPrint("Nova-T: TunerFrequencyPut(%u)\n",frequency);
  	return STATUS_SUCCESS;
  }
--- 47,53 ----
  	if(frequency!=GETCONTEXT(device)->tuner.frequency) {
  		GETCONTEXT(device)->tuner.frequency=frequency;
! 		GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerFrequencyPut(%u)\n",frequency));
  	return STATUS_SUCCESS;
  }
***************
*** 67,73 ****
  	if(GETCONTEXT(device)->tuner.freq_mult!=freq_mult) {
  		GETCONTEXT(device)->tuner.freq_mult=freq_mult;
! 		Tuner_SetFrequency(device);
  	}
! 	DbgPrint("Nova-T: TunerFrequencyMultiplerPut(%u)\n",freq_mult);
  	return STATUS_SUCCESS;
  }
--- 65,71 ----
  	if(GETCONTEXT(device)->tuner.freq_mult!=freq_mult) {
  		GETCONTEXT(device)->tuner.freq_mult=freq_mult;
! 		GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerFrequencyMultiplerPut(%u)\n",freq_mult));
  	return STATUS_SUCCESS;
  }
***************
*** 82,91 ****
  	ULONG bandwidth=(ULONG)*pulProperty;
  	PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! 	// Validate here
  	if(GETCONTEXT(device)->tuner.bandwidth!=bandwidth) {
  		GETCONTEXT(device)->tuner.bandwidth=bandwidth;
! 		L64781_ParametersUpdated(device);
  	}
! 	DbgPrint("Nova-T: TunerBandwidthPut(%u)\n",bandwidth);
  	return STATUS_SUCCESS;
  }
--- 80,91 ----
  	ULONG bandwidth=(ULONG)*pulProperty;
  	PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
!     // Validate here
!     // note that the tuner isn't effected by this setting but the 
!     // demodulator is so that's why we signal that that has changed
  	if(GETCONTEXT(device)->tuner.bandwidth!=bandwidth) {
  		GETCONTEXT(device)->tuner.bandwidth=bandwidth;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerBandwidthPut(%u)\n",bandwidth));
  	return STATUS_SUCCESS;
  }
***************
*** 96,100 ****
  	// In mDb or something
  	*pulProperty=(LONG)L64781_SignalStrength(device);
! 	DbgPrint("Nova-T: TunerSignalStrengthGet, irp=0x%p, device=0x%p, strength=%i\n",pIrp,device,*pulProperty);
  	return STATUS_SUCCESS;
  }
--- 96,100 ----
  	// In mDb or something
  	*pulProperty=(LONG)L64781_SignalStrength(device);
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerSignalStrengthGet, irp=0x%p, device=0x%p, strength=%i\n",pIrp,device,*pulProperty));
  	return STATUS_SUCCESS;
  }
***************
*** 103,106 ****
--- 103,107 ----
  {
  	*pulProperty=(BOOL)L64781_HasSignal(GETDEVICEFROMIRP(pIrp));
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerSignalStrengthGet (%d)\n",*pulProperty));
  	return STATUS_SUCCESS;
  }
***************
*** 110,113 ****
--- 111,115 ----
  {
  	*pulProperty=(LONG)((L64781_Signal2NoiseRatio(GETDEVICEFROMIRP(pIrp))*100)/255);
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSignalQualityGet (%d)\n",*pulProperty));
  	return STATUS_SUCCESS;
  }
***************
*** 116,119 ****
--- 118,122 ----
  {
  	*pulProperty=(BOOL)L64781_HasLock(GETDEVICEFROMIRP(pIrp));
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSignalLockedGet (%d)\n",*pulProperty));
  	return STATUS_SUCCESS;
  }
***************
*** 131,137 ****
  	if(GETCONTEXT(device)->demodulator.modulation!=newtype) {
  		GETCONTEXT(device)->demodulator.modulation=newtype;
! 		L64781_ParametersUpdated(device);
  	}
! 	DbgPrint("Nova-T: DemodModulationTypePut(%u)\n",newtype);
  	return STATUS_SUCCESS;
  }
--- 134,140 ----
  	if(GETCONTEXT(device)->demodulator.modulation!=newtype) {
  		GETCONTEXT(device)->demodulator.modulation=newtype;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodModulationTypePut(%u)\n",newtype));
  	return STATUS_SUCCESS;
  }
***************
*** 144,147 ****
--- 147,151 ----
  NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
  {
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodInnerFecTypePut(%u)\n",*pulProperty));
  	if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
  	else return STATUS_INVALID_PARAMETER;
***************
*** 164,169 ****
  	if(GETCONTEXT(device)->demodulator.HP_coderate!=rate) {
  		GETCONTEXT(device)->demodulator.HP_coderate=rate;
! 		L64781_ParametersUpdated(device);
  	}
  	return STATUS_SUCCESS;
  }
--- 168,174 ----
  	if(GETCONTEXT(device)->demodulator.HP_coderate!=rate) {
  		GETCONTEXT(device)->demodulator.HP_coderate=rate;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodInnerFecRatePut(%u)\n",rate));
  	return STATUS_SUCCESS;
  }
***************
*** 176,179 ****
--- 181,185 ----
  NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
  {
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodOuterFecTypePut(%u)\n",*pulProperty));
  	if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
  	else return STATUS_INVALID_PARAMETER;
***************
*** 196,201 ****
  	if(GETCONTEXT(device)->demodulator.LP_coderate!=rate) {
  		GETCONTEXT(device)->demodulator.LP_coderate=rate;
! 		L64781_ParametersUpdated(device);
  	}
  	return STATUS_SUCCESS;
  }
--- 202,208 ----
  	if(GETCONTEXT(device)->demodulator.LP_coderate!=rate) {
  		GETCONTEXT(device)->demodulator.LP_coderate=rate;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodOuterFecRatePut(%u)\n",rate));
  	return STATUS_SUCCESS;
  }
***************
*** 211,215 ****
  	// Validate here
  	GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
! //	L64781_ParametersUpdated(device);
  	return STATUS_SUCCESS;
  }
--- 218,223 ----
  	// Validate here
  	GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
!     //GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSymbolRatePut(%u)\n",*pulProperty));
  	return STATUS_SUCCESS;
  }
***************
*** 227,233 ****
  	if(GETCONTEXT(device)->demodulator.guard_interval!=guard_interval) {
  		GETCONTEXT(device)->demodulator.guard_interval=guard_interval;
! 		L64781_ParametersUpdated(device);
  	}
! 	DbgPrint("Nova-T: DemodGuardIntervalPut(%i)\n",guard_interval);
  	return STATUS_SUCCESS;
  }
--- 235,241 ----
  	if(GETCONTEXT(device)->demodulator.guard_interval!=guard_interval) {
  		GETCONTEXT(device)->demodulator.guard_interval=guard_interval;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodGuardIntervalPut(%i)\n",guard_interval));
  	return STATUS_SUCCESS;
  }
***************
*** 245,251 ****
  	if(GETCONTEXT(device)->demodulator.transmit_mode!=transmit_mode) {
  		GETCONTEXT(device)->demodulator.transmit_mode=transmit_mode;
! 		L64781_ParametersUpdated(device);
  	}
! 	DbgPrint("Nova-T: DemodTransmissionModePut(%i)\n",transmit_mode);
  	return STATUS_SUCCESS;
  }
--- 253,259 ----
  	if(GETCONTEXT(device)->demodulator.transmit_mode!=transmit_mode) {
  		GETCONTEXT(device)->demodulator.transmit_mode=transmit_mode;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodTransmissionModePut(%i)\n",transmit_mode));
  	return STATUS_SUCCESS;
  }
***************
*** 263,268 ****
  	if(GETCONTEXT(device)->demodulator.inversion!=inversion) {
  		GETCONTEXT(device)->demodulator.inversion=inversion;
! 		L64781_ParametersUpdated(device);
  	}
  	return STATUS_SUCCESS;
  }
--- 271,277 ----
  	if(GETCONTEXT(device)->demodulator.inversion!=inversion) {
  		GETCONTEXT(device)->demodulator.inversion=inversion;
! 		GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
  	}
+ 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSpectralInversionPut(%i)\n",inversion));
  	return STATUS_SUCCESS;
  }
***************
*** 273,277 ****
  	NTSTATUS status;
  
! 	DbgPrint("Nova-T: StartChanges()\n");
  	status=BdaStartChanges(pIrp);
  	if(NT_SUCCESS(status)) {
--- 282,286 ----
  	NTSTATUS status;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoStartChanges()\n"));
  	status=BdaStartChanges(pIrp);
  	if(NT_SUCCESS(status)) {
***************
*** 284,288 ****
  	NTSTATUS status;
  
! 	DbgPrint("Nova-T: CheckChanges()\n");
  	status=BdaCheckChanges(pIrp);
  	if(NT_SUCCESS(status)) {
--- 293,297 ----
  	NTSTATUS status;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoCheckChanges()\n"));
  	status=BdaCheckChanges(pIrp);
  	if(NT_SUCCESS(status)) {
***************
*** 293,299 ****
  NTSTATUS FilterCommitChanges(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OPTIONAL PVOID pvIgnored)
  {
! 	DbgPrint("Nova-T: CommitChanges()\n");
  	// Validate alterations
! 	// Commit alterations
  	return BdaCommitChanges(pIrp);
  }
--- 302,325 ----
  NTSTATUS FilterCommitChanges(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OPTIONAL PVOID pvIgnored)
  {
! 	NTSTATUS status;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoCommitChanges()\n"));
! 
! 	PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! 
  	// Validate alterations
! 	status=BdaCommitChanges(pIrp);
! 	if(NT_SUCCESS(status)) {
!         // we will always reset the setting on moving out of stop
!         // so don't bother updating the hardware if we are stopped
!         if(GETCONTEXT(device)->cur_state != KSSTATE_STOP) {
!         	// Commit alterations only if there are changes
!             if(GETCONTEXT(device)->tuner.ChangeOutstanding == TRUE) {
!         		Tuner_SetFrequency(device);
!             }
!             if(GETCONTEXT(device)->demodulator.ChangeOutstanding == TRUE) {
!         		L64781_UpdateParameters(device);
!             }
!         }
! 	}
  	return BdaCommitChanges(pIrp);
  }
***************
*** 302,310 ****
  	NTSTATUS status;
  	BDA_CHANGE_STATE topologyChangeState;
  
! 	DbgPrint("Nova-T: GetChangeState()\n");
      status=BdaGetChangeState(pIrp,&topologyChangeState);
      if(NT_SUCCESS(status)) {
!         if((topologyChangeState==BDA_CHANGES_PENDING)/*||(pFilter->m_BdaChangeState==BDA_CHANGES_PENDING)*/) {
              *pulChangeState=BDA_CHANGES_PENDING;
          } else {
--- 328,339 ----
  	NTSTATUS status;
  	BDA_CHANGE_STATE topologyChangeState;
+ 	PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoGetChangeState()\n"));
      status=BdaGetChangeState(pIrp,&topologyChangeState);
      if(NT_SUCCESS(status)) {
!         if((topologyChangeState==BDA_CHANGES_PENDING)||
!             (GETCONTEXT(device)->demodulator.ChangeOutstanding == TRUE)||
!             (GETCONTEXT(device)->tuner.ChangeOutstanding == TRUE)) {
              *pulChangeState=BDA_CHANGES_PENDING;
          } else {
***************
*** 317,320 ****
--- 346,354 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:52  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:11  adcockj
   * Added VS6 project for the lazy

Index: device.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** device.cpp	17 Feb 2003 11:07:12 -0000	1.2
--- device.cpp	27 Feb 2003 16:50:52 -0000	1.3
***************
*** 47,51 ****
  	NTSTATUS result;
  
! 	DbgPrint("Nova-T: DeviceAdd()\n");
  	// Allocate context storage
  	device->Context=ExAllocatePoolWithTag(NonPagedPool,sizeof(DEVICE_CONTEXT),'ECIM');
--- 47,51 ----
  	NTSTATUS result;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceAdd()\n"));
  	// Allocate context storage
  	device->Context=ExAllocatePoolWithTag(NonPagedPool,sizeof(DEVICE_CONTEXT),'ECIM');
***************
*** 58,62 ****
  	GETCONTEXT(device)->tuner_address=I2C_TUNER;
  	GETCONTEXT(device)->tuner.type=TUNER_TSA5060;
! 	DbgPrint("Nova-T: DeviceAdd() complete\n");
  	// Done
  	return result;
--- 58,62 ----
  	GETCONTEXT(device)->tuner_address=I2C_TUNER;
  	GETCONTEXT(device)->tuner.type=TUNER_TSA5060;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceAdd() complete\n"));
  	// Done
  	return result;
***************
*** 64,68 ****
  VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
  {
! 	DbgPrint("Nova-T: DeviceRemove()\n");
  }
  
--- 64,68 ----
  VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceRemove()\n"));
  }
  
***************
*** 72,76 ****
  	NTSTATUS result;
  
! 	DbgPrint("Nova-T: DeviceStart()\n");
  	// Search for memory to map
  	for(i=0,mem=-1,interrupt=-1;(i<translatedResources->List[0].PartialResourceList.Count)&&((mem==-1)||(interrupt==-1));i++) {
--- 72,76 ----
  	NTSTATUS result;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStart()\n"));
  	// Search for memory to map
  	for(i=0,mem=-1,interrupt=-1;(i<translatedResources->List[0].PartialResourceList.Count)&&((mem==-1)||(interrupt==-1));i++) {
***************
*** 157,161 ****
  		return result;
  	}
! 	DbgPrint("Nova-T: DeviceStart() complete\n");
  	// Ready!
  	return STATUS_SUCCESS;
--- 157,161 ----
  		return result;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStart() complete\n"));
  	// Ready!
  	return STATUS_SUCCESS;
***************
*** 166,170 ****
  	int i;
  
! 	DbgPrint("Nova-T: DeviceStop()\n");
  	// Stop tuner, L64781 and SAA7146 from any current functions
  	L64781_Close(device);
--- 166,170 ----
  	int i;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStop()\n"));
  	// Stop tuner, L64781 and SAA7146 from any current functions
  	L64781_Close(device);
***************
*** 180,184 ****
  	// Unmap memory
  	MmUnmapIoSpace(GETCONTEXT(device)->pci_memory,GETCONTEXT(device)->pci_size);
! 	DbgPrint("Nova-T: DeviceStop() complete\n");
  }
  
--- 180,184 ----
  	// Unmap memory
  	MmUnmapIoSpace(GETCONTEXT(device)->pci_memory,GETCONTEXT(device)->pci_size);
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStop() complete\n"));
  }
  
***************
*** 189,193 ****
  	NTSTATUS result;
  
! 	DbgPrint("Nova-T: FilterCreate()\n");
  	Filter->Context=KsFilterGetDevice(Filter);
  	if((Filter->Context==NULL)||(((PKSDEVICE)Filter->Context)->Context==NULL)) return STATUS_DEVICE_NOT_CONNECTED;
--- 189,193 ----
  	NTSTATUS result;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoFilterCreate()\n"));
  	Filter->Context=KsFilterGetDevice(Filter);
  	if((Filter->Context==NULL)||(((PKSDEVICE)Filter->Context)->Context==NULL)) return STATUS_DEVICE_NOT_CONNECTED;
***************
*** 203,207 ****
  NTSTATUS FilterClose(IN PKSFILTER Filter,IN PIRP Irp)
  {
! 	DbgPrint("Nova-T: FilterClose()\n");
  	BdaUninitFilter(Filter);
  	// Shut down anything still going on
--- 203,207 ----
  NTSTATUS FilterClose(IN PKSFILTER Filter,IN PIRP Irp)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoFilterClose()\n"));
  	BdaUninitFilter(Filter);
  	// Shut down anything still going on
***************
*** 240,244 ****
  		else if(FromState==KSSTATE_RUN) j="Run";
  		else j="Unknown";
! 		DbgPrint("Nova-T: Changed state from %s to %s\n",j,i);
  	}
  	if((ToState!=KSSTATE_STOP)&&(FromState==KSSTATE_STOP)) {
--- 240,244 ----
  		else if(FromState==KSSTATE_RUN) j="Run";
  		else j="Unknown";
! 		_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoChanged state from %s to %s\n",j,i));
  	}
  	if((ToState!=KSSTATE_STOP)&&(FromState==KSSTATE_STOP)) {
***************
*** 249,259 ****
  		}
  		// Temp
- 		L64781_ParametersUpdated((PKSDEVICE)Pin->Context);
  		Tuner_SetFrequency((PKSDEVICE)Pin->Context);
  		// And now, continue
  	}
  	if((ToState==KSSTATE_STOP)&&(FromState!=KSSTATE_STOP)) SAA7146_StopStream((PKSDEVICE)Pin->Context);
  	GETCONTEXT(Pin->Context)->cur_state=ToState;
! 	DbgPrint("Nova-T: State changed!\n");
  	return STATUS_SUCCESS;
  }
--- 249,259 ----
  		}
  		// Temp
  		Tuner_SetFrequency((PKSDEVICE)Pin->Context);
+ 		L64781_UpdateParameters((PKSDEVICE)Pin->Context);
  		// And now, continue
  	}
  	if((ToState==KSSTATE_STOP)&&(FromState!=KSSTATE_STOP)) SAA7146_StopStream((PKSDEVICE)Pin->Context);
  	GETCONTEXT(Pin->Context)->cur_state=ToState;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoState changed!\n"));
  	return STATUS_SUCCESS;
  }
***************
*** 261,264 ****
--- 261,269 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:52  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy

Index: driver.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/driver.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** driver.cpp	17 Feb 2003 11:07:12 -0000	1.2
--- driver.cpp	27 Feb 2003 16:50:52 -0000	1.3
***************
*** 176,179 ****
--- 176,202 ----
  	/* For filter */
  
+ DEFINE_KSPROPERTY_TABLE(FilterTopologyProperties) {
+     DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(BdaPropertyNodeTypes,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES(BdaPropertyPinTypes,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(BdaPropertyTemplateConnections,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(BdaPropertyNodeMethods,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(BdaPropertyNodeProperties,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(BdaPropertyNodeEvents,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(BdaPropertyGetControllingPinId,NULL),
+     DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(BdaPropertyNodeDescriptors,NULL),
+ };
+ 
+ 
+ DEFINE_KSPROPERTY_SET_TABLE(FilterProperties) {
+ 
+     DEFINE_KSPROPERTY_SET
+     (
+         &KSPROPSETID_BdaTopology,
+         SIZEOF_ARRAY(FilterTopologyProperties),
+         FilterTopologyProperties,
+         0, NULL
+     ),
+ };
+ 
  DEFINE_KSMETHOD_TABLE(FilterConfiguration) {
  	DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(BdaMethodCreateTopology,NULL),
***************
*** 205,209 ****
  
  DEFINE_KSAUTOMATION_TABLE(FilterAutomation) {
!     DEFINE_KSAUTOMATION_PROPERTIES_NULL,
      DEFINE_KSAUTOMATION_METHODS(FilterMethods),
      DEFINE_KSAUTOMATION_EVENTS_NULL
--- 228,232 ----
  
  DEFINE_KSAUTOMATION_TABLE(FilterAutomation) {
!     DEFINE_KSAUTOMATION_PROPERTIES(FilterProperties),
      DEFINE_KSAUTOMATION_METHODS(FilterMethods),
      DEFINE_KSAUTOMATION_EVENTS_NULL
***************
*** 212,221 ****
  // Blah
  
- DEFINE_KSAUTOMATION_TABLE(NullAutomation) {
-     DEFINE_KSAUTOMATION_PROPERTIES_NULL,
-     DEFINE_KSAUTOMATION_METHODS_NULL,
-     DEFINE_KSAUTOMATION_EVENTS_NULL
- };
- 
  const KSFILTER_DISPATCH FilterDispatch={
      /* Create  */		FilterCreate,
--- 235,238 ----
***************
*** 364,368 ****
  	{	// Antenna input pin
  		&AntennaDispatch,
! 		&NullAutomation,
  		{
  			0,NULL,
--- 381,385 ----
  	{	// Antenna input pin
  		&AntennaDispatch,
! 		&TunerAutomation,
  		{
  			0,NULL,
***************
*** 385,389 ****
  	{	// Transport Stream output pin
  		&OutputDispatch,
! 		&NullAutomation,
  		{
  			SIZEOF_ARRAY(StreamInterface),
--- 402,406 ----
  	{	// Transport Stream output pin
  		&OutputDispatch,
! 		&DemodulatorAutomation,
  		{
  			SIZEOF_ARRAY(StreamInterface),
***************
*** 475,479 ****
  //	SIZEOF_ARRAY(FilterDescriptors),
  //	FilterDescriptors
! 	0,NULL	// So BdaInitFilter works, since this isn't exporting any kernel streaming filters
  };
  
--- 492,497 ----
  //	SIZEOF_ARRAY(FilterDescriptors),
  //	FilterDescriptors
! 	0,NULL,	// So BdaInitFilter works, since this isn't exporting any kernel streaming filters
!     KSDEVICE_DESCRIPTOR_VERSION
  };
  
***************
*** 502,506 ****
  extern "C" NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject,IN PUNICODE_STRING RegistryPath)
  {
! //	DbgPrint("MICE Hauppauge Nova-T replacement driver 1.00 started\n");
  	return KsInitializeDriver(DriverObject,RegistryPath,&DeviceDescriptor);
  }
--- 520,524 ----
  extern "C" NTSTATUS DriverEntry(IN PDRIVER_OBJECT DriverObject,IN PUNICODE_STRING RegistryPath)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("MICE Hauppauge Nova-T replacement driver 1.00 started\n"))
  	return KsInitializeDriver(DriverObject,RegistryPath,&DeviceDescriptor);
  }
***************
*** 508,511 ****
--- 526,534 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:52  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy

Index: l64781.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** l64781.cpp	17 Feb 2003 11:07:12 -0000	1.2
--- l64781.cpp	27 Feb 2003 16:50:52 -0000	1.3
***************
*** 101,109 ****
  	DEVICE_CONTEXT *data=GETCONTEXT(device);
  
! 	DbgPrint("Nova-T: L64781 initialise\n");
  	// Initialise tuner structures to default
  	data->tuner.frequency=570000;
  	data->tuner.freq_mult=1000;
  	data->tuner.bandwidth=8;
  	data->demodulator.HP_coderate=BDA_BCC_RATE_2_3;
  	data->demodulator.LP_coderate=BDA_BCC_RATE_NOT_SET;
--- 101,110 ----
  	DEVICE_CONTEXT *data=GETCONTEXT(device);
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 initialise\n"));
  	// Initialise tuner structures to default
  	data->tuner.frequency=570000;
  	data->tuner.freq_mult=1000;
  	data->tuner.bandwidth=8;
+ 	data->tuner.ChangeOutstanding=FALSE;
  	data->demodulator.HP_coderate=BDA_BCC_RATE_2_3;
  	data->demodulator.LP_coderate=BDA_BCC_RATE_NOT_SET;
***************
*** 113,116 ****
--- 114,118 ----
  	data->demodulator.inversion=BDA_SPECTRAL_INVERSION_NORMAL;
  	data->demodulator.HierarchyInformation=HIERARCHY_NONE;
+ 	data->demodulator.ChangeOutstanding=FALSE;
  	data->dummy.symbolRate=2750000;
  	// Start L64781
***************
*** 126,137 ****
  //	L64781_WriteRegister(device,0x19,0x92);
  	L64781_WriteRegister(device,0x1E,0x09);		// Everything is two's complement, soft bit and CSI_OUT
! 	DbgPrint("Nova-T: L64781 initialised\n");
  	return STATUS_SUCCESS;
  }
  void L64781_Close(PKSDEVICE device)
  {
! 	DbgPrint("Nova-T: L64781 closing\n");
  	L64781_WriteRegister(device,0x3E,0x5A);		// Crashes Linux. Windows?
! 	DbgPrint("Nova-T: L64781 closed\n");
  }
  unsigned __int8 _L64781_SignalStrength(PKSDEVICE device)
--- 128,139 ----
  //	L64781_WriteRegister(device,0x19,0x92);
  	L64781_WriteRegister(device,0x1E,0x09);		// Everything is two's complement, soft bit and CSI_OUT
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 initialised\n"));
  	return STATUS_SUCCESS;
  }
  void L64781_Close(PKSDEVICE device)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 closing\n"));
  	L64781_WriteRegister(device,0x3E,0x5A);		// Crashes Linux. Windows?
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 closed\n"));
  }
  unsigned __int8 _L64781_SignalStrength(PKSDEVICE device)
***************
*** 160,164 ****
  	return (avg_quality<<8)|avg_quality;
  }
! void L64781_ParametersUpdated(PKSDEVICE device)
  {
  //	static const unsigned __int8 vcr_tab[]={7,1,2,3,5,7,8};
--- 162,166 ----
  	return (avg_quality<<8)|avg_quality;
  }
! void L64781_UpdateParameters(PKSDEVICE device)
  {
  //	static const unsigned __int8 vcr_tab[]={7,1,2,3,5,7,8};
***************
*** 177,181 ****
  	int p_bandwidth,p_constellation,p_hp_coderate,p_guardinterval,p_lp_coderate,p_transmissionmode;
  
! 	DbgPrint("Nova-T: L64781 updating\n");
  	// All parameters are checked by automation functions, so no need to check here
  	// Now translate Microsoft constants into the constants the Linux code originally wanted
--- 179,183 ----
  	int p_bandwidth,p_constellation,p_hp_coderate,p_guardinterval,p_lp_coderate,p_transmissionmode;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 updating\n"));
  	// All parameters are checked by automation functions, so no need to check here
  	// Now translate Microsoft constants into the constants the Linux code originally wanted
***************
*** 267,272 ****
  			break;
  	}
! 	DbgPrint("Nova-T: L64781 Values: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)\n",data->tuner.bandwidth,data->demodulator.modulation,data->demodulator.transmit_mode,data->demodulator.HP_coderate,data->demodulator.LP_coderate,data->demodulator.guard_interval);
! 	DbgPrint("Nova-T: L64781 Parameters: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)\n",p_bandwidth,p_constellation,p_transmissionmode,p_hp_coderate,p_lp_coderate,p_guardinterval);
  	// Actually do it
  	ddfs_offset_fixed=0x4000-(ppm<<16)/bw_tab[p_bandwidth]/1000000;
--- 269,274 ----
  			break;
  	}
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 Values: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)\n",data->tuner.bandwidth,data->demodulator.modulation,data->demodulator.transmit_mode,data->demodulator.HP_coderate,data->demodulator.LP_coderate,data->demodulator.guard_interval));
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 Parameters: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)\n",p_bandwidth,p_constellation,p_transmissionmode,p_hp_coderate,p_lp_coderate,p_guardinterval));
  	// Actually do it
  	ddfs_offset_fixed=0x4000-(ppm<<16)/bw_tab[p_bandwidth]/1000000;
***************
*** 312,320 ****
  	L64781_Apply_TPS(device);
  
! 	DbgPrint("Nova-T: L64781 updated\n");
  }
  
  /*****************************************************************************\
   * $Log$
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy
--- 314,329 ----
  	L64781_Apply_TPS(device);
  
!     data->demodulator.ChangeOutstanding = FALSE;
! 
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 updated\n"));
  }
  
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:52  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy

Index: l64781.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** l64781.h	17 Feb 2003 11:07:12 -0000	1.2
--- l64781.h	27 Feb 2003 16:50:53 -0000	1.3
***************
*** 20,23 ****
--- 20,24 ----
  	SpectralInversion inversion;
  	TempHierarchy HierarchyInformation;	// Not sure in what way this maps to BDA driver arch.
+     BOOL ChangeOutstanding;
  } DEMOD_DATA;
  typedef struct DUMMY_DATA {
***************
*** 32,36 ****
  int L64781_BitErrorRate(PKSDEVICE device);
  int L64781_Signal2NoiseRatio(PKSDEVICE device);
! void L64781_ParametersUpdated(PKSDEVICE device);
  
  #define L64781_HasSignal(device)		(_L64781_SignalStrength(device)>5)
--- 33,37 ----
  int L64781_BitErrorRate(PKSDEVICE device);
  int L64781_Signal2NoiseRatio(PKSDEVICE device);
! void L64781_UpdateParameters(PKSDEVICE device);
  
  #define L64781_HasSignal(device)		(_L64781_SignalStrength(device)>5)

Index: saa7146.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/saa7146.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** saa7146.cpp	17 Feb 2003 11:07:12 -0000	1.2
--- saa7146.cpp	27 Feb 2003 16:50:53 -0000	1.3
***************
*** 35,39 ****
  NTSTATUS SAA7146_Init(PKSDEVICE device)
  {
! 	DbgPrint("Nova-T: SAA7146 Init\n");
  	DeviceWriteRegister32(device,REG_IIC_STA,I2C_SPEED);			// Set I2C bus speed
  	DeviceWriteRegister32(device,REG_IICTRF,0);						// Clear the I2C output
--- 35,39 ----
  NTSTATUS SAA7146_Init(PKSDEVICE device)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Init\n"));
  	DeviceWriteRegister32(device,REG_IIC_STA,I2C_SPEED);			// Set I2C bus speed
  	DeviceWriteRegister32(device,REG_IICTRF,0);						// Clear the I2C output
***************
*** 48,52 ****
  void SAA7146_Close(PKSDEVICE device)
  {
! 	DbgPrint("Nova-T: SAA7146 Close\n");
  }
  
--- 48,52 ----
  void SAA7146_Close(PKSDEVICE device)
  {
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Close\n"));
  }
  
***************
*** 70,74 ****
  	int i;
  
! 	DbgPrint("Nova-T: SAA7146 Starting stream\n");
  	GETCONTEXT(device)->pv_error=0;		// Number of Protection Violation errors
  	GETCONTEXT(device)->switcher=0;		// Switches buffers
--- 70,74 ----
  	int i;
  
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Starting stream\n"));
  	GETCONTEXT(device)->pv_error=0;		// Number of Protection Violation errors
  	GETCONTEXT(device)->switcher=0;		// Switches buffers
***************
*** 97,106 ****
  	DeviceWriteRegister32(device,REG_IER,DeviceReadRegister32(device,REG_IER)|IR_FIDB);	// Interrupt on
  	// Done
! 	DbgPrint("Nova-T: SAA7146 Stream started\n");
  	return STATUS_SUCCESS;
  }
  void SAA7146_StopStream(PKSDEVICE device)
  {
! //	DbgPrint("Nova-T: SAA7146 Stopping stream\n");
  	DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC1_TR_E_3));	// DMA3 off
  	DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC2_RPS_SIG0));	// RPS0 off
--- 97,107 ----
  	DeviceWriteRegister32(device,REG_IER,DeviceReadRegister32(device,REG_IER)|IR_FIDB);	// Interrupt on
  	// Done
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Stream started\n"));
  	return STATUS_SUCCESS;
  }
+ 
  void SAA7146_StopStream(PKSDEVICE device)
  {
!     _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Stopping stream\n"));
  	DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC1_TR_E_3));	// DMA3 off
  	DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC2_RPS_SIG0));	// RPS0 off
***************
*** 108,116 ****
  	DeviceWriteRegister32(device,REG_IER,DeviceReadRegister32(device,REG_IER)&~IR_FIDB);	// FIDB interrupt off
  	if(GETCONTEXT(device)->pv_error>0) PrintString(device,"Protection Violation errors occurred during run",GETCONTEXT(device)->pv_error);
- //	if(GETCONTEXT(device)->pv_error>0) DbgPrint("Nova-T: %i protection violation errors occurred during run\n",GETCONTEXT(device)->pv_error);
  	if(GETCONTEXT(device)->lost_error>0) PrintString(device,"Missed some interrupts during run",GETCONTEXT(device)->lost_error);
- //	if(GETCONTEXT(device)->lost_error>0) DbgPrint("Nova-T: %i interrupts missed during run\n",GETCONTEXT(device)->lost_error);
  	PrintString(device,"Stopped stream, packets sent:",GETCONTEXT(device)->counter);
- //	DbgPrint("Nova-T: SAA7146 stream stopped (%i packets sent)\n",GETCONTEXT(device)->counter);
  }
  
--- 109,114 ----
***************
*** 120,123 ****
--- 118,122 ----
  	GETCONTEXT(device)->pv_error++;
  }
+ 
  void SAA7146_Interrupt_FIDB(PKSDEVICE device)
  {
***************
*** 232,236 ****
  	if(i==0) {
  		PrintString(device,"I2C transmission timeout");
! //		DbgPrint("Nova-T: I2C error: transmission timeout\n");
  		return FALSE;
  	}
--- 231,235 ----
  	if(i==0) {
  		PrintString(device,"I2C transmission timeout");
! 		_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: transmission timeout\n"));
  		return FALSE;
  	}
***************
*** 238,258 ****
  		case IIC_STA_AL:
  			PrintString(device,"I2C error: arbitration lost");
! //			DbgPrint("Nova-T: I2C error: arbitration lost\n");
  			break;
  		case IIC_STA_DRERR:
  			PrintString(device,"I2C error: receiving data");
! //			DbgPrint("Nova-T: I2C error: receiving data\n");
  			break;
  		case IIC_STA_DTERR:
  			PrintString(device,"I2C error: data transmission");
! //			DbgPrint("Nova-T: I2C error: data transmission\n");
  			break;
  		case IIC_STA_APERR:
  			PrintString(device,"I2C error: address phase");
! //			DbgPrint("Nova-T: I2C error: address phase\n");
  			break;
  		case IIC_STA_SPERR:
  			PrintString(device,"I2C error: invalid start/stop condition");
! //			DbgPrint("Nova-T: I2C error: invalid start/stop condition\n");
  			break;
  	}
--- 237,257 ----
  		case IIC_STA_AL:
  			PrintString(device,"I2C error: arbitration lost");
! 			_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: arbitration lost\n"));
  			break;
  		case IIC_STA_DRERR:
  			PrintString(device,"I2C error: receiving data");
! 			_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: receiving data\n"));
  			break;
  		case IIC_STA_DTERR:
  			PrintString(device,"I2C error: data transmission");
! 			_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: data transmission\n"));
  			break;
  		case IIC_STA_APERR:
  			PrintString(device,"I2C error: address phase");
! 			_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: address phase\n"));
  			break;
  		case IIC_STA_SPERR:
  			PrintString(device,"I2C error: invalid start/stop condition");
! 			_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: invalid start/stop condition\n"));
  			break;
  	}
***************
*** 283,288 ****
  	}
  	if((status=SAA7146_StatusI2C(device))!=I2C_SPEED) {
! //		PrintString(device,"I2C bus could not be reset, system failure!",status);
! 		DbgPrint("Nova-T: I2C bus could not be reset, system failure!\n");
  		return FALSE;
  	} else return TRUE;
--- 282,287 ----
  	}
  	if((status=SAA7146_StatusI2C(device))!=I2C_SPEED) {
! 		PrintString(device,"I2C bus could not be reset, system failure!",status);
! 		_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C bus could not be reset, system failure!\n"));
  		return FALSE;
  	} else return TRUE;
***************
*** 348,352 ****
  		if(!SAA7146_RunI2C(device,&output,b,&k)) return FALSE;
  	}
! //	DbgPrint("Nova-T: I2C transfer succeeded\n");
  	return TRUE;
  }
--- 347,351 ----
  		if(!SAA7146_RunI2C(device,&output,b,&k)) return FALSE;
  	}
! 	_DbgPrintF(DEBUGLVL_VERBOSE, ("UpdateInfoI2C transfer succeeded\n"));
  	return TRUE;
  }
***************
*** 366,369 ****
--- 365,373 ----
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:53  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy

Index: tuner.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/tuner.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tuner.cpp	17 Feb 2003 11:07:12 -0000	1.2
--- tuner.cpp	27 Feb 2003 16:50:53 -0000	1.3
***************
*** 70,74 ****
  
  	bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! 	DbgPrint("Nova-T: Setting tuner frequency to %uHz (%u*%u)\n",(unsigned int)bob,GETCONTEXT(device)->tuner.frequency,GETCONTEXT(device)->tuner.freq_mult);
  	tuner=&(tuners[GETCONTEXT(device)->tuner.type]);
  	// Into 1/16ths of a MHz for Linux-based routine
--- 70,74 ----
  
  	bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSetting tuner frequency to %uHz (%u*%u)\n",(unsigned int)bob,GETCONTEXT(device)->tuner.frequency,GETCONTEXT(device)->tuner.freq_mult));
  	tuner=&(tuners[GETCONTEXT(device)->tuner.type]);
  	// Into 1/16ths of a MHz for Linux-based routine
***************
*** 89,93 ****
  	i2c.length=4;
  	SAA7146_ExecuteI2C(device,&i2c,1);
! 	DbgPrint("Nova-T: Tuner set\n");
  }
  */
--- 89,93 ----
  	i2c.length=4;
  	SAA7146_ExecuteI2C(device,&i2c,1);
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTuner set\n"));
  }
  */
***************
*** 100,104 ****
  
  	bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! 	DbgPrint("Nova-T: Setting tuner frequency to %uHz (%u*%u)\n",(unsigned int)bob,GETCONTEXT(device)->tuner.frequency,GETCONTEXT(device)->tuner.freq_mult);
  	div=(unsigned __int32)(unsigned __int64)((36000000+bob)/166666);
  	buffer[0]=(div>>8)&0x7F;
--- 100,104 ----
  
  	bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! 	_DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSetting tuner frequency to %uHz (%u*%u)\n",(unsigned int)bob,GETCONTEXT(device)->tuner.frequency,GETCONTEXT(device)->tuner.freq_mult));
  	div=(unsigned __int32)(unsigned __int64)((36000000+bob)/166666);
  	buffer[0]=(div>>8)&0x7F;
***************
*** 111,119 ****
  	i2c.length=4;
  	SAA7146_ExecuteI2C(device,&i2c,1);
! 	DbgPrint("Nova-T: Tuner set\n");
  }
  
  /*****************************************************************************\
   * $Log$
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy
--- 111,127 ----
  	i2c.length=4;
  	SAA7146_ExecuteI2C(device,&i2c,1);
!     
!     GETCONTEXT(device)->tuner.ChangeOutstanding = FALSE;
! 	
!     _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTuner set\n"));
  }
  
  /*****************************************************************************\
   * $Log$
+  * Revision 1.3  2003/02/27 16:50:53  adcockj
+  * Tidy up debug logging ready for release
+  * Make changes only on Commit method
+  * Extra logging in Checked build
+  *
   * Revision 1.2  2003/02/17 11:07:12  adcockj
   * Added VS6 project for the lazy

Index: tuner.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/tuner.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** tuner.h	17 Feb 2003 11:07:12 -0000	1.2
--- tuner.h	27 Feb 2003 16:50:53 -0000	1.3
***************
*** 16,19 ****
--- 16,20 ----
  	// Actually for demodulator, but tuner node deals with it it seems
  	ULONG bandwidth;
+     BOOL ChangeOutstanding;
  } TUNER_DATA;