From 4ed38158b4baae55739e1753c59073eccd4d17ec Mon Sep 17 00:00:00 2001 From: Octasic Inc Date: Fri, 7 Aug 2009 00:17:30 +0300 Subject: importing OCT612x-01.02.04 --- .../octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c') diff --git a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c index c162907..af0fda6 100644 --- a/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c +++ b/software/octdeviceapi/oct6100api/oct6100_api/oct6100_chip_open.c @@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License along with the OCT6100 GPL API; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -$Octasic_Release: OCT612xAPI-01.02.01 $ +$Octasic_Release: OCT612xAPI-01.02.04 $ -$Octasic_Revision: 364 $ +$Octasic_Revision: 367 $ \*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*/ @@ -1476,6 +1476,10 @@ UINT32 Oct6100ApiInitializeMiscellaneousVariables( pSharedInfo->DebugInfo.fPouchCounter = FALSE; pSharedInfo->DebugInfo.fIsIsrCalledField = FALSE; + pSharedInfo->MiscVars.ulNumActiveChannels = 0; + pSharedInfo->MiscVars.fActiveChannelsChange = TRUE; + + /* Initialize the image info parameters */ pSharedInfo->ImageInfo.fAdaptiveNoiseReduction = FALSE; pSharedInfo->ImageInfo.fSoutNoiseBleaching = FALSE; @@ -4769,6 +4773,8 @@ UINT32 Oct6100ApiWriteMiscellaneousRegisters( WriteParams.usWriteData = 0x05EA; else if ( f_pApiInstance->pSharedInfo->ImageInfo.usMaxNumberOfChannels > 513 ) WriteParams.usWriteData = 0x0672; + else if ( f_pApiInstance->pSharedInfo->ImageInfo.usMaxNumberOfChannels == 384 ) + WriteParams.usWriteData = 0x0A70; else /* if ( f_pApiInstance->pSharedInfo->ImageInfo.usMaxNumberOfChannels <= 513 ) */ WriteParams.usWriteData = 0x0750; mOCT6100_DRIVER_WRITE_API( WriteParams, ulResult ); -- cgit v1.2.3