Menu
▾
▴
[Bdadev-cvs] NovaTDriver NovaTDriver.dsp,1.2,1.3 Sources,1.2,1.3 automation.cpp,1.7,1.8 automation.h,1.3,1.4 debug.cpp,1.3,1.4 device.cpp,1.10,1.11 device.h,1.6,1.7 driver.cpp,1.9,1.10 l64781.cpp,1.12,1.13 l64781.h,1.6,1.7 saa7146.cpp,1.10,1.11 saa7146.h,1.3,1.4 tuner.cpp,1.6,1.7 tuner.h,1.3,1.4
|
From: <ad...@us...> - 2003-04-26 09:40:57
|
Update of /cvsroot/bdadev/NovaTDriver
In directory sc8-pr-cvs1:/tmp/cvs-serv31545
Modified Files:
NovaTDriver.dsp Sources automation.cpp automation.h debug.cpp
device.cpp device.h driver.cpp l64781.cpp l64781.h saa7146.cpp
saa7146.h tuner.cpp tuner.h
Log Message:
Reverted back to original code
Index: NovaTDriver.dsp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/NovaTDriver.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NovaTDriver.dsp 27 Feb 2003 16:50:52 -0000 1.2
--- NovaTDriver.dsp 26 Apr 2003 09:40:50 -0000 1.3
***************
*** 39,44 ****
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "objfre\i386"
! # PROP Intermediate_Dir "objfre\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
--- 39,44 ----
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
! # PROP Output_Dir "objfre_wxp_x86\i386"
! # PROP Intermediate_Dir "objfre_wxp_x86\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
***************
*** 54,61 ****
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
! # ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
! TargetPath=.\objfre\i386\NovaTDriver.sys
! InputPath=.\objfre\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
--- 54,61 ----
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
! # ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /machine:IX86 /nodefaultlib /out:"objfre_wxp_x86\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
! TargetPath=.\objfre_wxp_x86\i386\NovaTDriver.sys
! InputPath=.\objfre_wxp_x86\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
***************
*** 74,79 ****
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
! # PROP Output_Dir "objchk\i386"
! # PROP Intermediate_Dir "objchk\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
--- 74,79 ----
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
! # PROP Output_Dir "objchk_wxp_x86\i386"
! # PROP Intermediate_Dir "objchk_wxp_x86\i386"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
***************
*** 89,96 ****
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
! # ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib ntoskrnl.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
! TargetPath=.\objchk\i386\NovaTDriver.sys
! InputPath=.\objchk\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
--- 89,96 ----
LINK32=link.exe
# ADD BASE LINK32 wdm.lib wmilib.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
! # ADD LINK32 wdm.lib wmilib.lib ks.lib ksguid.lib BdaSup.lib ntoskrnl.lib /nologo /base:"0x10000" /version:5.1 /stack:0x40000,0x1000 /entry:"DriverEntry@8" /incremental:no /machine:IX86 /nodefaultlib /out:"objchk_wxp_x86\i386\NovaTDriver.sys" /libpath:"$(ddkpath)\lib\wxp\i386" -align:0x80 -debug:full -debugtype:vc6 -driver -fullbuild -ignore:4010,4037,4039,4049,4065,4070,4078,4087,4089,4198,4221 -merge:_PAGE=PAGE -merge:_TEXT=.text -opt:icf -opt:nowin98 -opt:ref -osversion:4.00 -release -section:init,d -subsystem:native,4.00
# Begin Custom Build - Finishing up...
! TargetPath=.\objchk_wxp_x86\i386\NovaTDriver.sys
! InputPath=.\objchk_wxp_x86\i386\NovaTDriver.sys
SOURCE="$(InputPath)"
***************
*** 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
--- 182,185 ----
Index: Sources
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/Sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Sources 4 Mar 2003 08:02:19 -0000 1.2
--- Sources 26 Apr 2003 09:40:50 -0000 1.3
***************
*** 10,20 ****
TARGETTYPE=DRIVER
# Presumably these paths need adjusted for other DDK versions.
! TARGETLIBS=$(DDK_LIB_PATH)\ks.lib \
! $(DDK_LIB_PATH)\ksguid.lib \
! $(DDK_LIB_PATH)\BdaSup.lib
! INCLUDES= \
! $(DDK_INC_PATH); \
! $(DDK_INC_PATH)\wdm;
!
SOURCES=HNTbda.rc\
driver.cpp\
--- 10,18 ----
TARGETTYPE=DRIVER
# Presumably these paths need adjusted for other DDK versions.
! TARGETLIBS=$(DDK_LIB_DEST)\i386\ks.lib \
! $(DDK_LIB_DEST)\i386\ksguid.lib \
! $(DDK_LIB_DEST)\i386\BdaSup.lib
! INCLUDES=$(DDK_INC_PATH)\inc; \
! $(DDK_INC_PATH)\wdm;
SOURCES=HNTbda.rc\
driver.cpp\
Index: automation.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** automation.cpp 7 Mar 2003 08:04:11 -0000 1.7
--- automation.cpp 26 Apr 2003 09:40:50 -0000 1.8
***************
*** 25,62 ****
#include "automation.h"
- #pragma const_seg("PAGECONST")
- #pragma code_seg("PAGE")
-
// This file is mainly just a horrible pile of functions which connect the
// automation tables for the kernel streaming/BDA interface to the functions
// 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 GETDEVICEFROMIRPPIN(irp) KsPinGetDevice(KsGetPinFromIrp(irp))
! #define GETDEVICEFROMIRPFILT(irp) KsFilterGetDevice(KsGetFilterFromIrp(irp))
// For Tuner node
NTSTATUS TunerFrequencyGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->tuner.frequency;
return STATUS_SUCCESS;
}
-
NTSTATUS TunerFrequencyPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyPut(%u)",*pulProperty));
! if((*pulProperty==BDA_FREQUENCY_NOT_SET)||
! (*pulProperty==BDA_FREQUENCY_NOT_DEFINED)) {
! return STATUS_SUCCESS;
! }
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(*pulProperty!=GETCONTEXT(device)->tuner.frequency) {
! GETCONTEXT(device)->tuner.frequency=*pulProperty;
! }
! GETCONTEXT(device)->tuner.ChangeOutstanding=TRUE;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
return STATUS_SUCCESS;
}
--- 25,55 ----
#include "automation.h"
// This file is mainly just a horrible pile of functions which connect the
// automation tables for the kernel streaming/BDA interface to the functions
// 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))
// For Tuner node
NTSTATUS TunerFrequencyGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(ULONG)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->tuner.frequency;
return STATUS_SUCCESS;
}
NTSTATUS TunerFrequencyPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! ULONG frequency=(ULONG)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! // Validate here
! if(frequency!=GETCONTEXT(device)->tuner.frequency) {
! GETCONTEXT(device)->tuner.frequency=frequency;
! Tuner_SetFrequency(device);
! }
! DbgPrint("Nova-T: TunerFrequencyPut(%u)\n",frequency);
return STATUS_SUCCESS;
}
***************
*** 64,85 ****
NTSTATUS TunerFrequencyMultiplerGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyMultiplerGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->tuner.freq_mult;
return STATUS_SUCCESS;
}
-
NTSTATUS TunerFrequencyMultiplerPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerFrequencyMultiplerPut(%u)",*pulProperty));
! if((*pulProperty==BDA_FREQUENCY_MULTIPLIER_NOT_SET)||
! (*pulProperty==BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED)) {
! return STATUS_SUCCESS;
! }
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->tuner.freq_mult!=*pulProperty) {
! GETCONTEXT(device)->tuner.freq_mult=*pulProperty;
! GETCONTEXT(device)->tuner.ChangeOutstanding = TRUE;
! GETCONTEXT(device)->demodulator.ChangeOutstanding = TRUE;
}
return STATUS_SUCCESS;
}
--- 57,73 ----
NTSTATUS TunerFrequencyMultiplerGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(ULONG)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->tuner.freq_mult;
return STATUS_SUCCESS;
}
NTSTATUS TunerFrequencyMultiplerPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! ULONG freq_mult=(ULONG)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! // Validate here
! 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;
}
***************
*** 87,286 ****
NTSTATUS TunerBandwidthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerBandwidthGet"));
! *pulProperty=(ULONG)GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->tuner.bandwidth;
return STATUS_SUCCESS;
}
-
NTSTATUS TunerBandwidthPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerBandwidthPut(%u)",*pulProperty));
! if((*pulProperty==BDA_CHAN_BANDWITH_NOT_SET)||
! (*pulProperty==BDA_CHAN_BANDWITH_NOT_DEFINED)) {
! return STATUS_SUCCESS;
! }
! // note that the tuner isn't effected by this setting but the
! // demodulator is so that's why we signal that that has changed
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->tuner.bandwidth!=*pulProperty) {
! GETCONTEXT(device)->tuner.bandwidth=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
}
return STATUS_SUCCESS;
}
! NTSTATUS TunerSignalStrengthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN LONG* pulProperty)
{
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
// In mDb or something
! *pulProperty=L64781_SignalStrength(device);
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerSignalStrengthGet (%i)", *pulProperty));
return STATUS_SUCCESS;
}
! NTSTATUS TunerSignalPresentGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BOOL* pulProperty)
{
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! *pulProperty=L64781_HasSignal(device);
! _DbgPrintF(DEBUGLVL_TERSE, ("TunerSignalStrengthGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
// For Demodulator node
! NTSTATUS DemodSignalQualityGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN LONG* pulProperty)
{
! *pulProperty=(L64781_Signal2NoiseRatio(GETDEVICEFROMIRPPIN(pIrp))*100)/255;
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSignalQualityGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
! NTSTATUS DemodSignalLockedGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BOOL* pulProperty)
{
! *pulProperty=L64781_HasLock(GETDEVICEFROMIRPPIN(pIrp));
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSignalLockedGet (%d)",*pulProperty));
return STATUS_SUCCESS;
}
! NTSTATUS DemodModulationTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN ModulationType* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodModulationTypeGet"));
! *pulProperty=(ModulationType)GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.modulation;
return STATUS_SUCCESS;
}
!
! NTSTATUS DemodModulationTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN ModulationType* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodModulationTypePut(%d)",*pulProperty));
! if(*pulProperty < BDA_MOD_NOT_SET ||
! *pulProperty >= BDA_MOD_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_MOD_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_MOD_QPSK)&&(*pulProperty!=BDA_MOD_16QAM)&&(*pulProperty!=BDA_MOD_64QAM)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Modulation Type : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->demodulator.modulation!=*pulProperty) {
! GETCONTEXT(device)->demodulator.modulation=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
! NTSTATUS DemodInnerFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty)
{
- _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecTypeGet"));
*pulProperty=BDA_FEC_VITERBI;
return STATUS_SUCCESS;
}
!
! NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecTypePut(%d)",*pulProperty));
! if(*pulProperty < BDA_FEC_METHOD_NOT_SET ||
! *pulProperty >= BDA_FEC_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_FEC_METHOD_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if(*pulProperty!=BDA_FEC_VITERBI) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown FEC Type"));
! }
! return STATUS_SUCCESS;
}
! NTSTATUS DemodInnerFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecRateGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.HP_coderate;
return STATUS_SUCCESS;
}
!
! NTSTATUS DemodInnerFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodInnerFecRatePut(%d)",*pulProperty));
! if(*pulProperty < BDA_BCC_RATE_NOT_SET ||
! *pulProperty >= BDA_BCC_RATE_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_BCC_RATE_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_BCC_RATE_1_2)&&
! (*pulProperty!=BDA_BCC_RATE_2_3)&&
! (*pulProperty!=BDA_BCC_RATE_3_4)&&
! (*pulProperty!=BDA_BCC_RATE_5_6)&&
! (*pulProperty!=BDA_BCC_RATE_7_8)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Inner Rate : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->demodulator.HP_coderate!=*pulProperty) {
! GETCONTEXT(device)->demodulator.HP_coderate=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty)
{
- _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecTypeGet"));
*pulProperty=BDA_FEC_VITERBI;
return STATUS_SUCCESS;
}
!
! NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecTypePut(%d)",*pulProperty));
! if(*pulProperty < BDA_FEC_METHOD_NOT_SET ||
! *pulProperty >= BDA_FEC_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_FEC_METHOD_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if(*pulProperty!=BDA_FEC_VITERBI) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown FEC Type"));
! }
! return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecRateGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.LP_coderate;
return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodOuterFecRatePut(%d)",*pulProperty));
! if(*pulProperty < BDA_BCC_RATE_NOT_SET ||
! *pulProperty >= BDA_BCC_RATE_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_BCC_RATE_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_BCC_RATE_1_2)&&
! (*pulProperty!=BDA_BCC_RATE_2_3)&&
! (*pulProperty!=BDA_BCC_RATE_3_4)&&
! (*pulProperty!=BDA_BCC_RATE_5_6)&&
! (*pulProperty!=BDA_BCC_RATE_7_8)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Outer Rate : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->demodulator.LP_coderate!=*pulProperty) {
! GETCONTEXT(device)->demodulator.LP_coderate=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
--- 75,206 ----
NTSTATUS TunerBandwidthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(ULONG)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->tuner.bandwidth;
return STATUS_SUCCESS;
}
NTSTATUS TunerBandwidthPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! 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;
}
! NTSTATUS TunerSignalStrengthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
// 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;
}
! NTSTATUS TunerSignalPresentGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(BOOL)L64781_HasSignal(GETDEVICEFROMIRP(pIrp));
return STATUS_SUCCESS;
}
// For Demodulator node
! NTSTATUS DemodSignalQualityGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(LONG)((L64781_Signal2NoiseRatio(GETDEVICEFROMIRP(pIrp))*100)/255);
return STATUS_SUCCESS;
}
! NTSTATUS DemodSignalLockedGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(BOOL)L64781_HasLock(GETDEVICEFROMIRP(pIrp));
return STATUS_SUCCESS;
}
! NTSTATUS DemodModulationTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(ModulationType)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.modulation;
return STATUS_SUCCESS;
}
! NTSTATUS DemodModulationTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! ModulationType newtype=(ModulationType)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! DbgPrint("Nova-T: DemodModulationTypePut (%d)\n",newtype);
! if((newtype!=BDA_MOD_QPSK)&&(newtype!=BDA_MOD_16QAM)&&(newtype!=BDA_MOD_64QAM)) return STATUS_INVALID_PARAMETER;
! if(GETCONTEXT(device)->demodulator.modulation!=newtype) {
! GETCONTEXT(device)->demodulator.modulation=newtype;
! L64781_ParametersUpdated(device);
! }
! DbgPrint("Nova-T: DemodModulationTypePut(%u)\n",newtype);
return STATUS_SUCCESS;
}
! NTSTATUS DemodInnerFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
*pulProperty=BDA_FEC_VITERBI;
return STATUS_SUCCESS;
}
! NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! DbgPrint("Nova-T: DemodInnerFecTypePut (%d)\n",*pulProperty);
! if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
! else return STATUS_INVALID_PARAMETER;
}
! NTSTATUS DemodInnerFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(BinaryConvolutionCodeRate)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.HP_coderate;
return STATUS_SUCCESS;
}
! NTSTATUS DemodInnerFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! BinaryConvolutionCodeRate rate=(BinaryConvolutionCodeRate)*pulProperty;
! DbgPrint("Nova-T: DemodInnerFecRatePut (%d)\n",rate);
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! if((rate!=BDA_BCC_RATE_1_2)&&
! (rate!=BDA_BCC_RATE_2_3)&&
! (rate!=BDA_BCC_RATE_3_4)&&
! (rate!=BDA_BCC_RATE_5_6)&&
! (rate!=BDA_BCC_RATE_7_8)) return STATUS_INVALID_PARAMETER; // Fix
! if(GETCONTEXT(device)->demodulator.HP_coderate!=rate) {
! GETCONTEXT(device)->demodulator.HP_coderate=rate;
! L64781_ParametersUpdated(device);
! }
return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
*pulProperty=BDA_FEC_VITERBI;
return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! DbgPrint("Nova-T: DemodOuterFecTypePut (%d)\n",(*pulProperty));
! if((*pulProperty)==BDA_FEC_VITERBI) return STATUS_SUCCESS;
! else return STATUS_INVALID_PARAMETER;
}
! NTSTATUS DemodOuterFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(BinaryConvolutionCodeRate)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.LP_coderate;
return STATUS_SUCCESS;
}
! NTSTATUS DemodOuterFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! BinaryConvolutionCodeRate rate=(BinaryConvolutionCodeRate)*pulProperty;
! DbgPrint("Nova-T: DemodOuterFecRatePut (%d)\n", rate);
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! if((rate!=BDA_BCC_RATE_1_2)&&
! (rate!=BDA_BCC_RATE_2_3)&&
! (rate!=BDA_BCC_RATE_3_4)&&
! (rate!=BDA_BCC_RATE_5_6)&&
! (rate!=BDA_BCC_RATE_7_8)) return STATUS_INVALID_PARAMETER; // Fix
! if(GETCONTEXT(device)->demodulator.LP_coderate!=rate) {
! GETCONTEXT(device)->demodulator.LP_coderate=rate;
! L64781_ParametersUpdated(device);
! }
return STATUS_SUCCESS;
}
***************
*** 288,395 ****
NTSTATUS DemodSymbolRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSymbolRateGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->dummy.symbolRate;
return STATUS_SUCCESS;
}
NTSTATUS DemodSymbolRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSymbolRatePut(%u)",*pulProperty));
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! // \todo Validate here
GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
return STATUS_SUCCESS;
}
! NTSTATUS DemodGuardIntervalGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN GuardInterval* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodGuardIntervalGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.guard_interval;
return STATUS_SUCCESS;
}
! NTSTATUS DemodGuardIntervalPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN GuardInterval* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodGuardIntervalPut(%d)",*pulProperty));
! if(*pulProperty < BDA_GUARD_NOT_SET ||
! *pulProperty >= BDA_GUARD_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_GUARD_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_GUARD_1_32)&&
! (*pulProperty!=BDA_GUARD_1_16)&&
! (*pulProperty!=BDA_GUARD_1_8)&&
! (*pulProperty!=BDA_GUARD_1_4)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Guard Interval : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! // Validate here
! if(GETCONTEXT(device)->demodulator.guard_interval!=*pulProperty) {
! GETCONTEXT(device)->demodulator.guard_interval=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
! NTSTATUS DemodTransmissionModeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN TransmissionMode* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodTransmissionModeGet"));
! *pulProperty=GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.transmit_mode;
return STATUS_SUCCESS;
}
! NTSTATUS DemodTransmissionModePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN TransmissionMode* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodTransmissionModePut(%i)",*pulProperty));
! if(*pulProperty < BDA_XMIT_MODE_NOT_SET ||
! *pulProperty >= BDA_XMIT_MODE_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_XMIT_MODE_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_XMIT_MODE_2K)&&
! (*pulProperty!=BDA_XMIT_MODE_8K)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Transmission Mode : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->demodulator.transmit_mode!=*pulProperty) {
! GETCONTEXT(device)->demodulator.transmit_mode=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
! NTSTATUS DemodSpectralInversionGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN SpectralInversion* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSpectralInversionGet"));
! *pulProperty=(SpectralInversion)GETCONTEXT(GETDEVICEFROMIRPPIN(pIrp))->demodulator.inversion;
return STATUS_SUCCESS;
}
! NTSTATUS DemodSpectralInversionPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN SpectralInversion* pulProperty)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DemodSpectralInversionPut(%i)",*pulProperty));
! if(*pulProperty < BDA_SPECTRAL_INVERSION_NOT_SET ||
! *pulProperty >= BDA_SPECTRAL_INVERSION_MAX) {
! return STATUS_INVALID_PARAMETER;
! }
! // just return straight away if we are passed Not Set
! if(*pulProperty == BDA_SPECTRAL_INVERSION_NOT_SET) {
! return STATUS_SUCCESS;
! }
! if((*pulProperty!=BDA_SPECTRAL_INVERSION_AUTOMATIC)&&
! (*pulProperty!=BDA_SPECTRAL_INVERSION_NORMAL)&&
! (*pulProperty!=BDA_SPECTRAL_INVERSION_INVERTED)) {
! _DbgPrintF(DEBUGLVL_TERSE, ("Unknown Spectral Inversion : Leave existing value"));
! } else {
! PKSDEVICE device=GETDEVICEFROMIRPPIN(pIrp);
! if(GETCONTEXT(device)->demodulator.inversion!=*pulProperty) {
! GETCONTEXT(device)->demodulator.inversion=*pulProperty;
! GETCONTEXT(device)->demodulator.ChangeOutstanding=TRUE;
! }
! }
return STATUS_SUCCESS;
}
--- 208,275 ----
NTSTATUS DemodSymbolRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(ULONG)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->dummy.symbolRate;
return STATUS_SUCCESS;
}
NTSTATUS DemodSymbolRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! DbgPrint("Nova-T: DemodSymbolRatePut (%d)\n", *pulProperty);
! // Validate here
GETCONTEXT(device)->dummy.symbolRate=(ULONG)*pulProperty;
+ // L64781_ParametersUpdated(device);
return STATUS_SUCCESS;
}
! NTSTATUS DemodGuardIntervalGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(GuardInterval)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.guard_interval;
return STATUS_SUCCESS;
}
! NTSTATUS DemodGuardIntervalPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! GuardInterval guard_interval=(GuardInterval)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! // Validate here
! 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;
}
! NTSTATUS DemodTransmissionModeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(TransmissionMode)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.transmit_mode;
return STATUS_SUCCESS;
}
! NTSTATUS DemodTransmissionModePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! TransmissionMode transmit_mode=(TransmissionMode)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! // Validate here
! 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;
}
! NTSTATUS DemodSpectralInversionGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! *pulProperty=(SpectralInversion)GETCONTEXT(GETDEVICEFROMIRP(pIrp))->demodulator.inversion;
return STATUS_SUCCESS;
}
! NTSTATUS DemodSpectralInversionPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty)
{
! SpectralInversion inversion=(SpectralInversion)*pulProperty;
! PKSDEVICE device=GETDEVICEFROMIRP(pIrp);
! // Validate here
! if(GETCONTEXT(device)->demodulator.inversion!=inversion) {
! GETCONTEXT(device)->demodulator.inversion=inversion;
! L64781_ParametersUpdated(device);
! }
! DbgPrint("Nova-T: DemodSpectralInversionPut (%d)\n", inversion);
return STATUS_SUCCESS;
}
***************
*** 400,404 ****
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("StartChanges()"));
status=BdaStartChanges(pIrp);
if(NT_SUCCESS(status)) {
--- 280,284 ----
NTSTATUS status;
! DbgPrint("Nova-T: StartChanges()\n");
status=BdaStartChanges(pIrp);
if(NT_SUCCESS(status)) {
***************
*** 411,415 ****
NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("CheckChanges()"));
status=BdaCheckChanges(pIrp);
if(NT_SUCCESS(status)) {
--- 291,295 ----
NTSTATUS status;
! DbgPrint("Nova-T: CheckChanges()\n");
status=BdaCheckChanges(pIrp);
if(NT_SUCCESS(status)) {
***************
*** 420,460 ****
NTSTATUS FilterCommitChanges(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OPTIONAL PVOID pvIgnored)
{
! NTSTATUS status;
! _DbgPrintF(DEBUGLVL_TERSE, ("CommitChanges()"));
!
! PKSDEVICE device=GETDEVICEFROMIRPFILT(pIrp);
!
! if(device != NULL && GETCONTEXT(device) != NULL) {
! // 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) {
! // make sure we don't try and access the i2c bus at the same
! // time as the monitoring thread
! ExAcquireFastMutex(&GETCONTEXT(device)->i2cMutex);
! // 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);
! }
! ExReleaseFastMutex(&GETCONTEXT(device)->i2cMutex);
! }
! }
return BdaCommitChanges(pIrp);
}
-
NTSTATUS FilterGetChangeState(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OUT PULONG pulChangeState)
{
NTSTATUS status;
BDA_CHANGE_STATE topologyChangeState;
- PKSDEVICE device=GETDEVICEFROMIRPFILT(pIrp);
! _DbgPrintF(DEBUGLVL_TERSE, ("GetChangeState()"));
status=BdaGetChangeState(pIrp,&topologyChangeState);
! if(NT_SUCCESS(status) && device != NULL && GETCONTEXT(device) != NULL) {
! if((topologyChangeState==BDA_CHANGES_PENDING)||
! (GETCONTEXT(device)->demodulator.ChangeOutstanding == TRUE)||
! (GETCONTEXT(device)->tuner.ChangeOutstanding == TRUE)) {
*pulChangeState=BDA_CHANGES_PENDING;
} else {
--- 300,317 ----
NTSTATUS FilterCommitChanges(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OPTIONAL PVOID pvIgnored)
{
! DbgPrint("Nova-T: CommitChanges()\n");
! // Validate alterations
! // Commit alterations
return BdaCommitChanges(pIrp);
}
NTSTATUS FilterGetChangeState(IN PIRP pIrp,IN PKSMETHOD pKSMethod,OUT PULONG pulChangeState)
{
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 {
***************
*** 467,486 ****
/*****************************************************************************\
* $Log$
! * Revision 1.7 2003/03/07 08:04:11 adcockj
! * Temp remove monitoring thread
! *
! * Revision 1.6 2003/03/06 17:48:42 adcockj
! * Added TPS change monitoring thread
! *
! * Revision 1.5 2003/03/04 08:02:19 adcockj
! * Interim Checkin
! *
! * 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
! * Make changes only on Commit method
! * Extra logging in Checked build
*
* Revision 1.2 2003/02/17 11:07:11 adcockj
--- 324,329 ----
/*****************************************************************************\
* $Log$
! * Revision 1.8 2003/04/26 09:40:50 adcockj
! * Reverted back to original code
*
* Revision 1.2 2003/02/17 11:07:11 adcockj
Index: automation.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/automation.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** automation.h 6 Mar 2003 17:48:42 -0000 1.3
--- automation.h 26 Apr 2003 09:40:50 -0000 1.4
***************
*** 10,37 ****
NTSTATUS TunerBandwidthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
NTSTATUS TunerBandwidthPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS TunerSignalStrengthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN LONG* pulProperty);
! NTSTATUS TunerSignalPresentGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BOOL* pulProperty);
// For Demodulator node
! NTSTATUS DemodSignalQualityGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN LONG* pulProperty);
! NTSTATUS DemodSignalLockedGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BOOL* pulProperty);
! NTSTATUS DemodModulationTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN ModulationType* pulProperty);
! NTSTATUS DemodModulationTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN ModulationType* pulProperty);
! NTSTATUS DemodInnerFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty);
! NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty);
! NTSTATUS DemodInnerFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty);
! NTSTATUS DemodInnerFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty);
! NTSTATUS DemodOuterFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty);
! NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN FECMethod* pulProperty);
! NTSTATUS DemodOuterFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty);
! NTSTATUS DemodOuterFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN BinaryConvolutionCodeRate* pulProperty);
NTSTATUS DemodSymbolRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
NTSTATUS DemodSymbolRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodGuardIntervalGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN GuardInterval* pulProperty);
! NTSTATUS DemodGuardIntervalPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN GuardInterval* pulProperty);
! NTSTATUS DemodTransmissionModeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN TransmissionMode* pulProperty);
! NTSTATUS DemodTransmissionModePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN TransmissionMode* pulProperty);
! NTSTATUS DemodSpectralInversionGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN SpectralInversion* pulProperty);
! NTSTATUS DemodSpectralInversionPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN SpectralInversion* pulProperty);
// For filter
--- 10,41 ----
NTSTATUS TunerBandwidthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
NTSTATUS TunerBandwidthPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS TunerSignalStrengthGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! #define TunerSignalStrengthPut NULL
! NTSTATUS TunerSignalPresentGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! #define TunerSignalPresentPut NULL
// For Demodulator node
! NTSTATUS DemodSignalQualityGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! #define DemodSignalQualityPut NULL
! NTSTATUS DemodSignalLockedGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! #define DemodSignalLockedPut NULL
! NTSTATUS DemodModulationTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodModulationTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodInnerFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodInnerFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodInnerFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodInnerFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodOuterFecTypeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodOuterFecTypePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodOuterFecRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodOuterFecRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
NTSTATUS DemodSymbolRateGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
NTSTATUS DemodSymbolRatePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodGuardIntervalGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodGuardIntervalPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodTransmissionModeGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodTransmissionModePut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodSpectralInversionGet(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
! NTSTATUS DemodSpectralInversionPut(IN PIRP pIrp,IN PKSPROPERTY pKSProperty,IN PULONG pulProperty);
// For filter
Index: debug.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/debug.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** debug.cpp 4 Mar 2003 08:02:20 -0000 1.3
--- debug.cpp 26 Apr 2003 09:40:50 -0000 1.4
***************
*** 24,30 ****
#include "debug.h"
- #pragma const_seg("PAGECONST")
- #pragma code_seg("PAGE")
-
const char *data="HNTbda";
--- 24,27 ----
***************
*** 93,98 ****
/*****************************************************************************\
* $Log$
! * Revision 1.3 2003/03/04 08:02:20 adcockj
! * Interim Checkin
*
* Revision 1.2 2003/02/17 11:07:12 adcockj
--- 90,95 ----
/*****************************************************************************\
* $Log$
! * Revision 1.4 2003/04/26 09:40:50 adcockj
! * Reverted back to original code
*
* Revision 1.2 2003/02/17 11:07:12 adcockj
Index: device.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** device.cpp 7 Apr 2003 07:00:47 -0000 1.10
--- device.cpp 26 Apr 2003 09:40:51 -0000 1.11
***************
*** 25,32 ****
#include "saa7146.h"
- #pragma const_seg()
- #pragma code_seg()
-
-
#if PAGE_SIZE!=SAA7146_PAGE_SIZE
#error This driver currently requires the architecture page size to be equal to the SAA7146 page size.
--- 25,28 ----
***************
*** 51,55 ****
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceAdd()"));
// Allocate context storage
device->Context=ExAllocatePoolWithTag(NonPagedPool,sizeof(DEVICE_CONTEXT),'ECIM');
--- 47,51 ----
NTSTATUS result;
! DbgPrint("Nova-T: DeviceAdd()\n");
// Allocate context storage
device->Context=ExAllocatePoolWithTag(NonPagedPool,sizeof(DEVICE_CONTEXT),'ECIM');
***************
*** 58,69 ****
if(result!=STATUS_SUCCESS) ExFreePool(device->Context);
KeInitializeDpc(&GETCONTEXT(device)->dpc,DeviceDPCRoutine,device);
- ExInitializeFastMutex(&GETCONTEXT(device)->i2cMutex);
- KeInitializeEvent(&GETCONTEXT(device)->monitorThreadKill, NotificationEvent, FALSE);
- GETCONTEXT(device)->monitorThread = NULL;
// Prepare tuner type and I2C addresses, assuming they're always the same on Nova-T boards
GETCONTEXT(device)->demod_address=I2C_L64781;
GETCONTEXT(device)->tuner_address=I2C_TUNER;
GETCONTEXT(device)->tuner.type=TUNER_TSA5060;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceAdd() complete"));
// Done
return result;
--- 54,62 ----
if(result!=STATUS_SUCCESS) ExFreePool(device->Context);
KeInitializeDpc(&GETCONTEXT(device)->dpc,DeviceDPCRoutine,device);
// Prepare tuner type and I2C addresses, assuming they're always the same on Nova-T boards
GETCONTEXT(device)->demod_address=I2C_L64781;
GETCONTEXT(device)->tuner_address=I2C_TUNER;
GETCONTEXT(device)->tuner.type=TUNER_TSA5060;
! DbgPrint("Nova-T: DeviceAdd() complete\n");
// Done
return result;
***************
*** 71,75 ****
VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceRemove()"));
}
--- 64,68 ----
VOID DeviceRemove(IN PKSDEVICE device,IN PIRP irp)
{
! DbgPrint("Nova-T: DeviceRemove()\n");
}
***************
*** 79,83 ****
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++) {
--- 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++) {
***************
*** 164,168 ****
return result;
}
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStart() complete"));
// Ready!
return STATUS_SUCCESS;
--- 157,161 ----
return result;
}
! DbgPrint("Nova-T: DeviceStart() complete\n");
// Ready!
return STATUS_SUCCESS;
***************
*** 173,179 ****
int i;
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStop()"));
! // confirm that the monitoring thread has stopped
! //StopMonitoringThread(device);
// Stop tuner, L64781 and SAA7146 from any current functions
L64781_Close(device);
--- 166,170 ----
int i;
! DbgPrint("Nova-T: DeviceStop()\n");
// Stop tuner, L64781 and SAA7146 from any current functions
L64781_Close(device);
***************
*** 189,193 ****
// Unmap memory
MmUnmapIoSpace(GETCONTEXT(device)->pci_memory,GETCONTEXT(device)->pci_size);
! _DbgPrintF(DEBUGLVL_TERSE, ("DeviceStop() complete"));
}
--- 180,184 ----
// Unmap memory
MmUnmapIoSpace(GETCONTEXT(device)->pci_memory,GETCONTEXT(device)->pci_size);
! DbgPrint("Nova-T: DeviceStop() complete\n");
}
***************
*** 198,202 ****
NTSTATUS result;
! _DbgPrintF(DEBUGLVL_TERSE, ("FilterCreate()"));
Filter->Context=KsFilterGetDevice(Filter);
if((Filter->Context==NULL)||(((PKSDEVICE)Filter->Context)->Context==NULL)) return STATUS_DEVICE_NOT_CONNECTED;
--- 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;
***************
*** 212,216 ****
NTSTATUS FilterClose(IN PKSFILTER Filter,IN PIRP Irp)
{
! _DbgPrintF(DEBUGLVL_TERSE, ("FilterClose()"));
BdaUninitFilter(Filter);
// Shut down anything still going on
--- 203,207 ----
NTSTATUS FilterClose(IN PKSFILTER Filter,IN PIRP Irp)
{
! DbgPrint("Nova-T: FilterClose()\n");
BdaUninitFilter(Filter);
// Shut down anything still going on
***************
*** 234,292 ****
return STATUS_SUCCESS;
}
- VOID MonitorThreadProc(IN PKSDEVICE device)
- {
- NTSTATUS result;
- while(TRUE) {
- LARGE_INTEGER TimeOut;
- // hopefully this is half a second and we'll try not to use up too much
- // processor while in here but we need to check if we need to update
- // the demod parameters based on a newly received TPS block
- // we could also check for errors and possibly AFC here as well
- TimeOut.QuadPart = -5000000;
- result=KeWaitForSingleObject(&GETCONTEXT(device)->monitorThreadKill, Executive, KernelMode, FALSE, &TimeOut);
- if(result==STATUS_TIMEOUT) {
- // make sure we don't try and access the i2c bus at the same
- // time as the user is trying to retune
- ExAcquireFastMutex(&GETCONTEXT(device)->i2cMutex);
- BOOL GotUpdate=L64781_CheckForTPSUpdate(device);
- ExReleaseFastMutex(&GETCONTEXT(device)->i2cMutex);
- if(GotUpdate==TRUE) {
- break;
- }
- }
- // if we exited the above for any other reason then
- // get out of this thread as either we have been signaled or
- // there is a problem
- else {
- break;
- }
- }
- PsTerminateSystemThread(STATUS_SUCCESS);
- }
- #pragma code_seg("page")
- void StartMonitoringThread(IN PKSDEVICE device)
- {
- NTSTATUS result;
- HANDLE hThread;
- KeClearEvent(&GETCONTEXT(device)->monitorThreadKill);
- result = PsCreateSystemThread(&hThread, 0L,
- NULL, NULL, NULL, (PKSTART_ROUTINE)MonitorThreadProc, device);
- if (!NT_SUCCESS(result)) {
- PrintString(device,"StartMonitoringThread: Failed to start thread",result);
- return;
- }
- ObReferenceObjectByHandle(hThread, THREAD_ALL_ACCESS, NULL, KernelMode, (PVOID*) &GETCONTEXT(device)->monitorThread, NULL);
- ZwClose(hThread);
- return;
- }
- void StopMonitoringThread(IN PKSDEVICE device)
- {
- if(GETCONTEXT(device)->monitorThread != NULL) {
- KeSetEvent(&GETCONTEXT(device)->monitorThreadKill, 0, FALSE);
- KeWaitForSingleObject(&GETCONTEXT(device)->monitorThread, Executive, KernelMode, FALSE, NULL);
- ObDereferenceObject(&GETCONTEXT(device)->monitorThread);
- GETCONTEXT(device)->monitorThread = NULL;
- }
- }
NTSTATUS OutputSetDeviceState(IN PKSPIN Pin,IN KSSTATE ToState,IN KSSTATE FromState)
{
--- 225,228 ----
***************
*** 304,312 ****
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)) {
- Tuner_SetFrequency((PKSDEVICE)Pin->Context);
- L64781_UpdateParameters((PKSDEVICE)Pin->Context);
NTSTATUS result=SAA7146_StartStream((PKSDEVICE)Pin->Context);
if(result!=STATUS_SUCCESS) {
--- 240,246 ----
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)) {
NTSTATUS result=SAA7146_StartStream((PKSDEVICE)Pin->Context);
if(result!=STATUS_SUCCESS) {
***************
*** 314,334 ****
return result;
}
! //StartMonitoringThread((PKSDEVICE)Pin->Context);
! }
!
! if((ToState==KSSTATE_RUN)&&(FromState==KSSTATE_PAUSE)) {
! //StopMonitoringThread((PKSDEVICE)Pin->Context);
! }
!
! if((ToState==KSSTATE_PAUSE)&&(FromState==KSSTATE_RUN)) {
! //StartMonitoringThread((PKSDEVICE)Pin->Context);
! //L64781_UpdateParameters((PKSDEVICE)Pin->Context);
}
!
! 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;
}
--- 248,259 ----
return result;
}
! // 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;
}
***************
*** 336,364 ****
/*****************************************************************************\
* $Log$
! * Revision 1.10 2003/04/07 07:00:47 adcockj
! * Synced to linux driver
! *
! * Revision 1.9 2003/03/17 21:21:53 adcockj
! * Fixes for new streaming code
! *
! * 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
! *
! * Revision 1.6 2003/03/06 17:48:42 adcockj
! * Added TPS change monitoring thread
! *
! * Revision 1.5 2003/03/04 08:02:20 adcockj
! * Interim Checkin
! *
! * 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
! * Make changes only on Commit method
! * Extra logging in Checked build
*
* Revision 1.2 2003/02/17 11:07:12 adcockj
--- 261,266 ----
/*****************************************************************************\
* $Log$
! * Revision 1.11 2003/04/26 09:40:51 adcockj
! * Reverted back to original code
*
* Revision 1.2 2003/02/17 11:07:12 adcockj
Index: device.h
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/device.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** device.h 26 Apr 2003 09:34:52 -0000 1.6
--- device.h 26 Apr 2003 09:40:51 -0000 1.7
***************
*** 25,35 ****
KSSTATE cur_state;
int switcher;
- unsigned long lastcopied;
int pv_error;
int lost_error;
int counter;
- KEVENT monitorThreadKill;
- PKTHREAD monitorThread;
- FAST_MUTEX i2cMutex;
// I2C bus data
unsigned char demod_address; // Address of L64781 demodulator
--- 25,31 ----
***************
*** 40,44 ****
DUMMY_DATA dummy;
} DEVICE_CONTEXT;
!
#define GETCONTEXT(x) ((DEVICE_CONTEXT*)(((PKSDEVICE)(x))->Context))
--- 36,40 ----
DUMMY_DATA dummy;
} DEVICE_CONTEXT;
!
#define GETCONTEXT(x) ((DEVICE_CONTEXT*)(((PKSDEVICE)(x))->Context))
***************
*** 67,72 ****
NTSTATUS OutputClose(IN PKSPIN Pin,IN PIRP Irp);
NTSTATUS OutputSetDeviceState(IN PKSPIN Pin,IN KSSTATE ToState,IN KSSTATE FromState);
-
- void StopMonitoringThread(IN PKSDEVICE device);
#endif // __DEVICE_H__
--- 63,66 ----
Index: driver.cpp
===================================================================
RCS file: /cvsroot/bdadev/NovaTDriver/driver.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** driver.cpp 7 Apr 2003 07:00:49 -0000 1.9
--- driver.cpp 26 Apr 2003 09:40:51 -0000 1.10
***************
*** 25,32 ****
#include "automation.h"
- #pragma const_seg("PAGECONST")
- #pragma code_seg("PAGE")
-
-
extern const KS_DATARANGE_BDA_ANTENNA AntennaIn;
--- 25,28 ----
***************
*** 69,77 ****
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_STRENGTH(
TunerSignalStrengthGet,
! NULL
),
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_PRESENT(
TunerSignalPresentGet,//CAntennaPin::GetSignalStatus,
! NULL
),
};
--- 65,73 ----
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_STRENGTH(
TunerSignalStrengthGet,
! TunerSignalStrengthPut
),
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_PRESENT(
TunerSignalPresentGet,//CAntennaPin::GetSignalStatus,
! TunerSignalPresentPut
),
};
***************
*** 107,115 ****
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_QUALITY(
DemodSignalQualityGet,
! NULL
),
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_LOCKED(
DemodSignalLockedGet,//CTransportPin::GetSignalStatus,
! NULL
),
};
--- 103,111 ----
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_QUALITY(
DemodSignalQualityGet,
! DemodSignalQualityPut
),
DEFINE_KSPROPERTY_ITEM_BDA_SIGNAL_LOCKED(
DemodSignalLockedGet,//CTransportPin::GetSignalStatus,
! DemodSignalLockedPut
),
};
***************
*** 180,206 ****
/* 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),
--- 176,179 ----
***************
*** 264,282 ****
NTSTATUS AntennaSetDeviceState(IN PKSPIN Pin,IN KSSTATE ToState,IN KSSTATE FromState)
{
{
! char *i,*j;
! if(ToState==KSSTATE_STOP) i="Stop";
! else if(ToState==KSSTATE_ACQUIRE) i="Acquire";
! else if(ToState==KSSTATE_PAUSE) i="Pause";
! else if(ToState==KSSTATE_RUN) i="Run";
! else i="Unknown";
! if(FromState==KSSTATE_STOP) j="Stop";
! else if(FromState==KSSTATE_ACQUIRE) j="Acquire";
! else if(FromState==KSSTATE_PAUSE) j="Pause";
! else if(FromState==KSSTATE_RUN) j="Run";
! else j="Unknown";
! _DbgPrintF(DEBUGLVL_TERSE, ("AntennaSetDeviceState called from %s to %s",j,i));
}
return STATUS_SUCCESS;
}
--- 237,257 ----
NTSTATUS AntennaSetDeviceState(IN PKSPIN Pin,IN KSSTATE ToState,IN KSSTATE FromState)
{
+ /*
{
! int i,j;
! if(ToState==KSSTATE_STOP) i=0;
! else if(ToState==KSSTATE_ACQUIRE) i=1;
! else if(ToState==KSSTATE_PAUSE) i=2;
! else if(ToState==KSSTATE_RUN) i=3;
! else i=15;
! if(FromState==KSSTATE_STOP) j=0;
! else if(FromState==KSSTATE_ACQUIRE) j=1;
! else if(FromState==KSSTATE_PAUSE) j=2;
! else if(FromState==KSSTATE_RUN) j=3;
! else j=15;
! PrintString((PKSDEVICE)Pin->Context,"AntennaSetDeviceState: Changed state!",(i<<4)|j);
}
+ */
return STATUS_SUCCESS;
}
***************
*** 304,309 ****
NTSTATUS OutputProcess(IN PKSPIN Pin)
{
! return SAA7134_OutputProcess(Pin);
! //return STATUS_SUCCESS;
}
--- 279,283 ----
NTSTATUS OutputProcess(IN PKSPIN Pin)
{
! return STATUS_SUCCESS;
}
***************
*** 314,318 ****
/* Reset */ NULL,
/* SetDataFormat */ NULL,
! /* SetDeviceState */ AntennaSetDeviceState, // This is meant to say antenna
/* Connect */ NULL,
/* Disconnect */ NULL,
--- 288,292 ----
/* Reset */ NULL,
/* SetDataFormat */ NULL,
! /* SetDeviceState */ OutputSetDeviceState, // This is meant to say output
/* Connect */ NULL,
/* Disconnect */ NULL,
***************
*** 325,329 ****
/* Reset */ NULL,
/* SetDataFormat */ NULL,
! /* SetDeviceState */ OutputSetDeviceState, // This is meant to say output
/* Connect */ NULL,
/* Disconnect */ NULL,
--- 299,303 ----
/* Reset */ NULL,
/* SetDataFormat */ NULL,
! /* SetDeviceState */ AntennaSetDeviceState, // This is meant to say antenna
/* Connect */ NULL,
/* Disconnect */ NULL,
***************
*** 415,420 ****
SIZEOF_ARRAY(StreamInterface),
StreamInterface,
! 0,
! NULL,
SIZEOF_ARRAY(OutputFormat),
OutputFormat,
--- 389,393 ----
SIZEOF_ARRAY(StreamInterface),
StreamInterface,
! 0,NULL,
SIZEOF_ARRAY(OutputFormat),
OutputFormat,
***************
*** 426,430 ****
},
KSPIN_FLAG_FIXED_FORMAT|/*KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT|KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING|*/
! KSPIN_FLAG_DO_NOT_INITIATE_PROCESSING|KSPIN_FLAG_CRITICAL_PROCESSING,
1,
1,
--- 399,403 ----
},
KSPIN_FLAG_FIXED_FORMAT|/*KSPIN_FLAG_DO_NOT_USE_STANDARD_TRANSPORT|KSPIN_FLAG_FRAMES_NOT_REQUIRED_FOR_PROCESSING|...
[truncated message content] |
