diff options
Diffstat (limited to 'src/af903x-drv.c')
| -rw-r--r-- | src/af903x-drv.c | 257 |
1 files changed, 112 insertions, 145 deletions
diff --git a/src/af903x-drv.c b/src/af903x-drv.c index 6ba44bf..ea1d7f2 100644 --- a/src/af903x-drv.c +++ b/src/af903x-drv.c @@ -1,4 +1,5 @@ #include "af903x.h" +#include "firmware.h" #define FW_VER 0x08060000 int dvb_usb_af903x_debug; @@ -18,7 +19,7 @@ static DWORD DRV_IrTblDownload(IN void * handle) PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; struct file *filp; unsigned char b_buf[512] ; - int i, fileSize; + int fileSize; mm_segment_t oldfs; deb_data("- Enter %s Function -\n",__FUNCTION__); @@ -28,32 +29,24 @@ static DWORD DRV_IrTblDownload(IN void * handle) filp=filp_open("/lib/firmware/af35irtbl.bin", O_RDWR,0644); if ( IS_ERR(filp) ) { - deb_data(" LoadIrTable : Can't open file\n");goto exit;} + printk(" LoadIrTable : Can't open file\n");goto exit;} if ( (filp->f_op) == NULL ) { - deb_data(" LoadIrTable : File Operation Method Error!!\n");goto exit;} - + printk(" LoadIrTable : File Operation Method Error!!\n");goto exit;} + deb_data("/lib/firmware/af35irtbl.bin - fw loaded"); filp->f_pos=0x00; fileSize = filp->f_op->read(filp,b_buf,sizeof(b_buf),&filp->f_pos); - for(i=0; i<fileSize; i++) - { - //deb_data("\n Data %d",i); // - //deb_data("0x%x",b_buf[i]);// - // dwError = Af901xWriteReg(ucDemod2WireAddr, 0, MERC_IR_TABLE_BASE_ADDR + i, b_buf[i]); - //if (dwError) goto exit; - } - dwError = Demodulator_loadIrTable((Demodulator*) &pdc->Demodulator, (Word)fileSize, b_buf); - if (dwError) {deb_data("Demodulator_loadIrTable fail"); goto exit;} + if (dwError) {printk("Demodulator_loadIrTable fail"); goto exit;} filp_close(filp, NULL); set_fs(oldfs); return (dwError); exit: - deb_data("LoadIrTable fail!\n"); - + printk("LoadIrTable fail!\n"); + return (dwError); } static DWORD DRV_GetEEPROMConfig2( @@ -88,13 +81,11 @@ static DWORD DRV_SetFreqBw( ) { DWORD dwError = Error_NO_ERROR; - PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; - Bool bLock = true; deb_data("- Enter %s Function -\n ",__FUNCTION__); - deb_data(" ucSlaveDemod = %d, Freq= %d, BW=%d\n", ucSlaveDemod, dwFreq, ucBw); + deb_data(" ucSlaveDemod = %d, Freq= %d, BW=%d\n", (int) ucSlaveDemod, (int) dwFreq, (int) ucBw); if (pdc->fc[ucSlaveDemod].bEnPID) { @@ -120,7 +111,7 @@ static DWORD DRV_SetFreqBw( ucBw = pdc->fc[ucSlaveDemod].ucDesiredBandWidth; } - deb_data(" Real Freq= %d, BW=%d\n", pdc->fc[ucSlaveDemod].ulDesiredFrequency, pdc->fc[ucSlaveDemod].ucDesiredBandWidth); + deb_data(" Real Freq= %d, BW=%d\n", (int) pdc->fc[ucSlaveDemod].ulDesiredFrequency, (int) pdc->fc[ucSlaveDemod].ucDesiredBandWidth); if(!PTI.bTunerInited){ @@ -132,12 +123,12 @@ static DWORD DRV_SetFreqBw( if (pdc->fc[ucSlaveDemod].ulDesiredFrequency!=0 && pdc->fc[ucSlaveDemod].ucDesiredBandWidth!=0) { - deb_data(" AcquireChannel : Real Freq= %d, BW=%d\n", pdc->fc[ucSlaveDemod].ulDesiredFrequency, pdc->fc[ucSlaveDemod].ucDesiredBandWidth); + deb_data(" AcquireChannel : Real Freq= %d, BW=%d\n",(int) pdc->fc[ucSlaveDemod].ulDesiredFrequency,(int) pdc->fc[ucSlaveDemod].ucDesiredBandWidth); dwError = Demodulator_acquireChannel ((Demodulator*) &pdc->Demodulator, ucSlaveDemod, pdc->fc[ucSlaveDemod].ucDesiredBandWidth, pdc->fc[ucSlaveDemod].ulDesiredFrequency); //PTI.bSettingFreq = false; if (dwError) { - deb_data(" Demod_acquireChannel fail! 0x%08x\n", dwError); + printk(" Demod_acquireChannel fail! 0x%08x\n", (int) dwError); goto exit; } else //when success acquireChannel, record currentFreq/currentBW. @@ -151,10 +142,10 @@ static DWORD DRV_SetFreqBw( PDC->fc[ucSlaveDemod].OvrFlwChk = 5; } - /*if (pdc->fc[ucSlaveDemod].ulDesiredFrequency!=0 && pdc->fc[ucSlaveDemod].ucDesiredBandWidth!=0) + if (pdc->fc[ucSlaveDemod].ulDesiredFrequency!=0 && pdc->fc[ucSlaveDemod].ucDesiredBandWidth!=0) { // patch for Demodulator_isLocked - //mdelay(700); + mdelay(700); dwError= Demodulator_isLocked((Demodulator*) &pdc->Demodulator, ucSlaveDemod, &bLock); if(dwError) @@ -168,7 +159,7 @@ static DWORD DRV_SetFreqBw( mdelay(500); } } - }*/ + } PTI.bTunerOK = true; @@ -179,20 +170,13 @@ exit: return(dwError); } -DWORD DRV_ResetPID( - IN void* handle, - IN BYTE chip -) -{ - deb_data("- Enter %s Function -\n ",__FUNCTION__); - - DWORD dwError = Error_NO_ERROR; +DWORD DRV_ResetPID( IN void* handle, IN BYTE chip){ + DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; - + deb_data("- Enter %s Function -\n ",__FUNCTION__); //Clear pidTable dwError = Demodulator_resetPid ((Demodulator*) &pdc->Demodulator, chip); - return(dwError); } @@ -203,12 +187,13 @@ DWORD DRV_AddPID( IN Byte index, IN Pid pid ) + { - deb_data("- Enter %s Function - , index:%d, pid:%x \n",__FUNCTION__, index, pid.value); DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; + deb_data("- Enter %s Function - , index:%d, pid:%x \n",__FUNCTION__, index, pid.value); dwError = Demodulator_addPidToFilter ((Demodulator*) &pdc->Demodulator, ucSlaveDemod,index, pid); @@ -223,11 +208,11 @@ DWORD DRV_RemovePID( IN Pid pid ) { - deb_data("- Enter %s Function - , index:%d, pid:%x \n",__FUNCTION__, index, pid.value); DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; + deb_data("- Enter %s Function - , index:%d, pid:%x \n",__FUNCTION__, index, pid.value); dwError = Demodulator_removePidAt ((Demodulator*) &pdc->Demodulator, ucSlaveDemod,index, pid); @@ -241,11 +226,11 @@ DWORD DRV_PIDOnOff( IN bool bOn ) { - deb_data("- Enter %s Function -onoff:%d\n ",__FUNCTION__, bOn); DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; + deb_data("- Enter %s Function -onoff:%d\n ",__FUNCTION__, bOn); if (bOn) dwError = Demodulator_controlPidFilter ((Demodulator*) &pdc->Demodulator, ucSlaveDemod, 1); @@ -310,7 +295,7 @@ static DWORD DRV_getSignalStrengthDbm( if(dwError) deb_data(" Demodulator_getSignalStrengthDbm is failed!\n"); else - deb_data(" The signal strengthDbm is %d \n", *strengthDbm); + deb_data(" The signal strengthDbm is %d \n", ( int ) *strengthDbm); return(dwError); } @@ -424,16 +409,16 @@ static DWORD DRV_Initialize( //use "Command_QUERYINFO" to get fw version error = Demodulator_getFirmwareVersion((Demodulator*) &pdc->Demodulator, Processor_OFDM, &cmdVersion); - if(error) deb_data("DRV_Initialize : Demodulator_getFirmwareVersion : error = 0x%08x\n", error); + if(error) deb_data("DRV_Initialize : Demodulator_getFirmwareVersion : error = 0x%08x\n",(int) error); if(cmdVersion != fileVersion) { - deb_data("Reboot: Outside Fw = 0x%X, Inside Fw = 0x%X", fileVersion, cmdVersion); + deb_data("Reboot: Outside Fw = 0x%X, Inside Fw = 0x%X", (int) fileVersion, (int) cmdVersion); error = Demodulator_reboot((Demodulator*) &pdc->Demodulator); pdc->bBootCode = true; if(error) { - deb_data("Demodulator_reboot : error = 0x%08x\n", error); + deb_data("Demodulator_reboot : error = 0x%08x\n",(int) error); return error; } else { @@ -442,7 +427,7 @@ static DWORD DRV_Initialize( } else { - deb_data(" Fw version is the same!\n"); + printk(" Fw version is the same!\n"); error = Error_NO_ERROR; } }//pdc->Demodulator.booted @@ -451,12 +436,12 @@ ReInit: //Patch for NIM fail or disappear, Maggie error = Demodulator_initialize ((Demodulator*) &pdc->Demodulator, pdc->Demodulator.chipNumber , 8000, pdc->StreamType, pdc->architecture); if (error) { - deb_data("Device initialize fail : 0x%08x\n", error); + printk("Device initialize fail : 0x%08x\n", (int) error); if( ((error&Error_FIRMWARE_STATUS) && (error&0x10)) && (pdc->Demodulator.chipNumber>1) ) { pdc->Demodulator.cmdDescription->sendCommand ((Demodulator*) &pdc->Demodulator, Command_FW_DOWNLOAD_END, 0, Processor_LINK, 0, NULL, 0, NULL); - deb_data(" Retry to download FW with Single TS\n"); + printk(" Retry to download FW with Single TS\n"); pdc->Demodulator.chipNumber = 1; pdc->bDualTs = false; error = Demodulator_writeRegister ((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, 0x417F, 0); @@ -464,13 +449,13 @@ ReInit: //Patch for NIM fail or disappear, Maggie } } else { - deb_data(" Device initialize Ok!!\n"); + printk(" Device initialize Ok!!\n"); } Demodulator_getFirmwareVersion ((Demodulator*) &pdc->Demodulator, Processor_OFDM, &cmdVersion); - deb_data(" FwVer OFDM = 0x%X, ", cmdVersion); + deb_data(" FwVer OFDM = 0x%X, ", (int) cmdVersion); Demodulator_getFirmwareVersion ((Demodulator*) &pdc->Demodulator, Processor_LINK, &cmdVersion); - deb_data("FwVer LINK = 0x%X\n", cmdVersion); + deb_data("FwVer LINK = 0x%X\n", (int) cmdVersion); return error; @@ -487,7 +472,7 @@ static DWORD DRV_InitDevInfo( PDC->fc[ucSlaveDemod].ucCurrentBandWidth = 0; PDC->fc[ucSlaveDemod].ulDesiredFrequency = 0; - PDC->fc[ucSlaveDemod].ucDesiredBandWidth = 6000; + PDC->fc[ucSlaveDemod].ucDesiredBandWidth = 8000; //For PID Filter Setting //PDC->fc[ucSlaveDemod].ulcPIDs = 0; @@ -520,8 +505,8 @@ static DWORD DRV_GetEEPROMConfig( dwError = Demodulator_readRegisters((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, EEPROM_IRMODE, 1, &btmp); if (dwError) return(dwError); PDC->bIrTblDownload = btmp ? true:false; - deb_data( "EEPROM_IRMODE = 0x%02X, ", btmp); - deb_data("bIrTblDownload %s\n", PDC->bIrTblDownload?"ON":"OFF"); + printk( "EEPROM_IRMODE = 0x%02X, ", btmp); + printk("bIrTblDownload %s\n", PDC->bIrTblDownload?"ON":"OFF"); PDC->bDualTs = false; PDC->architecture = Architecture_DCA; @@ -531,13 +516,13 @@ static DWORD DRV_GetEEPROMConfig( //bDualTs option dwError = Demodulator_readRegisters((Demodulator*) &pdc->Demodulator, 0, Processor_LINK,EEPROM_TSMODE, 1, &btmp); if (dwError) return(dwError); - deb_data("EEPROM_TSMODE = 0x%02X", btmp); + printk("EEPROM_TSMODE = 0x%02X", btmp); if (btmp == 0) - deb_data("TSMode = TS1 mode\n"); + printk("TSMode = TS1 mode\n"); else if (btmp == 1) { - deb_data("TSMode = DCA+PIP mode\n"); + printk("TSMode = DCA+PIP mode\n"); PDC->architecture = Architecture_DCA; PDC->Demodulator.chipNumber = 2; PDC->bDualTs = true; @@ -566,6 +551,7 @@ static DWORD DRV_GetEEPROMConfig( for(ucSlaveDemod; ucSlaveDemod < cnt; ucSlaveDemod++) { + deb_data("ucSlaveDemod: %d \n",cnt); dwError = DRV_GetEEPROMConfig2(pdc, ucSlaveDemod); if (dwError) return(dwError); dwError = DRV_InitDevInfo(pdc, ucSlaveDemod); @@ -590,8 +576,8 @@ static DWORD DRV_SetBusTuner( deb_data("busId = 0x%x, tunerId =0x%x\n", busId, tunerId); if ((pdc->UsbMode==0x0110) && (busId==Bus_USB)) { - busId=Bus_USB11; - } + busId=Bus_USB11; + } dwError = Demodulator_setBusTuner ((Demodulator*) &pdc->Demodulator, busId, tunerId); if (dwError) {deb_data("Demodulator_setBusTuner error\n");return dwError;} @@ -637,7 +623,7 @@ static DWORD DRV_TunerPowerCtrl( { dwError = Demodulator_writeRegisterBits((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, p_reg_top_gpioh7_o, reg_top_gpioh7_o_pos, reg_top_gpioh7_o_len, 1); - if(pdc->bTunerPowerOff == true) + if( pdc->bTunerPowerOff == (Bool) true) { dwError = Demodulator_initialize ((Demodulator*) &pdc->Demodulator, pdc->Demodulator.chipNumber , pdc->Demodulator.bandwidth[0], pdc->StreamType, pdc->architecture); pdc->bTunerPowerOff = false; @@ -647,9 +633,9 @@ static DWORD DRV_TunerPowerCtrl( { if(pdc->architecture == Architecture_PIP) { - if(pdc->fc[0].tunerinfo.bTunerInited == false && pdc->fc[1].tunerinfo.bTunerInited == false) + if(pdc->fc[0].tunerinfo.bTunerInited == (Bool) false && pdc->fc[1].tunerinfo.bTunerInited == (Bool) false) { - if(pdc->bTunerPowerOff == false) + if(pdc->bTunerPowerOff == (Bool) false) { dwError = Demodulator_finalize((Demodulator*) &pdc->Demodulator); pdc->bTunerPowerOff = true; @@ -660,7 +646,7 @@ static DWORD DRV_TunerPowerCtrl( } else { - if(pdc->bTunerPowerOff == false) + if(pdc->bTunerPowerOff == (Bool) false) { dwError = Demodulator_finalize((Demodulator*) &pdc->Demodulator); pdc->bTunerPowerOff = true; @@ -689,11 +675,11 @@ static DWORD DRV_ApCtrl ( //deb_data("enter DRV_ApCtrl: Demod[%d].GraphBuilt = %d", ucSlaveDemod, pdc->fc[ucSlaveDemod].GraphBuilt); dwError = DRV_TunerPowerCtrl(pdc, ucSlaveDemod, bOn); - if(dwError) { deb_data(" DRV_TunerPowerCtrl Fail: 0x%08x\n", dwError); return(dwError);} + if(dwError) { deb_data(" DRV_TunerPowerCtrl Fail: 0x%08x\n", (int) dwError); return(dwError);} dwError = Demodulator_controlPowerSaving((Demodulator*) &pdc->Demodulator, ucSlaveDemod, bOn); - if(dwError) { deb_data(" DRV_ApCtrl: Demodulator_controlPowerSaving error = 0x%08x\n", dwError); return(dwError);} + if(dwError) { deb_data(" DRV_ApCtrl: Demodulator_controlPowerSaving error = 0x%08x\n", (int) dwError); return(dwError);} return(dwError); } @@ -711,7 +697,7 @@ static DWORD DRV_TunerWakeup( //tuner power on dwError = Demodulator_writeRegisterBits((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, p_reg_top_gpioh7_o, reg_top_gpioh7_o_pos, reg_top_gpioh7_o_len, 1); - + if(dwError) deb_data(" DRV_TunerWakeup Fail: 0x%08x\n", (int) dwError); return(dwError); } @@ -740,10 +726,8 @@ static DWORD DRV_USBSetup( DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT) handle; - - deb_data("- Enter %s Function -\n",__FUNCTION__); - int i; + deb_data("- Enter %s Function -\n",__FUNCTION__); if (pdc->Demodulator.chipNumber == 2) { @@ -765,11 +749,11 @@ static DWORD DRV_NIMSuspend( ) { - deb_data("- Enter DRV_NIMSuspend : bSuspend = %s\n", bSuspend ? "ON":"OFF"); DWORD dwError = Error_NO_ERROR; PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT) handle; + deb_data("- Enter DRV_NIMSuspend : bSuspend = %s\n", bSuspend ? "ON":"OFF"); if(bSuspend) //sleep { @@ -789,11 +773,9 @@ static DWORD DRV_InitNIMSuspendRegs( void * handle ) { - deb_data("- Enter %s Function -\n",__FUNCTION__); - DWORD dwError = Error_NO_ERROR; - PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT) handle; + deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = Demodulator_writeRegisterBits((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, p_reg_top_gpioh5_en, reg_top_gpioh5_en_pos, reg_top_gpioh5_en_len, 1); dwError = Demodulator_writeRegisterBits((Demodulator*) &pdc->Demodulator, 0, Processor_LINK, p_reg_top_gpioh5_on, reg_top_gpioh5_on_pos, reg_top_gpioh5_on_len, 1); @@ -810,11 +792,10 @@ static DWORD DRV_NIMReset( void * handle ) { - deb_data("- Enter %s Function -\n",__FUNCTION__); DWORD dwError = Error_NO_ERROR; - PDEVICE_CONTEXT pdc = (PDEVICE_CONTEXT)handle; + deb_data("- Enter %s Function -\n",__FUNCTION__); //Set AF0350 GPIOH1 to 0 to reset AF0351 @@ -836,9 +817,9 @@ static DWORD DL_NIMReset( ) { - mutex_lock(&mymutex); DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); dwError = DRV_NIMReset(handle); @@ -851,11 +832,10 @@ static DWORD DL_USBSetup( void * handle ) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - dwError = DRV_USBSetup(handle); mutex_unlock(&mymutex); @@ -868,13 +848,9 @@ static DWORD DL_NIMSuspend( bool bSuspend ) { - - mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - + mutex_lock(&mymutex); dwError = DRV_NIMSuspend(handle, bSuspend); - mutex_unlock(&mymutex); return (dwError); @@ -884,10 +860,10 @@ static DWORD DL_InitNIMSuspendRegs( void * handle ) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; dwError = DRV_InitNIMSuspendRegs(handle); @@ -899,15 +875,10 @@ static DWORD DL_Initialize( void * handle ) { - - mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - + mutex_lock(&mymutex); dwError = DRV_Initialize(handle); - mutex_unlock(&mymutex); - return (dwError); } @@ -919,13 +890,11 @@ static DWORD DL_SetBusTuner( ) { - mutex_lock(&mymutex); DWORD dwError = Error_NO_ERROR; - - dwError = DRV_SetBusTuner(handle, busId, tunerId); - - mutex_unlock(&mymutex); + mutex_lock(&mymutex); + dwError = DRV_SetBusTuner(handle, busId, tunerId); + mutex_unlock(&mymutex); return (dwError); @@ -936,9 +905,9 @@ static DWORD DL_GetEEPROMConfig( ) { - mutex_lock(&mymutex); DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); dwError = DRV_GetEEPROMConfig(handle); @@ -952,9 +921,9 @@ static DWORD DL_TunerWakeup( ) { - mutex_lock(&mymutex); DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); dwError = DRV_TunerWakeup(handle); @@ -967,9 +936,9 @@ static DWORD DL_IrTblDownload( ) { - mutex_lock(&mymutex); DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); dwError = DRV_IrTblDownload(handle); @@ -983,17 +952,16 @@ DWORD DL_TunerPowerCtrl(u8 bPowerOn) { - mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; BYTE ucSlaveDemod=0; + mutex_lock(&mymutex); deb_data("enter DL_TunerPowerCtrl: bOn = %s\n", bPowerOn?"ON":"OFF"); for (ucSlaveDemod=0; ucSlaveDemod<PDC->Demodulator.chipNumber; ucSlaveDemod++) { dwError = DRV_TunerPowerCtrl(PDC, ucSlaveDemod, bPowerOn); - if(dwError) deb_data(" DRV_TunerPowerCtrl Fail: 0x%08x\n", dwError); + if(dwError) deb_data(" DRV_TunerPowerCtrl Fail: 0x%08x\n", (int) dwError); } mutex_unlock(&mymutex); @@ -1006,9 +974,11 @@ DWORD DL_ResetPID( IN BYTE chip ) { + DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); - DWORD dwError = DRV_ResetPID(PDC, chip); + dwError = DRV_ResetPID(PDC, chip); mutex_unlock(&mymutex); @@ -1021,9 +991,11 @@ DWORD DL_AddPID( IN Pid pid ) { + DWORD dwError = Error_NO_ERROR; + mutex_lock(&mymutex); - DWORD dwError = DRV_AddPID(PDC, ucSlaveDemod,index, pid); + dwError = DRV_AddPID(PDC, ucSlaveDemod,index, pid); mutex_unlock(&mymutex); @@ -1036,9 +1008,12 @@ DWORD DL_RemovePID( IN Pid pid ) { + DWORD dwError = Error_NO_ERROR; + + mutex_lock(&mymutex); - DWORD dwError = DRV_RemovePID(PDC, ucSlaveDemod,index, pid); + dwError = DRV_RemovePID(PDC, ucSlaveDemod,index, pid); mutex_unlock(&mymutex); @@ -1050,9 +1025,10 @@ DWORD DL_PIDOnOff( IN bool bOn ) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = DRV_PIDOnOff(PDC, ucSlaveDemod, bOn); + dwError = DRV_PIDOnOff(PDC, ucSlaveDemod, bOn); mutex_unlock(&mymutex); @@ -1064,12 +1040,10 @@ DWORD DL_ApCtrl ( Bool bOn ) { - + DWORD dwError = Error_NO_ERROR; + BYTE i=0; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - BYTE i=0; - deb_data("- Enter %s Function -",__FUNCTION__); deb_data(" chip = %d bOn = %s\n", ucSlaveDemod, bOn?"ON":"OFF"); @@ -1082,7 +1056,7 @@ DWORD DL_ApCtrl ( if (bOn) dwError = DRV_ApCtrl (PDC, i, bOn); else - if (PDC->bTunerPowerOff != true) dwError = DRV_ApCtrl (PDC, i, bOn); + if (PDC->bTunerPowerOff != (Bool) true) dwError = DRV_ApCtrl (PDC, i, bOn); if(!bOn) { @@ -1109,9 +1083,9 @@ DWORD DL_ApCtrl ( PDC->fc[ucSlaveDemod].GraphBuilt = 0; - if (PDC->bTunerPowerOff != true) dwError = DRV_ApCtrl (PDC, ucSlaveDemod, bOn); + if (PDC->bTunerPowerOff != (Bool) true) dwError = DRV_ApCtrl (PDC, ucSlaveDemod, bOn); - if (PDC->fc[0].GraphBuilt == 0 && PDC->fc[1].GraphBuilt == 0 && PDC->bTunerPowerOff == true) + if (PDC->fc[0].GraphBuilt == 0 && PDC->fc[1].GraphBuilt == 0 && PDC->bTunerPowerOff == (Bool) true) dwError = DL_NIMSuspend(PDC, true); } } @@ -1124,10 +1098,10 @@ DWORD DL_ApCtrl ( DWORD DL_Tuner_SetFreqBw(BYTE ucSlaveDemod, u32 dwFreq,u8 ucBw) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; deb_data("- Enter %s Function -\n",__FUNCTION__); if (PDC->fc[ucSlaveDemod].ulDesiredFrequency!=dwFreq || PDC->fc[ucSlaveDemod].ucDesiredBandWidth!=ucBw*1000) @@ -1140,11 +1114,10 @@ DWORD DL_Tuner_SetFreqBw(BYTE ucSlaveDemod, u32 dwFreq,u8 ucBw) DWORD DL_isLocked(BYTE ucSlaveDemod, Bool *bLock ) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = DRV_isLocked(PDC, ucSlaveDemod, bLock); @@ -1155,16 +1128,15 @@ DWORD DL_isLocked(BYTE ucSlaveDemod, Bool *bLock ) DWORD DL_getSignalStrength(BYTE ucSlaveDemod, BYTE* strength) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = DRV_getSignalStrength(PDC, ucSlaveDemod, strength); -// deb_data(" The signal strength is %d \n", *strength); + deb_data(" The signal strength is %d \n", *strength); mutex_unlock(&mymutex); return(dwError); @@ -1172,11 +1144,10 @@ DWORD DL_getSignalStrength(BYTE ucSlaveDemod, BYTE* strength) DWORD DL_getSignalStrengthDbm(BYTE ucSlaveDemod, Long* strengthDbm) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = DRV_getSignalStrengthDbm(PDC, ucSlaveDemod, strengthDbm); @@ -1187,11 +1158,10 @@ mutex_unlock(&mymutex); DWORD DL_getChannelStatistic(BYTE ucSlaveDemod, ChannelStatistic* channelStatistic) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = DRV_getChannelStatistic(PDC, ucSlaveDemod, channelStatistic); @@ -1203,11 +1173,10 @@ DWORD DL_getChannelStatistic(BYTE ucSlaveDemod, ChannelStatistic* channelStatist DWORD DL_getChannelModulation(BYTE ucSlaveDemod, ChannelModulation* channelModulation) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); dwError = DRV_getChannelModulation(PDC, ucSlaveDemod, channelModulation); @@ -1219,12 +1188,10 @@ DWORD DL_getChannelModulation(BYTE ucSlaveDemod, ChannelModulation* channelMo DWORD DL_getSNR(BYTE ucSlaveDemod, Constellation* constellation, BYTE* snr) { - - mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; ChannelModulation channelModulation; DWORD snr_value; + mutex_lock(&mymutex); deb_data("- Enter %s Function -\n",__FUNCTION__); @@ -1340,10 +1307,10 @@ DWORD DL_getSNR(BYTE ucSlaveDemod, Constellation* constellation, BYTE* snr) DWORD DL_ReSetInterval(void) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; mutex_unlock(&mymutex); @@ -1354,10 +1321,10 @@ DWORD DL_ReSetInterval(void) DWORD DL_Reboot(void) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; deb_data("- Enter %s Function -\n",__FUNCTION__); @@ -1370,11 +1337,10 @@ DWORD DL_Reboot(void) DWORD DL_CheckTunerInited(BYTE ucSlaveDemod, Bool *bOn ) { + DWORD dwError = Error_NO_ERROR; mutex_lock(&mymutex); - DWORD dwError = Error_NO_ERROR; - deb_data("- Enter %s Function -\n",__FUNCTION__); *bOn = PTI.bTunerInited; @@ -1386,43 +1352,43 @@ DWORD DL_CheckTunerInited(BYTE ucSlaveDemod, Bool *bOn ) DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) { + int errcount=0; DWORD error = Error_NO_ERROR; BYTE filterIdx=0; udevs=udev; PDC=PDCs; - int errcount=0; deb_data("- Enter %s Function -\n",__FUNCTION__); // define in Af903x.h #ifdef QuantaMID - printk(" === AfaDTV on Quanta ===\n"); + deb_data(" === AfaDTV on Quanta ===\n"); #endif #ifdef EEEPC - printk(" === AfaDTV on EEEPC ===\n"); + deb_data(" === AfaDTV on EEEPC ===\n"); #endif #ifdef DRIVER_RELEASE_VERSION printk(" DRIVER_RELEASE_VERSION : %s\n", DRIVER_RELEASE_VERSION); #else - printk(" DRIVER_RELEASE_VERSION : v0.0-0\n"); + deb_data(" DRIVER_RELEASE_VERSION : v0.0-0\n"); #endif #ifdef FW_RELEASE_VERSION - printk(" FW_RELEASE_VERSION : %s\n", FW_RELEASE_VERSION); + deb_data(" FW_RELEASE_VERSION : %s\n", FW_RELEASE_VERSION); #else - printk(" FW_RELEASE_VERSION : v0_0_0_0\n"); + deb_data(" FW_RELEASE_VERSION : v0_0_0_0\n"); #endif #ifdef Version_NUMBER - printk(" API_RELEASE_VERSION : %X.%X.%X\n", Version_NUMBER, Version_DATE, Version_BUILD); + deb_data(" API_RELEASE_VERSION : %X.%X.%X\n", Version_NUMBER, Version_DATE, Version_BUILD); #else - printk(" API_RELEASE_VERSION :000.00000000.0\n"); + deb_data(" API_RELEASE_VERSION :000.00000000.0\n"); #endif -// printk(" FW_RELEASE_VERSION : %s\n", FW_RELEASE_VERSION); -// printk(" API_RELEASE_VERSION : %X.%X.%X\n", Version_NUMBER, Version_DATE, Version_BUILD); +// deb_data(" FW_RELEASE_VERSION : %s\n", FW_RELEASE_VERSION); +// deb_data(" API_RELEASE_VERSION : %X.%X.%X\n", Version_NUMBER, Version_DATE, Version_BUILD); //************* Set Device init Info *************// @@ -1438,7 +1404,7 @@ DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) PDC->Demodulator.userData = (Handle)PDC; PDC->Demodulator.chipNumber = 1; PDC->architecture=Architecture_DCA; - PDC->Demodulator.frequency[0] = 666000; + PDC->Demodulator.frequency[0] = 546000; PDC->Demodulator.bandwidth[0] = 8000; PDC->bIrTblDownload = false; PDC->fc[0].tunerinfo.TunerId = 0; @@ -1476,13 +1442,13 @@ DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) if(bBoot) { //patch for eeepc - error = DL_SetBusTuner (PDC, Bus_USB, Tuner_Afatech_AF9007); + error = DL_SetBusTuner (PDC, Bus_USB, Tuner_FCI_FC2580); PDC->UsbCtrlTimeOut = 5; - error = DL_SetBusTuner (PDC, Bus_USB, Tuner_Afatech_AF9007); + error = DL_SetBusTuner (PDC, Bus_USB, Tuner_FCI_FC2580); if (error) { - deb_data("First DL_SetBusTuner fail : 0x%08x\n",error ); + deb_data("First DL_SetBusTuner fail : 0x%08x\n", (int) error ); errcount++; goto Exit; } @@ -1490,13 +1456,13 @@ DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) error =DL_GetEEPROMConfig(PDC); if (error) { - deb_data("DL_GetEEPROMConfig fail : 0x%08x\n", error); + deb_data("DL_GetEEPROMConfig fail : 0x%08x\n", (int) error); errcount++; goto Exit; } }//bBoot - error = DL_SetBusTuner(PDC, Bus_USB, PDC->fc[0].tunerinfo.TunerId); + error = DL_SetBusTuner(PDC, Bus_USB, Tuner_FCI_FC2580); if (error) { deb_data("DL_SetBusTuner fail!\n"); @@ -1525,13 +1491,14 @@ DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) error = DL_Initialize(PDC); if (error) { - deb_data("DL_Initialize fail! 0x%08x\n", error); + deb_data("DL_Initialize fail! 0x%08x\n", (int) error); errcount++; goto Exit; } if (PDC->bIrTblDownload) { + deb_data("Loading firmware."); error = DL_IrTblDownload(PDC); if (error) {deb_data("DL_IrTblDownload fail");errcount++;} } @@ -1566,7 +1533,7 @@ DWORD Device_init(struct usb_device *udev,PDEVICE_CONTEXT PDCs, Bool bBoot) } } */ - deb_data(" %s success!! \n",__FUNCTION__); + printk(" %s success!! \n",__FUNCTION__); Exit: #endif //AFA_USB_DEVICE |