Menu
▾
▴
[Bdadev-cvs] NovaTDriver Nova-T.inf,1.2,1.3 automation.cpp,1.3,1.4 device.cpp,1.3,1.4 driver.cpp,1.3,1.4 l64781.cpp,1.3,1.4 saa7146.cpp,1.3,1.4 tuner.cpp,1.3,1.4
|
From: <ad...@us...> - 2003-02-28 17:28:32
|
Update of /cvsroot/bdadev/NovaTDriver
In directory sc8-pr-cvs1:/tmp/cvs-serv17665
Modified Files:
Nova-T.inf automation.cpp device.cpp driver.cpp l64781.cpp
saa7146.cpp tuner.cpp
Log Message:
Removed nelines from debug prints
Index: Nova-T.inf
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/Nova-T.inf,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Nova-T.inf 27 Feb 2003 16:50:51 -0000 1.2
--- Nova-T.inf 28 Feb 2003 17:28:22 -0000 1.3
***************
*** 7,12 ****
ClassGUID={4d36e96c-e325-11ce-bfc1-08002be10318}
Provider=%Msft%
! LayoutFile=Layout.inf
! DriverVer=1/24/2003
; F i l e c o p y i n g s e c t i o n s (where the files go to).
--- 7,12 ----
ClassGUID={4d36e96c-e325-11ce-bfc1-08002be10318}
Provider=%Msft%
! ;LayoutFile=Layout.inf
! DriverVer=02/28/2003
; F i l e c o p y i n g s e c t i o n s (where the files go to).
***************
*** 48,52 ****
[NovaT.AddService]
! DisplayName = %SvcDesc%
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
StartType = 3 ; SERVICE_DEMAND_START
--- 48,52 ----
[NovaT.AddService]
! DisplayName = %NovaT.FriendlyName%
ServiceType = 1 ; SERVICE_KERNEL_DRIVER
StartType = 3 ; SERVICE_DEMAND_START
***************
*** 73,82 ****
[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]
--- 73,82 ----
[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]
***************
*** 96,100 ****
NovaT.Tuner = "NovaT.Tuner"
KSNAME_Filter = "{9B365890-165F-11D0-A195-0020AFD156E4}"
- SvcDesc = "Philips TV Tuner"
;
; The following items should be moved to KS_registration - TCP
--- 96,99 ----
***************
*** 158,161 ****
--- 157,163 ----
;***********************************************************************
; $Log$
+ ; Revision 1.3 2003/02/28 17:28:22 adcockj
+ ; Removed nelines from debug prints
+ ;
; Revision 1.2 2003/02/27 16:50:51 adcockj
; Tidy up debug logging ready for release
Index: automation.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** automation.cpp 27 Feb 2003 16:50:52 -0000 1.3
--- automation.cpp 28 Feb 2003 17:28:23 -0000 1.4
***************
*** 49,53 ****
GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerFrequencyPut(%u)\n",frequency));
return STATUS_SUCCESS;
}
--- 49,53 ----
GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyPut(%u)",frequency));
return STATUS_SUCCESS;
}
***************
*** 67,71 ****
GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerFrequencyMultiplerPut(%u)\n",freq_mult));
return STATUS_SUCCESS;
}
--- 67,71 ----
GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyMultiplerPut(%u)",freq_mult));
return STATUS_SUCCESS;
}
***************
*** 87,91 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerBandwidthPut(%u)\n",bandwidth));
return STATUS_SUCCESS;
}
--- 87,91 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerBandwidthPut(%u)",bandwidth));
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;
}
--- 96,100 ----
// In mDb or something
*pulProperty=(LONG)L64781_SignalStrength(device);
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerSignalStrengthGet, irp=0x%p, device=0x%p, strength=%i",pIrp,device,*pulProperty));
return STATUS_SUCCESS;
}
***************
*** 103,107 ****
{
*pulProperty=(BOOL)L64781_HasSignal(GETDEVICEFROMIRP(pIrp));
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTunerSignalStrengthGet (%d)\n",*pulProperty));
return STATUS_SUCCESS;
}
--- 103,107 ----
{
*pulProperty=(BOOL)L64781_HasSignal(GETDEVICEFROMIRP(pIrp));
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerSignalStrengthGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
***************
*** 111,115 ****
{
*pulProperty=(LONG)((L64781_Signal2NoiseRatio(GETDEVICEFROMIRP(pIrp))*100)/255);
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSignalQualityGet (%d)\n",*pulProperty));
return STATUS_SUCCESS;
}
--- 111,115 ----
{
*pulProperty=(LONG)((L64781_Signal2NoiseRatio(GETDEVICEFROMIRP(pIrp))*100)/255);
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSignalQualityGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
***************
*** 118,122 ****
{
*pulProperty=(BOOL)L64781_HasLock(GETDEVICEFROMIRP(pIrp));
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSignalLockedGet (%d)\n",*pulProperty));
return STATUS_SUCCESS;
}
--- 118,122 ----
{
*pulProperty=(BOOL)L64781_HasLock(GETDEVICEFROMIRP(pIrp));
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSignalLockedGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
***************
*** 136,140 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodModulationTypePut(%u)\n",newtype));
return STATUS_SUCCESS;
}
--- 136,140 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodModulationTypePut(%u)",newtype));
return STATUS_SUCCESS;
}
***************
*** 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;
--- 147,151 ----
NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecTypePut(%u)",*pulProperty));
if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
else return STATUS_INVALID_PARAMETER;
***************
*** 170,174 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodInnerFecRatePut(%u)\n",rate));
return STATUS_SUCCESS;
}
--- 170,174 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecRatePut(%u)",rate));
return STATUS_SUCCESS;
}
***************
*** 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;
--- 181,185 ----
NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecTypePut(%u)",*pulProperty));
if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
else return STATUS_INVALID_PARAMETER;
***************
*** 204,208 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodOuterFecRatePut(%u)\n",rate));
return STATUS_SUCCESS;
}
--- 204,208 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecRatePut(%u)",rate));
return STATUS_SUCCESS;
}
***************
*** 219,223 ****
GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
//GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSymbolRatePut(%u)\n",*pulProperty));
return STATUS_SUCCESS;
}
--- 219,223 ----
GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
//GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSymbolRatePut(%u)",*pulProperty));
return STATUS_SUCCESS;
}
***************
*** 237,241 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodGuardIntervalPut(%i)\n",guard_interval));
return STATUS_SUCCESS;
}
--- 237,241 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodGuardIntervalPut(%i)",guard_interval));
return STATUS_SUCCESS;
}
***************
*** 255,259 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodTransmissionModePut(%i)\n",transmit_mode));
return STATUS_SUCCESS;
}
--- 255,259 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodTransmissionModePut(%i)",transmit_mode));
return STATUS_SUCCESS;
}
***************
*** 273,277 ****
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDemodSpectralInversionPut(%i)\n",inversion));
return STATUS_SUCCESS;
}
--- 273,277 ----
GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSpectralInversionPut(%i)",inversion));
return STATUS_SUCCESS;
}
***************
*** 282,286 ****
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoStartChanges()\n"));
status=BdaStartChanges(pIrp);
if(NT_SUCCESS(status)) {
--- 282,286 ----
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("StartChanges()"));
status=BdaStartChanges(pIrp);
if(NT_SUCCESS(status)) {
***************
*** 293,297 ****
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoCheckChanges()\n"));
status=BdaCheckChanges(pIrp);
if(NT_SUCCESS(status)) {
--- 293,297 ----
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("CheckChanges()"));
status=BdaCheckChanges(pIrp);
if(NT_SUCCESS(status)) {
***************
*** 303,307 ****
{
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoCommitChanges()\n"));
PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
--- 303,307 ----
{
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("CommitChanges()"));
PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
***************
*** 330,334 ****
PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoGetChangeState()\n"));
status=BdaGetChangeState(pIrp,&topologyChangeState);
if(NT_SUCCESS(status)) {
--- 330,334 ----
PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! _DbgPrintF(DEBUGLVL_TERSE, ("GetChangeState()"));
status=BdaGetChangeState(pIrp,&topologyChangeState);
if(NT_SUCCESS(status)) {
***************
*** 346,349 ****
--- 346,352 ----
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:23 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:52 adcockj
* Tidy up debug logging ready for release
Index: device.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** device.cpp 27 Feb 2003 16:50:52 -0000 1.3
--- device.cpp 28 Feb 2003 17:28:23 -0000 1.4
***************
*** 47,51 ****
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceAdd()\n"));
// Allocate context storage
device->Context=ExAllocatePoolWithTag(NonPagedPool,sizeof(DEVICE_CONTEXT),'ECIM');
--- 47,51 ----
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceAdd()"));
// 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;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceAdd() complete\n"));
// Done
return result;
--- 58,62 ----
GETCONTEXT(device)->tuner_address=I2C_TUNER;
GETCONTEXT(device)->tuner.type=TUNER_TSA5060;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceAdd() complete"));
// Done
return result;
***************
*** 64,68 ****
VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceRemove()\n"));
}
--- 64,68 ----
VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceRemove()"));
}
***************
*** 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++) {
--- 72,76 ----
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStart()"));
// 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;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStart() complete\n"));
// Ready!
return STATUS_SUCCESS;
--- 157,161 ----
return result;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStart() complete"));
// Ready!
return STATUS_SUCCESS;
***************
*** 166,170 ****
int i;
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStop()\n"));
// Stop tuner, L64781 and SAA7146 from any current functions
L64781_Close(device);
--- 166,170 ----
int i;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStop()"));
// 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);
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoDeviceStop() complete\n"));
}
--- 180,184 ----
// Unmap memory
MmUnmapIoSpace(GETCONTEXT(device)->pci_memory,GETCONTEXT(device)->pci_size);
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStop() complete"));
}
***************
*** 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;
--- 189,193 ----
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("FilterCreate()"));
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)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoFilterClose()\n"));
BdaUninitFilter(Filter);
// Shut down anything still going on
--- 203,207 ----
NTSTATUS FilterClose(IN PKSFILTER Filter,IN PIRP Irp)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("FilterClose()"));
BdaUninitFilter(Filter);
// Shut down anything still going on
***************
*** 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)) {
--- 240,244 ----
else if(FromState==KSSTATE_RUN) j="Run";
else j="Unknown";
! _DbgPrintF(DEBUGLVL_TERSE, ("Changed state from %s to %s",j,i));
}
if((ToState!=KSSTATE_STOP)&&(FromState==KSSTATE_STOP)) {
***************
*** 255,259 ****
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;
}
--- 255,259 ----
if((ToState==KSSTATE_STOP)&&(FromState!=KSSTATE_STOP)) SAA7146_StopStream((PKSDEVICE)Pin->Context);
GETCONTEXT(Pin->Context)->cur_state=ToState;
! _DbgPrintF(DEBUGLVL_TERSE, ("State changed!"));
return STATUS_SUCCESS;
}
***************
*** 261,264 ****
--- 261,267 ----
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:23 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:52 adcockj
* Tidy up debug logging ready for release
Index: driver.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/driver.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** driver.cpp 27 Feb 2003 16:50:52 -0000 1.3
--- driver.cpp 28 Feb 2003 17:28:23 -0000 1.4
***************
*** 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);
}
--- 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"))
return KsInitializeDriver(DriverObject,RegistryPath,&DeviceDescriptor);
}
***************
*** 526,529 ****
--- 526,532 ----
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:23 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:52 adcockj
* Tidy up debug logging ready for release
Index: l64781.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/l64781.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** l64781.cpp 27 Feb 2003 16:50:52 -0000 1.3
--- l64781.cpp 28 Feb 2003 17:28:23 -0000 1.4
***************
*** 101,105 ****
DEVICE_CONTEXT *data=GETCONTEXT(device);
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoL64781 initialise\n"));
// Initialise tuner structures to default
data->tuner.frequency=570000;
--- 101,105 ----
DEVICE_CONTEXT *data=GETCONTEXT(device);
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 initialise"));
// Initialise tuner structures to default
data->tuner.frequency=570000;
***************
*** 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)
--- 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, ("L64781 initialised"));
return STATUS_SUCCESS;
}
void L64781_Close(PKSDEVICE device)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 closing"));
L64781_WriteRegister(device,0x3E,0x5A); // Crashes Linux. Windows?
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 closed"));
}
unsigned __int8 _L64781_SignalStrength(PKSDEVICE device)
***************
*** 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
--- 179,183 ----
int p_bandwidth,p_constellation,p_hp_coderate,p_guardinterval,p_lp_coderate,p_transmissionmode;
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 updating"));
// 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
***************
*** 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;
--- 269,274 ----
break;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 Values: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)",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, ("L64781 Parameters: bandwidth(%i), constellation(%i), transmission(%i), HPcoderate(%i), LPcoderate(%i), GuardInterval(%i)",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;
***************
*** 316,324 ****
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
--- 316,327 ----
data->demodulator.ChangeOutstanding = FALSE;
! _DbgPrintF(DEBUGLVL_TERSE, ("L64781 updated"));
}
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:23 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:52 adcockj
* Tidy up debug logging ready for release
Index: saa7146.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/saa7146.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** saa7146.cpp 27 Feb 2003 16:50:53 -0000 1.3
--- saa7146.cpp 28 Feb 2003 17:28:24 -0000 1.4
***************
*** 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
--- 35,39 ----
NTSTATUS SAA7146_Init(PKSDEVICE device)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("SAA7146 Init"));
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)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Close\n"));
}
--- 48,52 ----
void SAA7146_Close(PKSDEVICE device)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("SAA7146 Close"));
}
***************
*** 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
--- 70,74 ----
int i;
! _DbgPrintF(DEBUGLVL_TERSE, ("SAA7146 Starting stream"));
GETCONTEXT(device)->pv_error=0; // Number of Protection Violation errors
GETCONTEXT(device)->switcher=0; // Switches buffers
***************
*** 97,101 ****
DeviceWriteRegister32(device,REG_IER,DeviceReadRegister32(device,REG_IER)|IR_FIDB); // Interrupt on
// Done
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoSAA7146 Stream started\n"));
return STATUS_SUCCESS;
}
--- 97,101 ----
DeviceWriteRegister32(device,REG_IER,DeviceReadRegister32(device,REG_IER)|IR_FIDB); // Interrupt on
// Done
! _DbgPrintF(DEBUGLVL_TERSE, ("SAA7146 Stream started"));
return STATUS_SUCCESS;
}
***************
*** 103,107 ****
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
--- 103,107 ----
void SAA7146_StopStream(PKSDEVICE device)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("SAA7146 Stopping stream"));
DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC1_TR_E_3)); // DMA3 off
DeviceWriteRegister32(device,REG_MC1,RESET_BITS(MC2_RPS_SIG0)); // RPS0 off
***************
*** 231,235 ****
if(i==0) {
PrintString(device,"I2C transmission timeout");
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoI2C error: transmission timeout\n"));
return FALSE;
}
--- 231,235 ----
if(i==0) {
PrintString(device,"I2C transmission timeout");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: transmission timeout"));
return FALSE;
}
***************
*** 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;
}
--- 237,257 ----
case IIC_STA_AL:
PrintString(device,"I2C error: arbitration lost");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: arbitration lost"));
break;
case IIC_STA_DRERR:
PrintString(device,"I2C error: receiving data");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: receiving data"));
break;
case IIC_STA_DTERR:
PrintString(device,"I2C error: data transmission");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: data transmission"));
break;
case IIC_STA_APERR:
PrintString(device,"I2C error: address phase");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: address phase"));
break;
case IIC_STA_SPERR:
PrintString(device,"I2C error: invalid start/stop condition");
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C error: invalid start/stop condition"));
break;
}
***************
*** 283,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;
--- 283,287 ----
if((status=SAA7146_StatusI2C(device))!=I2C_SPEED) {
PrintString(device,"I2C bus could not be reset, system failure!",status);
! _DbgPrintF(DEBUGLVL_TERSE, ("I2C bus could not be reset, system failure!"));
return FALSE;
} else return TRUE;
***************
*** 347,351 ****
if(!SAA7146_RunI2C(device,&output,b,&k)) return FALSE;
}
! _DbgPrintF(DEBUGLVL_VERBOSE, ("UpdateInfoI2C transfer succeeded\n"));
return TRUE;
}
--- 347,351 ----
if(!SAA7146_RunI2C(device,&output,b,&k)) return FALSE;
}
! _DbgPrintF(DEBUGLVL_VERBOSE, ("I2C transfer succeeded"));
return TRUE;
}
***************
*** 365,368 ****
--- 365,371 ----
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:24 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:53 adcockj
* Tidy up debug logging ready for release
Index: tuner.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/tuner.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** tuner.cpp 27 Feb 2003 16:50:53 -0000 1.3
--- tuner.cpp 28 Feb 2003 17:28:24 -0000 1.4
***************
*** 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
--- 70,74 ----
bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! _DbgPrintF(DEBUGLVL_TERSE, ("Setting tuner frequency to %uHz (%u*%u)",(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);
! _DbgPrintF(DEBUGLVL_TERSE, ("UpdateInfoTuner set\n"));
}
*/
--- 89,93 ----
i2c.length=4;
SAA7146_ExecuteI2C(device,&i2c,1);
! _DbgPrintF(DEBUGLVL_TERSE, ("Tuner set"));
}
*/
***************
*** 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;
--- 100,104 ----
bob=GETCONTEXT(device)->tuner.frequency*GETCONTEXT(device)->tuner.freq_mult;
! _DbgPrintF(DEBUGLVL_TERSE, ("Setting tuner frequency to %uHz (%u*%u)",(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;
***************
*** 114,122 ****
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
--- 114,125 ----
GETCONTEXT(device)->tuner.ChangeOutstanding = FALSE;
! _DbgPrintF(DEBUGLVL_TERSE, ("Tuner set"));
}
/*****************************************************************************\
* $Log$
+ * Revision 1.4 2003/02/28 17:28:24 adcockj
+ * Removed nelines from debug prints
+ *
* Revision 1.3 2003/02/27 16:50:53 adcockj
* Tidy up debug logging ready for release
|
