Skip to content

L
linux
Commit 73f7065b authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Mauro Carvalho Chehab
Browse files
Options

[media] drx-j: get rid of the other typedefs at bsp_types.h 

Most of the work were done by those small scripts:

for i in *; do sed s,pDRXFrequency_t,"s32 *",g <$i >a && mv a $i; done
for i in *; do sed s,DRXFrequency_t,"s32",g <$i >a && mv a $i; done
for i in *; do sed s,pDRXSymbolrate_t,"u32 *",g <$i >a && mv a $i; done
for i in *; do sed s,DRXSymbolrate_t,"u32",g <$i >a && mv a $i; done
for i in *; do sed s,FALSE,false,g <$i >a && mv a $i; done
for i in *; do sed s,TRUE,true,g <$i >a && mv a $i; done
for i in *; do sed s,Bool_t,bool,g <$i >a && mv a $i; done
for i in *; do sed s,pbool,"bool *",g <$i >a && mv a $i; done

The only remaining things there are the return values.
Acked-by: default avatarDevin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 43a431e4
Show whitespace changes
Inline Side-by-side
Showing with 701 additions and 788 deletions
drivers/media/dvb-frontends/drx39xyj/bsp_tuner.h
View file @ 73f7065b
...@@ -94,19 +94,19 @@ TYPEDEFS ...@@ -94,19 +94,19 @@ TYPEDEFS
typedef struct { typedef struct {
char *name; /* Tuner brand & type name */ char *name; /* Tuner brand & type name */
DRXFrequency_t minFreqRF; /* Lowest RF input frequency, in kHz */ s32 minFreqRF; /* Lowest RF input frequency, in kHz */
DRXFrequency_t maxFreqRF; /* Highest RF input frequency, in kHz */ s32 maxFreqRF; /* Highest RF input frequency, in kHz */
u8 subMode; /* Index to sub-mode in use */ u8 subMode; /* Index to sub-mode in use */
pTUNERSubMode_t subModeDescriptions; /* Pointer to description of sub-modes */ pTUNERSubMode_t subModeDescriptions; /* Pointer to description of sub-modes */
u8 subModes; /* Number of available sub-modes */ u8 subModes; /* Number of available sub-modes */
/* The following fields will be either 0, NULL or FALSE and do not need /* The following fields will be either 0, NULL or false and do not need
initialisation */ initialisation */
void *selfCheck; /* gives proof of initialization */ void *selfCheck; /* gives proof of initialization */
Bool_t programmed; /* only valid if selfCheck is OK */ bool programmed; /* only valid if selfCheck is OK */
DRXFrequency_t RFfrequency; /* only valid if programmed */ s32 RFfrequency; /* only valid if programmed */
DRXFrequency_t IFfrequency; /* only valid if programmed */ s32 IFfrequency; /* only valid if programmed */
void *myUserData; /* pointer to associated demod instance */ void *myUserData; /* pointer to associated demod instance */
u16 myCapabilities; /* value for storing application flags */ u16 myCapabilities; /* value for storing application flags */
...@@ -123,14 +123,14 @@ TYPEDEFS ...@@ -123,14 +123,14 @@ TYPEDEFS
typedef DRXStatus_t(*TUNERSetFrequencyFunc_t) (pTUNERInstance_t tuner, typedef DRXStatus_t(*TUNERSetFrequencyFunc_t) (pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
DRXFrequency_t s32
frequency); frequency);
typedef DRXStatus_t(*TUNERGetFrequencyFunc_t) (pTUNERInstance_t tuner, typedef DRXStatus_t(*TUNERGetFrequencyFunc_t) (pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
pDRXFrequency_t s32 *
RFfrequency, RFfrequency,
pDRXFrequency_t s32 *
IFfrequency); IFfrequency);
typedef DRXStatus_t(*TUNERLockStatusFunc_t) (pTUNERInstance_t tuner, typedef DRXStatus_t(*TUNERLockStatusFunc_t) (pTUNERInstance_t tuner,
...@@ -182,12 +182,12 @@ Exported FUNCTIONS ...@@ -182,12 +182,12 @@ Exported FUNCTIONS
DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner, DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
DRXFrequency_t frequency); s32 frequency);
DRXStatus_t DRXBSP_TUNER_GetFrequency(pTUNERInstance_t tuner, DRXStatus_t DRXBSP_TUNER_GetFrequency(pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
pDRXFrequency_t RFfrequency, s32 *RFfrequency,
pDRXFrequency_t IFfrequency); s32 *IFfrequency);
DRXStatus_t DRXBSP_TUNER_LockStatus(pTUNERInstance_t tuner, DRXStatus_t DRXBSP_TUNER_LockStatus(pTUNERInstance_t tuner,
pTUNERLockStatus_t lockStat); pTUNERLockStatus_t lockStat);
......
drivers/media/dvb-frontends/drx39xyj/bsp_types.h
View file @ 73f7065b
...@@ -28,88 +28,15 @@ ...@@ -28,88 +28,15 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
/**
* \file $Id: bsp_types.h,v 1.5 2009/08/06 12:55:57 carlo Exp $
*
* \brief General type definitions for board support packages
*
* This file contains type definitions that are needed for almost any
* board support package.
* The definitions are host and project independent.
*
*/
#include <linux/kernel.h> #include <linux/kernel.h>
#ifndef __BSP_TYPES_H__ #ifndef __BSP_TYPES_H__
#define __BSP_TYPES_H__ #define __BSP_TYPES_H__
/*-------------------------------------------------------------------------
INCLUDES
-------------------------------------------------------------------------*/
#ifdef __cplusplus
extern "C" {
#endif
/*-------------------------------------------------------------------------
TYPEDEFS
-------------------------------------------------------------------------*/
/**
* \typedef s32 DRXFrequency_t
* \brief type definition of frequency
*/
typedef s32 DRXFrequency_t;
/**
* \typedef DRXFrequency_t *pDRXFrequency_t
* \brief type definition of a pointer to a frequency
*/
typedef DRXFrequency_t *pDRXFrequency_t;
/**
* \typedef u32 DRXSymbolrate_t
* \brief type definition of symbol rate
*/
typedef u32 DRXSymbolrate_t;
/**
* \typedef DRXSymbolrate_t *pDRXSymbolrate_t
* \brief type definition of a pointer to a symbol rate
*/
typedef DRXSymbolrate_t *pDRXSymbolrate_t;
/*-------------------------------------------------------------------------
DEFINES
-------------------------------------------------------------------------*/
/**
* \def NULL
* \brief Define NULL for target.
*/
#ifndef NULL
#define NULL (0)
#endif
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
ENUM ENUM
-------------------------------------------------------------------------*/ -------------------------------------------------------------------------*/
/*
* Boolean datatype. Only define if not already defined TRUE or FALSE.
*/
#if defined (TRUE) || defined (FALSE)
typedef int Bool_t;
#else
/**
* \enum Bool_t
* \brief Boolean type
*/
typedef enum {
FALSE = 0,
TRUE
} Bool_t;
#endif
typedef Bool_t *pBool_t;
/** /**
* \enum DRXStatus_t * \enum DRXStatus_t
* \brief Various return statusses * \brief Various return statusses
...@@ -125,18 +52,4 @@ ENUM ...@@ -125,18 +52,4 @@ ENUM
/**< unavailable functionality */ /**< unavailable functionality */
} DRXStatus_t, *pDRXStatus_t; } DRXStatus_t, *pDRXStatus_t;
/*-------------------------------------------------------------------------
STRUCTS
-------------------------------------------------------------------------*/
/**
Exported FUNCTIONS
-------------------------------------------------------------------------*/
/*-------------------------------------------------------------------------
THE END
-------------------------------------------------------------------------*/
#ifdef __cplusplus
}
#endif
#endif /* __BSP_TYPES_H__ */ #endif /* __BSP_TYPES_H__ */
drivers/media/dvb-frontends/drx39xyj/drx39xxj.c
View file @ 73f7065b
...@@ -242,7 +242,7 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe) ...@@ -242,7 +242,7 @@ static int drx39xxj_set_frontend(struct dvb_frontend *fe)
} }
/* Just for giggles, let's shut off the LNA again.... */ /* Just for giggles, let's shut off the LNA again.... */
uioData.uio = DRX_UIO1; uioData.uio = DRX_UIO1;
uioData.value = FALSE; uioData.value = false;
result = DRX_Ctrl(demod, DRX_CTRL_UIO_WRITE, &uioData); result = DRX_Ctrl(demod, DRX_CTRL_UIO_WRITE, &uioData);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
printk(KERN_ERR "Failed to disable LNA!\n"); printk(KERN_ERR "Failed to disable LNA!\n");
...@@ -271,7 +271,7 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) ...@@ -271,7 +271,7 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
{ {
struct drx39xxj_state *state = fe->demodulator_priv; struct drx39xxj_state *state = fe->demodulator_priv;
DRXDemodInstance_t *demod = state->demod; DRXDemodInstance_t *demod = state->demod;
Bool_t i2c_gate_state; bool i2c_gate_state;
DRXStatus_t result; DRXStatus_t result;
#ifdef DJH_DEBUG #ifdef DJH_DEBUG
...@@ -280,9 +280,9 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable) ...@@ -280,9 +280,9 @@ static int drx39xxj_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
#endif #endif
if (enable) if (enable)
i2c_gate_state = TRUE; i2c_gate_state = true;
else else
i2c_gate_state = FALSE; i2c_gate_state = false;
if (state->i2c_gate_open == enable) { if (state->i2c_gate_open == enable) {
/* We're already in the desired state */ /* We're already in the desired state */
...@@ -371,9 +371,9 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c) ...@@ -371,9 +371,9 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
sizeof(DRXCommonAttr_t)); sizeof(DRXCommonAttr_t));
demod->myCommonAttr->microcode = DRXJ_MC_MAIN; demod->myCommonAttr->microcode = DRXJ_MC_MAIN;
#if 0 #if 0
demod->myCommonAttr->verifyMicrocode = FALSE; demod->myCommonAttr->verifyMicrocode = false;
#endif #endif
demod->myCommonAttr->verifyMicrocode = TRUE; demod->myCommonAttr->verifyMicrocode = true;
demod->myCommonAttr->intermediateFreq = 5000; demod->myCommonAttr->intermediateFreq = 5000;
demod->myExtAttr = demodExtAttr; demod->myExtAttr = demodExtAttr;
...@@ -401,7 +401,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c) ...@@ -401,7 +401,7 @@ struct dvb_frontend *drx39xxj_attach(struct i2c_adapter *i2c)
} }
uioData.uio = DRX_UIO1; uioData.uio = DRX_UIO1;
uioData.value = FALSE; uioData.value = false;
result = DRX_Ctrl(demod, DRX_CTRL_UIO_WRITE, &uioData); result = DRX_Ctrl(demod, DRX_CTRL_UIO_WRITE, &uioData);
if (result != DRX_STS_OK) { if (result != DRX_STS_OK) {
printk(KERN_ERR "Failed to disable LNA!\n"); printk(KERN_ERR "Failed to disable LNA!\n");
......
drivers/media/dvb-frontends/drx39xyj/drx39xxj_dummy.c
View file @ 73f7065b
...@@ -25,7 +25,7 @@ DRXStatus_t DRXBSP_TUNER_Close(pTUNERInstance_t tuner) ...@@ -25,7 +25,7 @@ DRXStatus_t DRXBSP_TUNER_Close(pTUNERInstance_t tuner)
DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner, DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
DRXFrequency_t centerFrequency) s32 centerFrequency)
{ {
return DRX_STS_OK; return DRX_STS_OK;
} }
...@@ -33,8 +33,8 @@ DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner, ...@@ -33,8 +33,8 @@ DRXStatus_t DRXBSP_TUNER_SetFrequency(pTUNERInstance_t tuner,
DRXStatus_t DRXStatus_t
DRXBSP_TUNER_GetFrequency(pTUNERInstance_t tuner, DRXBSP_TUNER_GetFrequency(pTUNERInstance_t tuner,
TUNERMode_t mode, TUNERMode_t mode,
pDRXFrequency_t RFfrequency, s32 *RFfrequency,
pDRXFrequency_t IFfrequency) s32 *IFfrequency)
{ {
return DRX_STS_OK; return DRX_STS_OK;
} }
......
drivers/media/dvb-frontends/drx39xyj/drx_driver.c
View file @ 73f7065b
...@@ -149,7 +149,7 @@ FUNCTIONS ...@@ -149,7 +149,7 @@ FUNCTIONS
static DRXStatus_t static DRXStatus_t
ScanFunctionDefault(void *scanContext, ScanFunctionDefault(void *scanContext,
DRXScanCommand_t scanCommand, DRXScanCommand_t scanCommand,
pDRXChannel_t scanChannel, pBool_t getNextChannel); pDRXChannel_t scanChannel, bool * getNextChannel);
/** /**
* \brief Get pointer to scanning function. * \brief Get pointer to scanning function.
...@@ -212,9 +212,9 @@ void *GetScanContext(pDRXDemodInstance_t demod, void *scanContext) ...@@ -212,9 +212,9 @@ void *GetScanContext(pDRXDemodInstance_t demod, void *scanContext)
* In case DRX_NEVER_LOCK is returned the poll-wait will be aborted. * In case DRX_NEVER_LOCK is returned the poll-wait will be aborted.
* *
*/ */
static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked) static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, bool * isLocked)
{ {
Bool_t doneWaiting = FALSE; bool doneWaiting = false;
DRXLockStatus_t lockState = DRX_NOT_LOCKED; DRXLockStatus_t lockState = DRX_NOT_LOCKED;
DRXLockStatus_t desiredLockState = DRX_NOT_LOCKED; DRXLockStatus_t desiredLockState = DRX_NOT_LOCKED;
u32 timeoutValue = 0; u32 timeoutValue = 0;
...@@ -222,13 +222,13 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked) ...@@ -222,13 +222,13 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked)
u32 currentTime = 0; u32 currentTime = 0;
u32 timerValue = 0; u32 timerValue = 0;
*isLocked = FALSE; *isLocked = false;
timeoutValue = (u32) demod->myCommonAttr->scanDemodLockTimeout; timeoutValue = (u32) demod->myCommonAttr->scanDemodLockTimeout;
desiredLockState = demod->myCommonAttr->scanDesiredLock; desiredLockState = demod->myCommonAttr->scanDesiredLock;
startTimeLockStage = DRXBSP_HST_Clock(); startTimeLockStage = DRXBSP_HST_Clock();
/* Start polling loop, checking for lock & timeout */ /* Start polling loop, checking for lock & timeout */
while (doneWaiting == FALSE) { while (doneWaiting == false) {
if (DRX_Ctrl(demod, DRX_CTRL_LOCK_STATUS, &lockState) != if (DRX_Ctrl(demod, DRX_CTRL_LOCK_STATUS, &lockState) !=
DRX_STS_OK) { DRX_STS_OK) {
...@@ -238,15 +238,15 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked) ...@@ -238,15 +238,15 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked)
timerValue = currentTime - startTimeLockStage; timerValue = currentTime - startTimeLockStage;
if (lockState >= desiredLockState) { if (lockState >= desiredLockState) {
*isLocked = TRUE; *isLocked = true;
doneWaiting = TRUE; doneWaiting = true;
} /* if ( lockState >= desiredLockState ) .. */ } /* if ( lockState >= desiredLockState ) .. */
else if (lockState == DRX_NEVER_LOCK) { else if (lockState == DRX_NEVER_LOCK) {
doneWaiting = TRUE; doneWaiting = true;
} /* if ( lockState == DRX_NEVER_LOCK ) .. */ } /* if ( lockState == DRX_NEVER_LOCK ) .. */
else if (timerValue > timeoutValue) { else if (timerValue > timeoutValue) {
/* lockState == DRX_NOT_LOCKED and timeout */ /* lockState == DRX_NOT_LOCKED and timeout */
doneWaiting = TRUE; doneWaiting = true;
} else { } else {
if (DRXBSP_HST_Sleep(10) != DRX_STS_OK) { if (DRXBSP_HST_Sleep(10) != DRX_STS_OK) {
return DRX_STS_ERROR; return DRX_STS_ERROR;
...@@ -274,15 +274,15 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked) ...@@ -274,15 +274,15 @@ static DRXStatus_t ScanWaitForLock(pDRXDemodInstance_t demod, pBool_t isLocked)
* *
*/ */
static DRXStatus_t static DRXStatus_t
ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip) ScanPrepareNextScan(pDRXDemodInstance_t demod, s32 skip)
{ {
pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL); pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL);
u16 tableIndex = 0; u16 tableIndex = 0;
u16 frequencyPlanSize = 0; u16 frequencyPlanSize = 0;
pDRXFrequencyPlan_t frequencyPlan = (pDRXFrequencyPlan_t) (NULL); pDRXFrequencyPlan_t frequencyPlan = (pDRXFrequencyPlan_t) (NULL);
DRXFrequency_t nextFrequency = 0; s32 nextFrequency = 0;
DRXFrequency_t tunerMinFrequency = 0; s32 tunerMinFrequency = 0;
DRXFrequency_t tunerMaxFrequency = 0; s32 tunerMaxFrequency = 0;
commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr; commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr;
tableIndex = commonAttr->scanFreqPlanIndex; tableIndex = commonAttr->scanFreqPlanIndex;
...@@ -317,17 +317,17 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip) ...@@ -317,17 +317,17 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip)
commonAttr->scanParam->frequencyPlanSize; commonAttr->scanParam->frequencyPlanSize;
if (tableIndex >= frequencyPlanSize) { if (tableIndex >= frequencyPlanSize) {
/* reached end of frequency plan */ /* reached end of frequency plan */
commonAttr->scanReady = TRUE; commonAttr->scanReady = true;
} else { } else {
nextFrequency = frequencyPlan[tableIndex].first; nextFrequency = frequencyPlan[tableIndex].first;
} }
} }
if (nextFrequency > (tunerMaxFrequency)) { if (nextFrequency > (tunerMaxFrequency)) {
/* reached end of tuner range */ /* reached end of tuner range */
commonAttr->scanReady = TRUE; commonAttr->scanReady = true;
} }
} while ((nextFrequency < tunerMinFrequency) && } while ((nextFrequency < tunerMinFrequency) &&
(commonAttr->scanReady == FALSE)); (commonAttr->scanReady == false));
/* Store new values */ /* Store new values */
commonAttr->scanFreqPlanIndex = tableIndex; commonAttr->scanFreqPlanIndex = tableIndex;
...@@ -344,7 +344,7 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip) ...@@ -344,7 +344,7 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip)
* \param demod: Pointer to demodulator instance. * \param demod: Pointer to demodulator instance.
* \param scanCommand: Scanning command: INIT, NEXT or STOP. * \param scanCommand: Scanning command: INIT, NEXT or STOP.
* \param scanChannel: Channel to check: frequency and bandwidth, others AUTO * \param scanChannel: Channel to check: frequency and bandwidth, others AUTO
* \param getNextChannel: Return TRUE if next frequency is desired at next call * \param getNextChannel: Return true if next frequency is desired at next call
* *
* \return DRXStatus_t. * \return DRXStatus_t.
* \retval DRX_STS_OK: Channel found, DRX_CTRL_GET_CHANNEL can be used * \retval DRX_STS_OK: Channel found, DRX_CTRL_GET_CHANNEL can be used
...@@ -357,11 +357,11 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip) ...@@ -357,11 +357,11 @@ ScanPrepareNextScan(pDRXDemodInstance_t demod, DRXFrequency_t skip)
static DRXStatus_t static DRXStatus_t
ScanFunctionDefault(void *scanContext, ScanFunctionDefault(void *scanContext,
DRXScanCommand_t scanCommand, DRXScanCommand_t scanCommand,
pDRXChannel_t scanChannel, pBool_t getNextChannel) pDRXChannel_t scanChannel, bool * getNextChannel)
{ {
pDRXDemodInstance_t demod = NULL; pDRXDemodInstance_t demod = NULL;
DRXStatus_t status = DRX_STS_ERROR; DRXStatus_t status = DRX_STS_ERROR;
Bool_t isLocked = FALSE; bool isLocked = false;
demod = (pDRXDemodInstance_t) scanContext; demod = (pDRXDemodInstance_t) scanContext;
...@@ -370,7 +370,7 @@ ScanFunctionDefault(void *scanContext, ...@@ -370,7 +370,7 @@ ScanFunctionDefault(void *scanContext,
return DRX_STS_OK; return DRX_STS_OK;
} }
*getNextChannel = FALSE; *getNextChannel = false;
status = DRX_Ctrl(demod, DRX_CTRL_SET_CHANNEL, scanChannel); status = DRX_Ctrl(demod, DRX_CTRL_SET_CHANNEL, scanChannel);
if (status != DRX_STS_OK) { if (status != DRX_STS_OK) {
...@@ -383,9 +383,9 @@ ScanFunctionDefault(void *scanContext, ...@@ -383,9 +383,9 @@ ScanFunctionDefault(void *scanContext,
} }
/* done with this channel, move to next one */ /* done with this channel, move to next one */
*getNextChannel = TRUE; *getNextChannel = true;
if (isLocked == FALSE) { if (isLocked == false) {
/* no channel found */ /* no channel found */
return DRX_STS_BUSY; return DRX_STS_BUSY;
} }
...@@ -417,14 +417,14 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -417,14 +417,14 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
{ {
DRXStatus_t status = DRX_STS_ERROR; DRXStatus_t status = DRX_STS_ERROR;
pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL); pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL);
DRXFrequency_t maxTunerFreq = 0; s32 maxTunerFreq = 0;
DRXFrequency_t minTunerFreq = 0; s32 minTunerFreq = 0;
u16 nrChannelsInPlan = 0; u16 nrChannelsInPlan = 0;
u16 i = 0; u16 i = 0;
void *scanContext = NULL; void *scanContext = NULL;
commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr; commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr;
commonAttr->scanActive = TRUE; commonAttr->scanActive = true;
/* invalidate a previous SCAN_INIT */ /* invalidate a previous SCAN_INIT */
commonAttr->scanParam = (pDRXScanParam_t) (NULL); commonAttr->scanParam = (pDRXScanParam_t) (NULL);
...@@ -438,7 +438,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -438,7 +438,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
(scanParam->frequencyPlan == NULL) || (scanParam->frequencyPlan == NULL) ||
(scanParam->frequencyPlanSize == 0) (scanParam->frequencyPlanSize == 0)
) { ) {
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
...@@ -446,22 +446,22 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -446,22 +446,22 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
maxTunerFreq = commonAttr->tunerMaxFreqRF; maxTunerFreq = commonAttr->tunerMaxFreqRF;
minTunerFreq = commonAttr->tunerMinFreqRF; minTunerFreq = commonAttr->tunerMinFreqRF;
for (i = 0; i < (scanParam->frequencyPlanSize); i++) { for (i = 0; i < (scanParam->frequencyPlanSize); i++) {
DRXFrequency_t width = 0; s32 width = 0;
DRXFrequency_t step = scanParam->frequencyPlan[i].step; s32 step = scanParam->frequencyPlan[i].step;
DRXFrequency_t firstFreq = scanParam->frequencyPlan[i].first; s32 firstFreq = scanParam->frequencyPlan[i].first;
DRXFrequency_t lastFreq = scanParam->frequencyPlan[i].last; s32 lastFreq = scanParam->frequencyPlan[i].last;
DRXFrequency_t minFreq = 0; s32 minFreq = 0;
DRXFrequency_t maxFreq = 0; s32 maxFreq = 0;
if (step <= 0) { if (step <= 0) {
/* Step must be positive and non-zero */ /* Step must be positive and non-zero */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
if (firstFreq > lastFreq) { if (firstFreq > lastFreq) {
/* First center frequency is higher than last center frequency */ /* First center frequency is higher than last center frequency */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
...@@ -470,7 +470,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -470,7 +470,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
if ((width % step) != 0) { if ((width % step) != 0) {
/* Difference between last and first center frequency is not /* Difference between last and first center frequency is not
an integer number of steps */ an integer number of steps */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
...@@ -480,7 +480,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -480,7 +480,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
if (firstFreq >= minTunerFreq) { if (firstFreq >= minTunerFreq) {
minFreq = firstFreq; minFreq = firstFreq;
} else { } else {
DRXFrequency_t n = 0; s32 n = 0;
n = (minTunerFreq - firstFreq) / step; n = (minTunerFreq - firstFreq) / step;
if (((minTunerFreq - if (((minTunerFreq -
...@@ -493,7 +493,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -493,7 +493,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
if (lastFreq <= maxTunerFreq) { if (lastFreq <= maxTunerFreq) {
maxFreq = lastFreq; maxFreq = lastFreq;
} else { } else {
DRXFrequency_t n = 0; s32 n = 0;
n = (lastFreq - maxTunerFreq) / step; n = (lastFreq - maxTunerFreq) / step;
if (((lastFreq - if (((lastFreq -
...@@ -522,12 +522,12 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -522,12 +522,12 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
if (nrChannelsInPlan == 0) { if (nrChannelsInPlan == 0) {
/* Tuner range and frequency plan ranges do not overlap */ /* Tuner range and frequency plan ranges do not overlap */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_ERROR; return DRX_STS_ERROR;
} }
/* Store parameters */ /* Store parameters */
commonAttr->scanReady = FALSE; commonAttr->scanReady = false;
commonAttr->scanMaxChannels = nrChannelsInPlan; commonAttr->scanMaxChannels = nrChannelsInPlan;
commonAttr->scanChannelsScanned = 0; commonAttr->scanChannelsScanned = 0;
commonAttr->scanParam = scanParam; /* SCAN_NEXT is now allowed */ commonAttr->scanParam = scanParam; /* SCAN_NEXT is now allowed */
...@@ -537,7 +537,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam) ...@@ -537,7 +537,7 @@ CtrlScanInit(pDRXDemodInstance_t demod, pDRXScanParam_t scanParam)
status = (*(GetScanFunction(demod))) status = (*(GetScanFunction(demod)))
(scanContext, DRX_SCAN_COMMAND_INIT, NULL, NULL); (scanContext, DRX_SCAN_COMMAND_INIT, NULL, NULL);
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_OK; return DRX_STS_OK;
} }
...@@ -559,12 +559,12 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod) ...@@ -559,12 +559,12 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod)
void *scanContext = NULL; void *scanContext = NULL;
commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr; commonAttr = (pDRXCommonAttr_t) demod->myCommonAttr;
commonAttr->scanActive = TRUE; commonAttr->scanActive = true;
if ((commonAttr->scanParam == NULL) || if ((commonAttr->scanParam == NULL) ||
(commonAttr->scanMaxChannels == 0)) { (commonAttr->scanMaxChannels == 0)) {
/* Scan was not running, just return OK */ /* Scan was not running, just return OK */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_OK; return DRX_STS_OK;
} }
...@@ -577,7 +577,7 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod) ...@@ -577,7 +577,7 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod)
/* All done, invalidate scan-init */ /* All done, invalidate scan-init */
commonAttr->scanParam = NULL; commonAttr->scanParam = NULL;
commonAttr->scanMaxChannels = 0; commonAttr->scanMaxChannels = 0;
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return status; return status;
} }
...@@ -605,7 +605,7 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod) ...@@ -605,7 +605,7 @@ static DRXStatus_t CtrlScanStop(pDRXDemodInstance_t demod)
static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress) static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
{ {
pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL); pDRXCommonAttr_t commonAttr = (pDRXCommonAttr_t) (NULL);
pBool_t scanReady = (pBool_t) (NULL); bool * scanReady = (bool *) (NULL);
u16 maxProgress = DRX_SCAN_MAX_PROGRESS; u16 maxProgress = DRX_SCAN_MAX_PROGRESS;
u32 numTries = 0; u32 numTries = 0;
u32 i = 0; u32 i = 0;
...@@ -614,16 +614,16 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress) ...@@ -614,16 +614,16 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
/* Check scan parameters */ /* Check scan parameters */
if (scanProgress == NULL) { if (scanProgress == NULL) {
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
*scanProgress = 0; *scanProgress = 0;
commonAttr->scanActive = TRUE; commonAttr->scanActive = true;
if ((commonAttr->scanParam == NULL) || if ((commonAttr->scanParam == NULL) ||
(commonAttr->scanMaxChannels == 0)) { (commonAttr->scanMaxChannels == 0)) {
/* CtrlScanInit() was not called succesfully before CtrlScanNext() */ /* CtrlScanInit() was not called succesfully before CtrlScanNext() */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_ERROR; return DRX_STS_ERROR;
} }
...@@ -635,11 +635,11 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress) ...@@ -635,11 +635,11 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
numTries = commonAttr->scanParam->numTries; numTries = commonAttr->scanParam->numTries;
scanReady = &(commonAttr->scanReady); scanReady = &(commonAttr->scanReady);
for (i = 0; ((i < numTries) && ((*scanReady) == FALSE)); i++) { for (i = 0; ((i < numTries) && ((*scanReady) == false)); i++) {
DRXChannel_t scanChannel = { 0 }; DRXChannel_t scanChannel = { 0 };
DRXStatus_t status = DRX_STS_ERROR; DRXStatus_t status = DRX_STS_ERROR;
pDRXFrequencyPlan_t freqPlan = (pDRXFrequencyPlan_t) (NULL); pDRXFrequencyPlan_t freqPlan = (pDRXFrequencyPlan_t) (NULL);
Bool_t nextChannel = FALSE; bool nextChannel = false;
void *scanContext = NULL; void *scanContext = NULL;
/* Next channel to scan */ /* Next channel to scan */
...@@ -671,9 +671,9 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress) ...@@ -671,9 +671,9 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
&nextChannel); &nextChannel);
/* Proceed to next channel if requested */ /* Proceed to next channel if requested */
if (nextChannel == TRUE) { if (nextChannel == true) {
DRXStatus_t nextStatus = DRX_STS_ERROR; DRXStatus_t nextStatus = DRX_STS_ERROR;
DRXFrequency_t skip = 0; s32 skip = 0;
if (status == DRX_STS_OK) { if (status == DRX_STS_OK) {
/* a channel was found, so skip some frequency steps */ /* a channel was found, so skip some frequency steps */
...@@ -688,25 +688,25 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress) ...@@ -688,25 +688,25 @@ static DRXStatus_t CtrlScanNext(pDRXDemodInstance_t demod, u16 *scanProgress)
(commonAttr->scanMaxChannels)); (commonAttr->scanMaxChannels));
if (nextStatus != DRX_STS_OK) { if (nextStatus != DRX_STS_OK) {
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return (nextStatus); return (nextStatus);
} }
} }
if (status != DRX_STS_BUSY) { if (status != DRX_STS_BUSY) {
/* channel found or error */ /* channel found or error */
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return status; return status;
} }
} /* for ( i = 0; i < ( ... numTries); i++) */ } /* for ( i = 0; i < ( ... numTries); i++) */
if ((*scanReady) == TRUE) { if ((*scanReady) == true) {
/* End of scan reached: call stop-scan, ignore any error */ /* End of scan reached: call stop-scan, ignore any error */
CtrlScanStop(demod); CtrlScanStop(demod);
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return (DRX_STS_READY); return (DRX_STS_READY);
} }
commonAttr->scanActive = FALSE; commonAttr->scanActive = false;
return DRX_STS_BUSY; return DRX_STS_BUSY;
} }
...@@ -735,8 +735,8 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel) ...@@ -735,8 +735,8 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel)
DRXStandard_t standard = DRX_STANDARD_UNKNOWN; DRXStandard_t standard = DRX_STANDARD_UNKNOWN;
TUNERMode_t tunerMode = 0; TUNERMode_t tunerMode = 0;
DRXStatus_t status = DRX_STS_ERROR; DRXStatus_t status = DRX_STS_ERROR;
DRXFrequency_t ifFrequency = 0; s32 ifFrequency = 0;
Bool_t tunerSlowMode = FALSE; bool tunerSlowMode = false;
/* can't tune without a tuner */ /* can't tune without a tuner */
if (demod->myTuner == NULL) { if (demod->myTuner == NULL) {
...@@ -782,7 +782,7 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel) ...@@ -782,7 +782,7 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel)
} }
if (commonAttr->tunerPortNr == 1) { if (commonAttr->tunerPortNr == 1) {
Bool_t bridgeClosed = TRUE; bool bridgeClosed = true;
DRXStatus_t statusBridge = DRX_STS_ERROR; DRXStatus_t statusBridge = DRX_STS_ERROR;
statusBridge = statusBridge =
...@@ -797,7 +797,7 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel) ...@@ -797,7 +797,7 @@ CtrlProgramTuner(pDRXDemodInstance_t demod, pDRXChannel_t channel)
/* attempt restoring bridge before checking status of SetFrequency */ /* attempt restoring bridge before checking status of SetFrequency */
if (commonAttr->tunerPortNr == 1) { if (commonAttr->tunerPortNr == 1) {
Bool_t bridgeClosed = FALSE; bool bridgeClosed = false;
DRXStatus_t statusBridge = DRX_STS_ERROR; DRXStatus_t statusBridge = DRX_STS_ERROR;
statusBridge = statusBridge =
...@@ -1315,14 +1315,14 @@ DRXStatus_t DRX_Open(pDRXDemodInstance_t demod) ...@@ -1315,14 +1315,14 @@ DRXStatus_t DRX_Open(pDRXDemodInstance_t demod)
(demod->myCommonAttr == NULL) || (demod->myCommonAttr == NULL) ||
(demod->myExtAttr == NULL) || (demod->myExtAttr == NULL) ||
(demod->myI2CDevAddr == NULL) || (demod->myI2CDevAddr == NULL) ||
(demod->myCommonAttr->isOpened == TRUE)) { (demod->myCommonAttr->isOpened == true)) {
return (DRX_STS_INVALID_ARG); return (DRX_STS_INVALID_ARG);
} }
status = (*(demod->myDemodFunct->openFunc)) (demod); status = (*(demod->myDemodFunct->openFunc)) (demod);
if (status == DRX_STS_OK) { if (status == DRX_STS_OK) {
demod->myCommonAttr->isOpened = TRUE; demod->myCommonAttr->isOpened = true;
} }
return status; return status;
...@@ -1352,13 +1352,13 @@ DRXStatus_t DRX_Close(pDRXDemodInstance_t demod) ...@@ -1352,13 +1352,13 @@ DRXStatus_t DRX_Close(pDRXDemodInstance_t demod)
(demod->myCommonAttr == NULL) || (demod->myCommonAttr == NULL) ||
(demod->myExtAttr == NULL) || (demod->myExtAttr == NULL) ||
(demod->myI2CDevAddr == NULL) || (demod->myI2CDevAddr == NULL) ||
(demod->myCommonAttr->isOpened == FALSE)) { (demod->myCommonAttr->isOpened == false)) {
return DRX_STS_INVALID_ARG; return DRX_STS_INVALID_ARG;
} }
status = (*(demod->myDemodFunct->closeFunc)) (demod); status = (*(demod->myDemodFunct->closeFunc)) (demod);
DRX_SET_ISOPENED(demod, FALSE); DRX_SET_ISOPENED(demod, false);
return status; return status;
} }
...@@ -1396,7 +1396,7 @@ DRX_Ctrl(pDRXDemodInstance_t demod, DRXCtrlIndex_t ctrl, void *ctrlData) ...@@ -1396,7 +1396,7 @@ DRX_Ctrl(pDRXDemodInstance_t demod, DRXCtrlIndex_t ctrl, void *ctrlData)
return (DRX_STS_INVALID_ARG); return (DRX_STS_INVALID_ARG);
} }
if (((demod->myCommonAttr->isOpened == FALSE) && if (((demod->myCommonAttr->isOpened == false) &&
(ctrl != DRX_CTRL_PROBE_DEVICE) && (ctrl != DRX_CTRL_VERSION)) (ctrl != DRX_CTRL_PROBE_DEVICE) && (ctrl != DRX_CTRL_VERSION))
) { ) {
return (DRX_STS_INVALID_ARG); return (DRX_STS_INVALID_ARG);
......
drivers/media/dvb-frontends/drx39xyj/drx_driver.h
View file @ 73f7065b
...@@ -274,17 +274,17 @@ MACROS ...@@ -274,17 +274,17 @@ MACROS
* \brief Macro to sign extend signed 9 bit value to signed 16 bit value * \brief Macro to sign extend signed 9 bit value to signed 16 bit value
*/ */
#define DRX_S24TODRXFREQ(x) ( ( ( (u32) x ) & 0x00800000UL ) ? \ #define DRX_S24TODRXFREQ(x) ( ( ( (u32) x ) & 0x00800000UL ) ? \
( (DRXFrequency_t) \ ( (s32) \
( ( (u32) x ) | 0xFF000000 ) ) : \ ( ( (u32) x ) | 0xFF000000 ) ) : \
( (DRXFrequency_t) x ) ) ( (s32) x ) )
/** /**
* \brief Macro to convert 16 bit register value to a DRXFrequency_t * \brief Macro to convert 16 bit register value to a s32
*/ */
#define DRX_U16TODRXFREQ(x) ( ( x & 0x8000 ) ? \ #define DRX_U16TODRXFREQ(x) ( ( x & 0x8000 ) ? \
( (DRXFrequency_t) \ ( (s32) \
( ( (u32) x ) | 0xFFFF0000 ) ) : \ ( ( (u32) x ) | 0xFFFF0000 ) ) : \
( (DRXFrequency_t) x ) ) ( (s32) x ) )
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
ENUM ENUM
...@@ -883,7 +883,7 @@ STRUCTS ...@@ -883,7 +883,7 @@ STRUCTS
* *
*/ */
typedef struct { typedef struct {
DRXFrequency_t frequency; s32 frequency;
/**< frequency in kHz */ /**< frequency in kHz */
DRXBandwidth_t bandwidth; DRXBandwidth_t bandwidth;
/**< bandwidth */ /**< bandwidth */
...@@ -898,7 +898,7 @@ STRUCTS ...@@ -898,7 +898,7 @@ STRUCTS
DRXFftmode_t fftmode; /**< fftmode */ DRXFftmode_t fftmode; /**< fftmode */
DRXClassification_t classification; DRXClassification_t classification;
/**< classification */ /**< classification */
DRXSymbolrate_t symbolrate; u32 symbolrate;
/**< symbolrate in symbols/sec */ /**< symbolrate in symbols/sec */
DRXInterleaveModes_t interleavemode; DRXInterleaveModes_t interleavemode;
/**< interleaveMode QAM */ /**< interleaveMode QAM */
...@@ -967,11 +967,11 @@ STRUCTS ...@@ -967,11 +967,11 @@ STRUCTS
* Used by DRX_CTRL_SCAN_INIT. * Used by DRX_CTRL_SCAN_INIT.
*/ */
typedef struct { typedef struct {
DRXFrequency_t first; s32 first;
/**< First centre frequency in this band */ /**< First centre frequency in this band */
DRXFrequency_t last; s32 last;
/**< Last centre frequency in this band */ /**< Last centre frequency in this band */
DRXFrequency_t step; s32 step;
/**< Stepping frequency in this band */ /**< Stepping frequency in this band */
DRXBandwidth_t bandwidth; DRXBandwidth_t bandwidth;
/**< Bandwidth within this frequency band */ /**< Bandwidth within this frequency band */
...@@ -1037,7 +1037,7 @@ STRUCTS ...@@ -1037,7 +1037,7 @@ STRUCTS
/**< Frequency plan (array)*/ /**< Frequency plan (array)*/
u16 frequencyPlanSize; /**< Number of bands */ u16 frequencyPlanSize; /**< Number of bands */
u32 numTries; /**< Max channels tried */ u32 numTries; /**< Max channels tried */
DRXFrequency_t skip; /**< Minimum frequency step to take s32 skip; /**< Minimum frequency step to take
after a channel is found */ after a channel is found */
void *extParams; /**< Standard specific params */ void *extParams; /**< Standard specific params */
} DRXScanParam_t, *pDRXScanParam_t; } DRXScanParam_t, *pDRXScanParam_t;
...@@ -1062,7 +1062,7 @@ STRUCTS ...@@ -1062,7 +1062,7 @@ STRUCTS
typedef DRXStatus_t(*DRXScanFunc_t) (void *scanContext, typedef DRXStatus_t(*DRXScanFunc_t) (void *scanContext,
DRXScanCommand_t scanCommand, DRXScanCommand_t scanCommand,
pDRXChannel_t scanChannel, pDRXChannel_t scanChannel,
pBool_t getNextChannel); bool * getNextChannel);
/*========================================*/ /*========================================*/
...@@ -1208,8 +1208,8 @@ STRUCTS ...@@ -1208,8 +1208,8 @@ STRUCTS
typedef struct { typedef struct {
DRXUIO_t uio; DRXUIO_t uio;
/**< UIO identifier */ /**< UIO identifier */
Bool_t value; bool value;
/**< UIO value (TRUE=1, FALSE=0) */ /**< UIO value (true=1, false=0) */
} DRXUIOData_t, *pDRXUIOData_t; } DRXUIOData_t, *pDRXUIOData_t;
/*========================================*/ /*========================================*/
...@@ -1220,10 +1220,10 @@ STRUCTS ...@@ -1220,10 +1220,10 @@ STRUCTS
* Used by DRX_CTRL_SET_OOB. * Used by DRX_CTRL_SET_OOB.
*/ */
typedef struct { typedef struct {
DRXFrequency_t frequency; /**< Frequency in kHz */ s32 frequency; /**< Frequency in kHz */
DRXOOBDownstreamStandard_t standard; DRXOOBDownstreamStandard_t standard;
/**< OOB standard */ /**< OOB standard */
Bool_t spectrumInverted; /**< If TRUE, then spectrum bool spectrumInverted; /**< If true, then spectrum
is inverted */ is inverted */
} DRXOOB_t, *pDRXOOB_t; } DRXOOB_t, *pDRXOOB_t;
...@@ -1235,7 +1235,7 @@ STRUCTS ...@@ -1235,7 +1235,7 @@ STRUCTS
* Used by DRX_CTRL_GET_OOB. * Used by DRX_CTRL_GET_OOB.
*/ */
typedef struct { typedef struct {
DRXFrequency_t frequency; /**< Frequency in Khz */ s32 frequency; /**< Frequency in Khz */
DRXLockStatus_t lock; /**< Lock status */ DRXLockStatus_t lock; /**< Lock status */
u32 mer; /**< MER */ u32 mer; /**< MER */
s32 symbolRateOffset; /**< Symbolrate offset in ppm */ s32 symbolRateOffset; /**< Symbolrate offset in ppm */
...@@ -1278,16 +1278,16 @@ STRUCTS ...@@ -1278,16 +1278,16 @@ STRUCTS
*/ */
typedef struct { typedef struct {
Bool_t enableMPEGOutput;/**< If TRUE, enable MPEG output */ bool enableMPEGOutput;/**< If true, enable MPEG output */
Bool_t insertRSByte; /**< If TRUE, insert RS byte */ bool insertRSByte; /**< If true, insert RS byte */
Bool_t enableParallel; /**< If TRUE, parallel out otherwise bool enableParallel; /**< If true, parallel out otherwise
serial */ serial */
Bool_t invertDATA; /**< If TRUE, invert DATA signals */ bool invertDATA; /**< If true, invert DATA signals */
Bool_t invertERR; /**< If TRUE, invert ERR signal */ bool invertERR; /**< If true, invert ERR signal */
Bool_t invertSTR; /**< If TRUE, invert STR signals */ bool invertSTR; /**< If true, invert STR signals */
Bool_t invertVAL; /**< If TRUE, invert VAL signals */ bool invertVAL; /**< If true, invert VAL signals */
Bool_t invertCLK; /**< If TRUE, invert CLK signals */ bool invertCLK; /**< If true, invert CLK signals */
Bool_t staticCLK; /**< If TRUE, static MPEG clockrate bool staticCLK; /**< If true, static MPEG clockrate
will be used, otherwise clockrate will be used, otherwise clockrate
will adapt to the bitrate of the will adapt to the bitrate of the
TS */ TS */
...@@ -1314,7 +1314,7 @@ STRUCTS ...@@ -1314,7 +1314,7 @@ STRUCTS
typedef struct { typedef struct {
DRXCfgSMAIO_t io; DRXCfgSMAIO_t io;
u16 ctrlData; u16 ctrlData;
Bool_t smartAntInverted; bool smartAntInverted;
} DRXCfgSMA_t, *pDRXCfgSMA_t; } DRXCfgSMA_t, *pDRXCfgSMA_t;
/*========================================*/ /*========================================*/
...@@ -1391,11 +1391,11 @@ STRUCTS ...@@ -1391,11 +1391,11 @@ STRUCTS
* \brief Audio status characteristics. * \brief Audio status characteristics.
*/ */
typedef struct { typedef struct {
Bool_t stereo; /**< stereo detection */ bool stereo; /**< stereo detection */
Bool_t carrierA; /**< carrier A detected */ bool carrierA; /**< carrier A detected */
Bool_t carrierB; /**< carrier B detected */ bool carrierB; /**< carrier B detected */
Bool_t sap; /**< sap / bilingual detection */ bool sap; /**< sap / bilingual detection */
Bool_t rds; /**< RDS data array present */ bool rds; /**< RDS data array present */
DRXAudNICAMStatus_t nicamStatus; DRXAudNICAMStatus_t nicamStatus;
/**< status of NICAM carrier */ /**< status of NICAM carrier */
s8 fmIdent; /**< FM Identification value */ s8 fmIdent; /**< FM Identification value */
...@@ -1408,7 +1408,7 @@ STRUCTS ...@@ -1408,7 +1408,7 @@ STRUCTS
* \brief Raw RDS data array. * \brief Raw RDS data array.
*/ */
typedef struct { typedef struct {
Bool_t valid; /**< RDS data validation */ bool valid; /**< RDS data validation */
u16 data[18]; /**< data from one RDS data array */ u16 data[18]; /**< data from one RDS data array */
} DRXCfgAudRDS_t, *pDRXCfgAudRDS_t; } DRXCfgAudRDS_t, *pDRXCfgAudRDS_t;
...@@ -1451,7 +1451,7 @@ STRUCTS ...@@ -1451,7 +1451,7 @@ STRUCTS
* \brief Audio volume configuration. * \brief Audio volume configuration.
*/ */
typedef struct { typedef struct {
Bool_t mute; /**< mute overrides volume setting */ bool mute; /**< mute overrides volume setting */
s16 volume; /**< volume, range -114 to 12 dB */ s16 volume; /**< volume, range -114 to 12 dB */
DRXAudAVCMode_t avcMode; /**< AVC auto volume control mode */ DRXAudAVCMode_t avcMode; /**< AVC auto volume control mode */
u16 avcRefLevel; /**< AVC reference level */ u16 avcRefLevel; /**< AVC reference level */
...@@ -1507,7 +1507,7 @@ STRUCTS ...@@ -1507,7 +1507,7 @@ STRUCTS
* \brief I2S output configuration. * \brief I2S output configuration.
*/ */
typedef struct { typedef struct {
Bool_t outputEnable; /**< I2S output enable */ bool outputEnable; /**< I2S output enable */
u32 frequency; /**< range from 8000-48000 Hz */ u32 frequency; /**< range from 8000-48000 Hz */
DRXI2SMode_t mode; /**< I2S mode, master or slave */ DRXI2SMode_t mode; /**< I2S mode, master or slave */
DRXI2SWordLength_t wordLength; DRXI2SWordLength_t wordLength;
...@@ -1575,8 +1575,8 @@ STRUCTS ...@@ -1575,8 +1575,8 @@ STRUCTS
typedef struct { typedef struct {
u16 thres; /* carrier detetcion threshold for primary carrier (A) */ u16 thres; /* carrier detetcion threshold for primary carrier (A) */
DRXNoCarrierOption_t opt; /* Mute or noise at no carrier detection (A) */ DRXNoCarrierOption_t opt; /* Mute or noise at no carrier detection (A) */
DRXFrequency_t shift; /* DC level of incoming signal (A) */ s32 shift; /* DC level of incoming signal (A) */
DRXFrequency_t dco; /* frequency adjustment (A) */ s32 dco; /* frequency adjustment (A) */
} DRXAudCarrier_t, *pDRXCfgAudCarrier_t; } DRXAudCarrier_t, *pDRXCfgAudCarrier_t;
/** /**
...@@ -1668,7 +1668,7 @@ STRUCTS ...@@ -1668,7 +1668,7 @@ STRUCTS
typedef struct { typedef struct {
s16 volume; /* dB */ s16 volume; /* dB */
u16 frequency; /* Hz */ u16 frequency; /* Hz */
Bool_t mute; bool mute;
} DRXAudBeep_t, *pDRXAudBeep_t; } DRXAudBeep_t, *pDRXAudBeep_t;
/** /**
...@@ -1686,7 +1686,7 @@ STRUCTS ...@@ -1686,7 +1686,7 @@ STRUCTS
*/ */
typedef struct { typedef struct {
/* audio storage */ /* audio storage */
Bool_t audioIsActive; bool audioIsActive;
DRXAudStandard_t audioStandard; DRXAudStandard_t audioStandard;
DRXCfgI2SOutput_t i2sdata; DRXCfgI2SOutput_t i2sdata;
DRXCfgAudVolume_t volume; DRXCfgAudVolume_t volume;
...@@ -1701,7 +1701,7 @@ STRUCTS ...@@ -1701,7 +1701,7 @@ STRUCTS
DRXAudBtscDetect_t btscDetect; DRXAudBtscDetect_t btscDetect;
/* rds */ /* rds */
u16 rdsDataCounter; u16 rdsDataCounter;
Bool_t rdsDataPresent; bool rdsDataPresent;
} DRXAudData_t, *pDRXAudData_t; } DRXAudData_t, *pDRXAudData_t;
/** /**
...@@ -1838,37 +1838,37 @@ STRUCTS ...@@ -1838,37 +1838,37 @@ STRUCTS
u8 *microcode; /**< Pointer to microcode image. */ u8 *microcode; /**< Pointer to microcode image. */
u16 microcodeSize; u16 microcodeSize;
/**< Size of microcode image in bytes. */ /**< Size of microcode image in bytes. */
Bool_t verifyMicrocode; bool verifyMicrocode;
/**< Use microcode verify or not. */ /**< Use microcode verify or not. */
DRXMcVersionRec_t mcversion; DRXMcVersionRec_t mcversion;
/**< Version record of microcode from file */ /**< Version record of microcode from file */
/* Clocks and tuner attributes */ /* Clocks and tuner attributes */
DRXFrequency_t intermediateFreq; s32 intermediateFreq;
/**< IF,if tuner instance not used. (kHz)*/ /**< IF,if tuner instance not used. (kHz)*/
DRXFrequency_t sysClockFreq; s32 sysClockFreq;
/**< Systemclock frequency. (kHz) */ /**< Systemclock frequency. (kHz) */
DRXFrequency_t oscClockFreq; s32 oscClockFreq;
/**< Oscillator clock frequency. (kHz) */ /**< Oscillator clock frequency. (kHz) */
s16 oscClockDeviation; s16 oscClockDeviation;
/**< Oscillator clock deviation. (ppm) */ /**< Oscillator clock deviation. (ppm) */
Bool_t mirrorFreqSpect; bool mirrorFreqSpect;
/**< Mirror IF frequency spectrum or not.*/ /**< Mirror IF frequency spectrum or not.*/
/* Initial MPEG output attributes */ /* Initial MPEG output attributes */
DRXCfgMPEGOutput_t mpegCfg; DRXCfgMPEGOutput_t mpegCfg;
/**< MPEG configuration */ /**< MPEG configuration */
Bool_t isOpened; /**< if TRUE instance is already opened. */ bool isOpened; /**< if true instance is already opened. */
/* Channel scan */ /* Channel scan */
pDRXScanParam_t scanParam; pDRXScanParam_t scanParam;
/**< scan parameters */ /**< scan parameters */
u16 scanFreqPlanIndex; u16 scanFreqPlanIndex;
/**< next index in freq plan */ /**< next index in freq plan */
DRXFrequency_t scanNextFrequency; s32 scanNextFrequency;
/**< next freq to scan */ /**< next freq to scan */
Bool_t scanReady; /**< scan ready flag */ bool scanReady; /**< scan ready flag */
u32 scanMaxChannels;/**< number of channels in freqplan */ u32 scanMaxChannels;/**< number of channels in freqplan */
u32 scanChannelsScanned; u32 scanChannelsScanned;
/**< number of channels scanned */ /**< number of channels scanned */
...@@ -1884,7 +1884,7 @@ STRUCTS ...@@ -1884,7 +1884,7 @@ STRUCTS
/**< lock requirement for channel found */ /**< lock requirement for channel found */
/* scanActive can be used by SetChannel to decide how to program the tuner, /* scanActive can be used by SetChannel to decide how to program the tuner,
fast or slow (but stable). Usually fast during scan. */ fast or slow (but stable). Usually fast during scan. */
Bool_t scanActive; /**< TRUE when scan routines are active */ bool scanActive; /**< true when scan routines are active */
/* Power management */ /* Power management */
DRXPowerMode_t currentPowerMode; DRXPowerMode_t currentPowerMode;
...@@ -1892,13 +1892,13 @@ STRUCTS ...@@ -1892,13 +1892,13 @@ STRUCTS
/* Tuner */ /* Tuner */
u8 tunerPortNr; /**< nr of I2C port to wich tuner is */ u8 tunerPortNr; /**< nr of I2C port to wich tuner is */
DRXFrequency_t tunerMinFreqRF; s32 tunerMinFreqRF;
/**< minimum RF input frequency, in kHz */ /**< minimum RF input frequency, in kHz */
DRXFrequency_t tunerMaxFreqRF; s32 tunerMaxFreqRF;
/**< maximum RF input frequency, in kHz */ /**< maximum RF input frequency, in kHz */
Bool_t tunerRfAgcPol; /**< if TRUE invert RF AGC polarity */ bool tunerRfAgcPol; /**< if true invert RF AGC polarity */
Bool_t tunerIfAgcPol; /**< if TRUE invert IF AGC polarity */ bool tunerIfAgcPol; /**< if true invert IF AGC polarity */
Bool_t tunerSlowMode; /**< if TRUE invert IF AGC polarity */ bool tunerSlowMode; /**< if true invert IF AGC polarity */
DRXChannel_t currentChannel; DRXChannel_t currentChannel;
/**< current channel parameters */ /**< current channel parameters */
...@@ -1908,7 +1908,7 @@ STRUCTS ...@@ -1908,7 +1908,7 @@ STRUCTS
/**< previous standard selection */ /**< previous standard selection */
DRXStandard_t diCacheStandard; DRXStandard_t diCacheStandard;
/**< standard in DI cache if available */ /**< standard in DI cache if available */
Bool_t useBootloader; /**< use bootloader in open */ bool useBootloader; /**< use bootloader in open */
u32 capabilities; /**< capabilities flags */ u32 capabilities; /**< capabilities flags */
u32 productId; /**< product ID inc. metal fix number */ u32 productId; /**< product ID inc. metal fix number */
...@@ -2204,23 +2204,23 @@ Conversion from enum values to human readable form. ...@@ -2204,23 +2204,23 @@ Conversion from enum values to human readable form.
( x == DRX_AUD_STANDARD_UNKNOWN ) ? "Unknown" : \ ( x == DRX_AUD_STANDARD_UNKNOWN ) ? "Unknown" : \
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_AUD_STEREO(x) ( \ #define DRX_STR_AUD_STEREO(x) ( \
( x == TRUE ) ? "Stereo" : \ ( x == true ) ? "Stereo" : \
( x == FALSE ) ? "Mono" : \ ( x == false ) ? "Mono" : \
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_AUD_SAP(x) ( \ #define DRX_STR_AUD_SAP(x) ( \
( x == TRUE ) ? "Present" : \ ( x == true ) ? "Present" : \
( x == FALSE ) ? "Not present" : \ ( x == false ) ? "Not present" : \
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_AUD_CARRIER(x) ( \ #define DRX_STR_AUD_CARRIER(x) ( \
( x == TRUE ) ? "Present" : \ ( x == true ) ? "Present" : \
( x == FALSE ) ? "Not present" : \ ( x == false ) ? "Not present" : \
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_AUD_RDS(x) ( \ #define DRX_STR_AUD_RDS(x) ( \
( x == TRUE ) ? "Available" : \ ( x == true ) ? "Available" : \
( x == FALSE ) ? "Not Available" : \ ( x == false ) ? "Not Available" : \
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_AUD_NICAM_STATUS(x) ( \ #define DRX_STR_AUD_NICAM_STATUS(x) ( \
...@@ -2230,8 +2230,8 @@ Conversion from enum values to human readable form. ...@@ -2230,8 +2230,8 @@ Conversion from enum values to human readable form.
"(Invalid)" ) "(Invalid)" )
#define DRX_STR_RDS_VALID(x) ( \ #define DRX_STR_RDS_VALID(x) ( \
( x == TRUE ) ? "Valid" : \ ( x == true ) ? "Valid" : \
( x == FALSE ) ? "Not Valid" : \ ( x == false ) ? "Not Valid" : \
"(Invalid)" ) "(Invalid)" )
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
...@@ -2663,8 +2663,8 @@ Access macros ...@@ -2663,8 +2663,8 @@ Access macros
/** /**
* \brief Macro to check if std is an ATV standard * \brief Macro to check if std is an ATV standard
* \retval TRUE std is an ATV standard * \retval true std is an ATV standard
* \retval FALSE std is an ATV standard * \retval false std is an ATV standard
*/ */
#define DRX_ISATVSTD( std ) ( ( (std) == DRX_STANDARD_PAL_SECAM_BG ) || \ #define DRX_ISATVSTD( std ) ( ( (std) == DRX_STANDARD_PAL_SECAM_BG ) || \
( (std) == DRX_STANDARD_PAL_SECAM_DK ) || \ ( (std) == DRX_STANDARD_PAL_SECAM_DK ) || \
...@@ -2676,8 +2676,8 @@ Access macros ...@@ -2676,8 +2676,8 @@ Access macros
/** /**
* \brief Macro to check if std is an QAM standard * \brief Macro to check if std is an QAM standard
* \retval TRUE std is an QAM standards * \retval true std is an QAM standards
* \retval FALSE std is an QAM standards * \retval false std is an QAM standards
*/ */
#define DRX_ISQAMSTD( std ) ( ( (std) == DRX_STANDARD_ITU_A ) || \ #define DRX_ISQAMSTD( std ) ( ( (std) == DRX_STANDARD_ITU_A ) || \
( (std) == DRX_STANDARD_ITU_B ) || \ ( (std) == DRX_STANDARD_ITU_B ) || \
...@@ -2686,15 +2686,15 @@ Access macros ...@@ -2686,15 +2686,15 @@ Access macros
/** /**
* \brief Macro to check if std is VSB standard * \brief Macro to check if std is VSB standard
* \retval TRUE std is VSB standard * \retval true std is VSB standard
* \retval FALSE std is not VSB standard * \retval false std is not VSB standard
*/ */
#define DRX_ISVSBSTD( std ) ( (std) == DRX_STANDARD_8VSB ) #define DRX_ISVSBSTD( std ) ( (std) == DRX_STANDARD_8VSB )
/** /**
* \brief Macro to check if std is DVBT standard * \brief Macro to check if std is DVBT standard
* \retval TRUE std is DVBT standard * \retval true std is DVBT standard
* \retval FALSE std is not DVBT standard * \retval false std is not DVBT standard
*/ */
#define DRX_ISDVBTSTD( std ) ( (std) == DRX_STANDARD_DVBT ) #define DRX_ISDVBTSTD( std ) ( (std) == DRX_STANDARD_DVBT )
......
drivers/media/dvb-frontends/drx39xyj/drxj.c
View file @ 73f7065b
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/media/dvb-frontends/drx39xyj/drxj.h
View file @ 73f7065b
...@@ -204,7 +204,7 @@ TYPEDEFS ...@@ -204,7 +204,7 @@ TYPEDEFS
typedef struct { typedef struct {
DRXStandard_t standard; /* standard to which these settings apply */ DRXStandard_t standard; /* standard to which these settings apply */
u16 reference; /* pre SAW reference value, range 0 .. 31 */ u16 reference; /* pre SAW reference value, range 0 .. 31 */
Bool_t usePreSaw; /* TRUE algorithms must use pre SAW sense */ bool usePreSaw; /* true algorithms must use pre SAW sense */
} DRXJCfgPreSaw_t, *pDRXJCfgPreSaw_t; } DRXJCfgPreSaw_t, *pDRXJCfgPreSaw_t;
/* DRXJ_CFG_AFE_GAIN */ /* DRXJ_CFG_AFE_GAIN */
...@@ -279,8 +279,8 @@ TYPEDEFS ...@@ -279,8 +279,8 @@ TYPEDEFS
* set MPEG output clock rate * set MPEG output clock rate
*/ */
typedef struct { typedef struct {
Bool_t disableTEIHandling; /**< if TRUE pass (not change) TEI bit */ bool disableTEIHandling; /**< if true pass (not change) TEI bit */
Bool_t bitReverseMpegOutout; /**< if TRUE, parallel: msb on MD0; serial: lsb out first */ bool bitReverseMpegOutout; /**< if true, parallel: msb on MD0; serial: lsb out first */
DRXJMpegOutputClockRate_t mpegOutputClockRate; DRXJMpegOutputClockRate_t mpegOutputClockRate;
/**< set MPEG output clock rate that overwirtes the derived one from symbol rate */ /**< set MPEG output clock rate that overwirtes the derived one from symbol rate */
DRXJMpegStartWidth_t mpegStartWidth; /**< set MPEG output start width */ DRXJMpegStartWidth_t mpegStartWidth; /**< set MPEG output start width */
...@@ -341,12 +341,12 @@ TYPEDEFS ...@@ -341,12 +341,12 @@ TYPEDEFS
typedef struct { typedef struct {
DRXJAgcStatus_t agc; DRXJAgcStatus_t agc;
Bool_t eqLock; bool eqLock;
Bool_t symTimingLock; bool symTimingLock;
Bool_t phaseLock; bool phaseLock;
Bool_t freqLock; bool freqLock;
Bool_t digGainLock; bool digGainLock;
Bool_t anaGainLock; bool anaGainLock;
u8 state; u8 state;
} DRXJCfgOOBMisc_t, *pDRXJCfgOOBMisc_t; } DRXJCfgOOBMisc_t, *pDRXJCfgOOBMisc_t;
...@@ -407,8 +407,8 @@ TYPEDEFS ...@@ -407,8 +407,8 @@ TYPEDEFS
* *
*/ */
typedef struct { typedef struct {
Bool_t enableCVBSOutput; /* TRUE= enabled */ bool enableCVBSOutput; /* true= enabled */
Bool_t enableSIFOutput; /* TRUE= enabled */ bool enableSIFOutput; /* true= enabled */
DRXJSIFAttenuation_t sifAttenuation; DRXJSIFAttenuation_t sifAttenuation;
} DRXJCfgAtvOutput_t, *pDRXJCfgAtvOutput_t; } DRXJCfgAtvOutput_t, *pDRXJCfgAtvOutput_t;
...@@ -447,25 +447,25 @@ TYPEDEFS ...@@ -447,25 +447,25 @@ TYPEDEFS
*/ */
typedef struct { typedef struct {
/* device capabilties (determined during DRX_Open()) */ /* device capabilties (determined during DRX_Open()) */
Bool_t hasLNA; /**< TRUE if LNA (aka PGA) present */ bool hasLNA; /**< true if LNA (aka PGA) present */
Bool_t hasOOB; /**< TRUE if OOB supported */ bool hasOOB; /**< true if OOB supported */
Bool_t hasNTSC; /**< TRUE if NTSC supported */ bool hasNTSC; /**< true if NTSC supported */
Bool_t hasBTSC; /**< TRUE if BTSC supported */ bool hasBTSC; /**< true if BTSC supported */
Bool_t hasSMATX; /**< TRUE if mat_tx is available */ bool hasSMATX; /**< true if mat_tx is available */
Bool_t hasSMARX; /**< TRUE if mat_rx is available */ bool hasSMARX; /**< true if mat_rx is available */
Bool_t hasGPIO; /**< TRUE if GPIO is available */ bool hasGPIO; /**< true if GPIO is available */
Bool_t hasIRQN; /**< TRUE if IRQN is available */ bool hasIRQN; /**< true if IRQN is available */
/* A1/A2/A... */ /* A1/A2/A... */
u8 mfx; /**< metal fix */ u8 mfx; /**< metal fix */
/* tuner settings */ /* tuner settings */
Bool_t mirrorFreqSpectOOB;/**< tuner inversion (TRUE = tuner mirrors the signal */ bool mirrorFreqSpectOOB;/**< tuner inversion (true = tuner mirrors the signal */
/* standard/channel settings */ /* standard/channel settings */
DRXStandard_t standard; /**< current standard information */ DRXStandard_t standard; /**< current standard information */
DRXConstellation_t constellation; DRXConstellation_t constellation;
/**< current constellation */ /**< current constellation */
DRXFrequency_t frequency; /**< center signal frequency in KHz */ s32 frequency; /**< center signal frequency in KHz */
DRXBandwidth_t currBandwidth; DRXBandwidth_t currBandwidth;
/**< current channel bandwidth */ /**< current channel bandwidth */
DRXMirror_t mirror; /**< current channel mirror */ DRXMirror_t mirror; /**< current channel mirror */
...@@ -478,7 +478,7 @@ TYPEDEFS ...@@ -478,7 +478,7 @@ TYPEDEFS
u16 fecRsPlen; /**< defines RS BER measurement period */ u16 fecRsPlen; /**< defines RS BER measurement period */
u16 fecRsPrescale; /**< ReedSolomon Measurement Prescale */ u16 fecRsPrescale; /**< ReedSolomon Measurement Prescale */
u16 fecRsPeriod; /**< ReedSolomon Measurement period */ u16 fecRsPeriod; /**< ReedSolomon Measurement period */
Bool_t resetPktErrAcc; /**< Set a flag to reset accumulated packet error */ bool resetPktErrAcc; /**< Set a flag to reset accumulated packet error */
u16 pktErrAccStart; /**< Set a flag to reset accumulated packet error */ u16 pktErrAccStart; /**< Set a flag to reset accumulated packet error */
/* HI configuration */ /* HI configuration */
...@@ -496,7 +496,7 @@ TYPEDEFS ...@@ -496,7 +496,7 @@ TYPEDEFS
/* IQM fs frequecy shift and inversion */ /* IQM fs frequecy shift and inversion */
u32 iqmFsRateOfs; /**< frequency shifter setting after setchannel */ u32 iqmFsRateOfs; /**< frequency shifter setting after setchannel */
Bool_t posImage; /**< Ture: positive image */ bool posImage; /**< Ture: positive image */
/* IQM RC frequecy shift */ /* IQM RC frequecy shift */
u32 iqmRcRateOfs; /**< frequency shifter setting after setchannel */ u32 iqmRcRateOfs; /**< frequency shifter setting after setchannel */
...@@ -506,11 +506,11 @@ TYPEDEFS ...@@ -506,11 +506,11 @@ TYPEDEFS
s16 atvTopEqu1[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU1__A */ s16 atvTopEqu1[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU1__A */
s16 atvTopEqu2[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU2__A */ s16 atvTopEqu2[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU2__A */
s16 atvTopEqu3[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU3__A */ s16 atvTopEqu3[DRXJ_COEF_IDX_MAX]; /**< shadow of ATV_TOP_EQU3__A */
Bool_t phaseCorrectionBypass;/**< flag: TRUE=bypass */ bool phaseCorrectionBypass;/**< flag: true=bypass */
s16 atvTopVidPeak; /**< shadow of ATV_TOP_VID_PEAK__A */ s16 atvTopVidPeak; /**< shadow of ATV_TOP_VID_PEAK__A */
u16 atvTopNoiseTh; /**< shadow of ATV_TOP_NOISE_TH__A */ u16 atvTopNoiseTh; /**< shadow of ATV_TOP_NOISE_TH__A */
Bool_t enableCVBSOutput; /**< flag CVBS ouput enable */ bool enableCVBSOutput; /**< flag CVBS ouput enable */
Bool_t enableSIFOutput; /**< flag SIF ouput enable */ bool enableSIFOutput; /**< flag SIF ouput enable */
DRXJSIFAttenuation_t sifAttenuation; DRXJSIFAttenuation_t sifAttenuation;
/**< current SIF att setting */ /**< current SIF att setting */
/* Agc configuration for QAM and VSB */ /* Agc configuration for QAM and VSB */
...@@ -536,16 +536,16 @@ TYPEDEFS ...@@ -536,16 +536,16 @@ TYPEDEFS
/**< allocated version list */ /**< allocated version list */
/* smart antenna configuration */ /* smart antenna configuration */
Bool_t smartAntInverted; bool smartAntInverted;
/* Tracking filter setting for OOB */ /* Tracking filter setting for OOB */
u16 oobTrkFilterCfg[8]; u16 oobTrkFilterCfg[8];
Bool_t oobPowerOn; bool oobPowerOn;
/* MPEG static bitrate setting */ /* MPEG static bitrate setting */
u32 mpegTsStaticBitrate; /**< bitrate static MPEG output */ u32 mpegTsStaticBitrate; /**< bitrate static MPEG output */
Bool_t disableTEIhandling; /**< MPEG TS TEI handling */ bool disableTEIhandling; /**< MPEG TS TEI handling */
Bool_t bitReverseMpegOutout;/**< MPEG output bit order */ bool bitReverseMpegOutout;/**< MPEG output bit order */
DRXJMpegOutputClockRate_t mpegOutputClockRate; DRXJMpegOutputClockRate_t mpegOutputClockRate;
/**< MPEG output clock rate */ /**< MPEG output clock rate */
DRXJMpegStartWidth_t mpegStartWidth; DRXJMpegStartWidth_t mpegStartWidth;
...@@ -561,7 +561,7 @@ TYPEDEFS ...@@ -561,7 +561,7 @@ TYPEDEFS
u32 currSymbolRate; u32 currSymbolRate;
/* pin-safe mode */ /* pin-safe mode */
Bool_t pdrSafeMode; /**< PDR safe mode activated */ bool pdrSafeMode; /**< PDR safe mode activated */
u16 pdrSafeRestoreValGpio; u16 pdrSafeRestoreValGpio;
u16 pdrSafeRestoreValVSync; u16 pdrSafeRestoreValVSync;
u16 pdrSafeRestoreValSmaRx; u16 pdrSafeRestoreValSmaRx;
...@@ -631,7 +631,7 @@ DEFINES ...@@ -631,7 +631,7 @@ DEFINES
* Fcentre = Fpc + DRXJ_NTSC_CARRIER_FREQ_OFFSET * Fcentre = Fpc + DRXJ_NTSC_CARRIER_FREQ_OFFSET
* *
*/ */
#define DRXJ_NTSC_CARRIER_FREQ_OFFSET ((DRXFrequency_t)(1750)) #define DRXJ_NTSC_CARRIER_FREQ_OFFSET ((s32)(1750))
/** /**
* \def DRXJ_PAL_SECAM_BG_CARRIER_FREQ_OFFSET * \def DRXJ_PAL_SECAM_BG_CARRIER_FREQ_OFFSET
...@@ -647,7 +647,7 @@ DEFINES ...@@ -647,7 +647,7 @@ DEFINES
* care of this. * care of this.
* *
*/ */
#define DRXJ_PAL_SECAM_BG_CARRIER_FREQ_OFFSET ((DRXFrequency_t)(2375)) #define DRXJ_PAL_SECAM_BG_CARRIER_FREQ_OFFSET ((s32)(2375))
/** /**
* \def DRXJ_PAL_SECAM_DKIL_CARRIER_FREQ_OFFSET * \def DRXJ_PAL_SECAM_DKIL_CARRIER_FREQ_OFFSET
...@@ -663,7 +663,7 @@ DEFINES ...@@ -663,7 +663,7 @@ DEFINES
* care of this. * care of this.
* *
*/ */
#define DRXJ_PAL_SECAM_DKIL_CARRIER_FREQ_OFFSET ((DRXFrequency_t)(2775)) #define DRXJ_PAL_SECAM_DKIL_CARRIER_FREQ_OFFSET ((s32)(2775))
/** /**
* \def DRXJ_PAL_SECAM_LP_CARRIER_FREQ_OFFSET * \def DRXJ_PAL_SECAM_LP_CARRIER_FREQ_OFFSET
...@@ -678,7 +678,7 @@ DEFINES ...@@ -678,7 +678,7 @@ DEFINES
* In case the tuner module is NOT used the application programmer must take * In case the tuner module is NOT used the application programmer must take
* care of this. * care of this.
*/ */
#define DRXJ_PAL_SECAM_LP_CARRIER_FREQ_OFFSET ((DRXFrequency_t)(-3255)) #define DRXJ_PAL_SECAM_LP_CARRIER_FREQ_OFFSET ((s32)(-3255))
/** /**
* \def DRXJ_FM_CARRIER_FREQ_OFFSET * \def DRXJ_FM_CARRIER_FREQ_OFFSET
...@@ -694,7 +694,7 @@ DEFINES ...@@ -694,7 +694,7 @@ DEFINES
* Ffm = Fsc + DRXJ_FM_CARRIER_FREQ_OFFSET * Ffm = Fsc + DRXJ_FM_CARRIER_FREQ_OFFSET
* *
*/ */
#define DRXJ_FM_CARRIER_FREQ_OFFSET ((DRXFrequency_t)(-3000)) #define DRXJ_FM_CARRIER_FREQ_OFFSET ((s32)(-3000))
/* Revision types -------------------------------------------------------*/ /* Revision types -------------------------------------------------------*/
......
drivers/media/dvb-frontends/drx39xyj/drxj_map.h
View file @ 73f7065b
...@@ -7331,8 +7331,8 @@ extern "C" { ...@@ -7331,8 +7331,8 @@ extern "C" {
#define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__W 1 #define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__W 1
#define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__M 0x1 #define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__M 0x1
#define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__PRE 0x0 #define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW__PRE 0x0
#define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW_FALSE 0x0 #define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW_false 0x0
#define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW_TRUE 0x1 #define SCU_RAM_AGC_CLP_CTRL_MODE_NARROW_POW_true 0x1
#define SCU_RAM_AGC_CLP_CTRL_MODE_FAST_CLP_BP__B 1 #define SCU_RAM_AGC_CLP_CTRL_MODE_FAST_CLP_BP__B 1
#define SCU_RAM_AGC_CLP_CTRL_MODE_FAST_CLP_BP__W 1 #define SCU_RAM_AGC_CLP_CTRL_MODE_FAST_CLP_BP__W 1
...@@ -8130,8 +8130,8 @@ extern "C" { ...@@ -8130,8 +8130,8 @@ extern "C" {
#define SCU_RAM_ATV_DETECT_DETECT__W 1 #define SCU_RAM_ATV_DETECT_DETECT__W 1
#define SCU_RAM_ATV_DETECT_DETECT__M 0x1 #define SCU_RAM_ATV_DETECT_DETECT__M 0x1
#define SCU_RAM_ATV_DETECT_DETECT__PRE 0x0 #define SCU_RAM_ATV_DETECT_DETECT__PRE 0x0
#define SCU_RAM_ATV_DETECT_DETECT_FALSE 0x0 #define SCU_RAM_ATV_DETECT_DETECT_false 0x0
#define SCU_RAM_ATV_DETECT_DETECT_TRUE 0x1 #define SCU_RAM_ATV_DETECT_DETECT_true 0x1
#define SCU_RAM_ATV_DETECT_TH__A 0x831F4A #define SCU_RAM_ATV_DETECT_TH__A 0x831F4A
#define SCU_RAM_ATV_DETECT_TH__W 8 #define SCU_RAM_ATV_DETECT_TH__W 8
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7