staging: vt6656: replaced custom FALSE definition with false (e269fc2d) · Commits · jan.koester / Linux

drivers/staging/vt6656/aes_ccmp.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -249,7 +249,7 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
	WORD wHLen = 22;		WORD wHLen = 22;
	/* 8 is IV, 8 is MIC, 4 is CRC */		/* 8 is IV, 8 is MIC, 4 is CRC */
	WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;		WORD wPayloadSize = wFrameSize - 8 - 8 - 4 - WLAN_HDR_ADDR3_LEN;
	bool bA4 = FALSE;		bool bA4 = false;
	BYTE byTmp;		BYTE byTmp;
	WORD wCnt;		WORD wCnt;
	int ii, jj, kk;		int ii, jj, kk;
	@@ -382,5 +382,5 @@ bool AESbGenCCMP(PBYTE pbyRxKey, PBYTE pbyFrame, WORD wFrameSize)
	if (!memcmp(abyMIC, abyTmp, 8))		if (!memcmp(abyMIC, abyTmp, 8))
	return TRUE;		return TRUE;
	else		else
	return FALSE;		return false;
	}		}

drivers/staging/vt6656/baseband.c

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -768,7 +768,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
	int bCCK = pDevice->bCCK;		int bCCK = pDevice->bCCK;

	cbBitCount = cbFrameLength * 8;		cbBitCount = cbFrameLength * 8;
	bExtBit = FALSE;		bExtBit = false;

	switch (wRate) {		switch (wRate) {
	case RATE_1M :		case RATE_1M :
	@@ -785,7 +785,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,
	break;		break;

	case RATE_5M :		case RATE_5M :
	if (bCCK == FALSE)		if (bCCK == false)
	cbBitCount ++;		cbBitCount ++;
	cbUsCount = (cbBitCount * 10) / 55;		cbUsCount = (cbBitCount * 10) / 55;
	cbTmp = (cbUsCount * 55) / 10;		cbTmp = (cbUsCount * 55) / 10;
	@@ -799,7 +799,7 @@ void BBvCalculateParameter(struct vnt_private *pDevice, u32 cbFrameLength,

	case RATE_11M :		case RATE_11M :

	if (bCCK == FALSE)		if (bCCK == false)
	cbBitCount ++;		cbBitCount ++;
	cbUsCount = cbBitCount / 11;		cbUsCount = cbBitCount / 11;
	cbTmp = cbUsCount * 11;		cbTmp = cbUsCount * 11;
	@@ -976,12 +976,12 @@ int BBbVT3184Init(struct vnt_private *pDevice)
	EEP_MAX_CONTEXT_SIZE,		EEP_MAX_CONTEXT_SIZE,
	pDevice->abyEEPROM);		pDevice->abyEEPROM);
	if (ntStatus != STATUS_SUCCESS) {		if (ntStatus != STATUS_SUCCESS) {
	return FALSE;		return false;
	}		}


	// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04)		// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04)
	// return FALSE;		// return false;

	//zonetype initial		//zonetype initial
	pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];		pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];

drivers/staging/vt6656/bssdb.c

+29 −29

Original line number	Original line	Diff line number	Diff line
	@@ -141,15 +141,15 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,
	}		}
	}		}

	if ((pbyBSSID != NULL)&&(pDevice->bRoaming == FALSE)) {		if ((pbyBSSID != NULL)&&(pDevice->bRoaming == false)) {
	// match BSSID first		// match BSSID first
	for (ii = 0; ii <MAX_BSS_NUM; ii++) {		for (ii = 0; ii <MAX_BSS_NUM; ii++) {
	pCurrBSS = &(pMgmt->sBSSList[ii]);		pCurrBSS = &(pMgmt->sBSSList[ii]);

	pCurrBSS->bSelected = FALSE;		pCurrBSS->bSelected = false;

	if ((pCurrBSS->bActive) &&		if ((pCurrBSS->bActive) &&
	(pCurrBSS->bSelected == FALSE)) {		(pCurrBSS->bSelected == false)) {
	if (!compare_ether_addr(pCurrBSS->abyBSSID, pbyBSSID)) {		if (!compare_ether_addr(pCurrBSS->abyBSSID, pbyBSSID)) {
	if (pSSID != NULL) {		if (pSSID != NULL) {
	// compare ssid		// compare ssid
	@@ -183,9 +183,9 @@ PKnownBSS BSSpSearchBSSList(struct vnt_private *pDevice,

	//2007-0721-01<Mark>by MikeLiu		//2007-0721-01<Mark>by MikeLiu
	// if ((pCurrBSS->bActive) &&		// if ((pCurrBSS->bActive) &&
	// (pCurrBSS->bSelected == FALSE)) {		// (pCurrBSS->bSelected == false)) {

	pCurrBSS->bSelected = FALSE;		pCurrBSS->bSelected = false;
	if (pCurrBSS->bActive) {		if (pCurrBSS->bActive) {

	if (pSSID != NULL) {		if (pSSID != NULL) {
	@@ -237,7 +237,7 @@ pDevice->bSameBSSMaxNum = jj;

	if (pSelect != NULL) {		if (pSelect != NULL) {
	pSelect->bSelected = TRUE;		pSelect->bSelected = TRUE;
	if (pDevice->bRoaming == FALSE) {		if (pDevice->bRoaming == false) {
	// Einsn Add @20070907		// Einsn Add @20070907
	memcpy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ;		memcpy(pbyDesireSSID,pCurrBSS->abySSID,WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1) ;
	}		}
	@@ -274,12 +274,12 @@ void BSSvClearBSSList(struct vnt_private *pDevice, int bKeepCurrBSSID)
	//mike mark: there are two BSSID's in list. If that AP is in hidden ssid mode, one SSID is null,		//mike mark: there are two BSSID's in list. If that AP is in hidden ssid mode, one SSID is null,
	// but other's might not be obvious, so if it associate's with your STA,		// but other's might not be obvious, so if it associate's with your STA,
	// you must keep the two of them!!		// you must keep the two of them!!
	// bKeepCurrBSSID = FALSE;		// bKeepCurrBSSID = false;
	continue;		continue;
	}		}
	}		}

	pMgmt->sBSSList[ii].bActive = FALSE;		pMgmt->sBSSList[ii].bActive = false;
	memset(&pMgmt->sBSSList[ii], 0, sizeof(KnownBSS));		memset(&pMgmt->sBSSList[ii], 0, sizeof(KnownBSS));
	}		}
	BSSvClearAnyBSSJoinRecord(pDevice);		BSSvClearAnyBSSJoinRecord(pDevice);
	@@ -355,7 +355,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
	(struct vnt_rx_mgmt *)pRxPacketContext;		(struct vnt_rx_mgmt *)pRxPacketContext;
	PKnownBSS pBSSList = NULL;		PKnownBSS pBSSList = NULL;
	unsigned int ii;		unsigned int ii;
	bool bParsingQuiet = FALSE;		bool bParsingQuiet = false;


	pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);		pBSSList = (PKnownBSS)&(pMgmt->sBSSList[0]);
	@@ -368,7 +368,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,

	if (ii == MAX_BSS_NUM){		if (ii == MAX_BSS_NUM){
	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Get free KnowBSS node failed.\n");		DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Get free KnowBSS node failed.\n");
	return FALSE;		return false;
	}		}
	// save the BSS info		// save the BSS info
	pBSSList->bActive = TRUE;		pBSSList->bActive = TRUE;
	@@ -453,7 +453,7 @@ int BSSbInsertToBSSList(struct vnt_private *pDevice,
	if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) \|\| (pBSSList->bWPA2Valid == TRUE)) {		if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA2) \|\| (pBSSList->bWPA2Valid == TRUE)) {

	PSKeyItem pTransmitKey = NULL;		PSKeyItem pTransmitKey = NULL;
	bool bIs802_1x = FALSE;		bool bIs802_1x = false;

	for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) {		for (ii = 0; ii < pBSSList->wAKMSSAuthCount; ii ++) {
	if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) {		if (pBSSList->abyAKMSSAuthType[ii] == WLAN_11i_AKMSS_802_1X) {
	@@ -534,10 +534,10 @@ int BSSbUpdateToBSSList(struct vnt_private *pDevice,
	(struct vnt_rx_mgmt *)pRxPacketContext;		(struct vnt_rx_mgmt *)pRxPacketContext;
	int ii, jj;		int ii, jj;
	signed long ldBm, ldBmSum;		signed long ldBm, ldBmSum;
	bool bParsingQuiet = FALSE;		bool bParsingQuiet = false;

	if (pBSSList == NULL)		if (pBSSList == NULL)
	return FALSE;		return false;


	pBSSList->qwBSSTimestamp = cpu_to_le64(qwTimestamp);		pBSSList->qwBSSTimestamp = cpu_to_le64(qwTimestamp);
	@@ -669,7 +669,7 @@ int BSSbIsSTAInNodeDB(struct vnt_private *pDevice,
	}		}
	}		}

	return FALSE;		return false;
	};		};


	@@ -826,7 +826,7 @@ void BSSvAddMulticastNode(struct vnt_private *pDevice)
	memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));		memset(&pMgmt->sNodeDBTable[0], 0, sizeof(KnownNodeDB));
	memset(pMgmt->sNodeDBTable[0].abyMACAddr, 0xff, WLAN_ADDR_LEN);		memset(pMgmt->sNodeDBTable[0].abyMACAddr, 0xff, WLAN_ADDR_LEN);
	pMgmt->sNodeDBTable[0].bActive = TRUE;		pMgmt->sNodeDBTable[0].bActive = TRUE;
	pMgmt->sNodeDBTable[0].bPSEnable = FALSE;		pMgmt->sNodeDBTable[0].bPSEnable = false;
	skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue);		skb_queue_head_init(&pMgmt->sNodeDBTable[0].sTxPSQueue);
	RATEvParseMaxRate((void *) pDevice,		RATEvParseMaxRate((void *) pDevice,
	(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,		(PWLAN_IE_SUPP_RATES)pMgmt->abyCurrSuppRates,
	@@ -874,7 +874,7 @@ void BSSvSecondCallBack(struct vnt_private *pDevice)
	pDevice->ulPSModeWaitTx++;		pDevice->ulPSModeWaitTx++;
	if ( pDevice->ulPSModeWaitTx >= 2 ) {		if ( pDevice->ulPSModeWaitTx >= 2 ) {
	pDevice->ulPSModeWaitTx = 0;		pDevice->ulPSModeWaitTx = 0;
	pDevice->bPSModeTxBurst = FALSE;		pDevice->bPSModeTxBurst = false;
	}		}
	}		}

	@@ -994,14 +994,14 @@ if(pDevice->byReAssocCount > 0) {
	else {		else {
	if (pDevice->bProtectMode) {		if (pDevice->bProtectMode) {
	MACvDisableProtectMD(pDevice);		MACvDisableProtectMD(pDevice);
	pDevice->bProtectMode = FALSE;		pDevice->bProtectMode = false;
	}		}
	}		}
	// on/off short slot time		// on/off short slot time

	if (uNonShortSlotSTACnt > 0) {		if (uNonShortSlotSTACnt > 0) {
	if (pDevice->bShortSlotTime) {		if (pDevice->bShortSlotTime) {
	pDevice->bShortSlotTime = FALSE;		pDevice->bShortSlotTime = false;
	BBvSetShortSlotTime(pDevice);		BBvSetShortSlotTime(pDevice);
	vUpdateIFS((void *)pDevice);		vUpdateIFS((void *)pDevice);
	}		}
	@@ -1025,7 +1025,7 @@ if(pDevice->byReAssocCount > 0) {
	else {		else {
	if (pDevice->bBarkerPreambleMd) {		if (pDevice->bBarkerPreambleMd) {
	MACvDisableBarkerPreambleMd(pDevice);		MACvDisableBarkerPreambleMd(pDevice);
	pDevice->bBarkerPreambleMd = FALSE;		pDevice->bBarkerPreambleMd = false;
	}		}
	}		}

	@@ -1037,7 +1037,7 @@ if(pDevice->byReAssocCount > 0) {
	if (uSleepySTACnt > 0)		if (uSleepySTACnt > 0)
	pMgmt->sNodeDBTable[0].bPSEnable = TRUE;		pMgmt->sNodeDBTable[0].bPSEnable = TRUE;
	else		else
	pMgmt->sNodeDBTable[0].bPSEnable = FALSE;		pMgmt->sNodeDBTable[0].bPSEnable = false;
	}		}

	pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;		pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
	@@ -1062,14 +1062,14 @@ if(pDevice->byReAssocCount > 0) {
	}		}

	if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) {		if (pMgmt->sNodeDBTable[0].uInActiveCount >= LOST_BEACON_COUNT) {
	pMgmt->sNodeDBTable[0].bActive = FALSE;		pMgmt->sNodeDBTable[0].bActive = false;
	pMgmt->eCurrMode = WMAC_MODE_STANDBY;		pMgmt->eCurrMode = WMAC_MODE_STANDBY;
	pMgmt->eCurrState = WMAC_STATE_IDLE;		pMgmt->eCurrState = WMAC_STATE_IDLE;
	netif_stop_queue(pDevice->dev);		netif_stop_queue(pDevice->dev);
	pDevice->bLinkPass = FALSE;		pDevice->bLinkPass = false;
	ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);		ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);
	pDevice->bRoaming = TRUE;		pDevice->bRoaming = TRUE;
	pDevice->bIsRoaming = FALSE;		pDevice->bIsRoaming = false;

	DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);		DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
	/* let wpa supplicant know AP may disconnect */		/* let wpa supplicant know AP may disconnect */
	@@ -1098,12 +1098,12 @@ DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "bIsRoaming %d, !\n", pDevice->bIsRoaming );
	pMgmt->abyDesireSSID);		pMgmt->abyDesireSSID);
	pDevice->uAutoReConnectTime = 0;		pDevice->uAutoReConnectTime = 0;
	pDevice->uIsroamingTime = 0;		pDevice->uIsroamingTime = 0;
	pDevice->bRoaming = FALSE;		pDevice->bRoaming = false;
	}		}
	else if ((pDevice->bRoaming == FALSE)&&(pDevice->bIsRoaming == TRUE)) {		else if ((pDevice->bRoaming == false)&&(pDevice->bIsRoaming == TRUE)) {
	pDevice->uIsroamingTime++;		pDevice->uIsroamingTime++;
	if (pDevice->uIsroamingTime >= 20)		if (pDevice->uIsroamingTime >= 20)
	pDevice->bIsRoaming = FALSE;		pDevice->bIsRoaming = false;
	}		}

	}		}
	@@ -1159,7 +1159,7 @@ else {
	pMgmt->sNodeDBTable[0].uInActiveCount = 0;		pMgmt->sNodeDBTable[0].uInActiveCount = 0;
	pMgmt->eCurrState = WMAC_STATE_STARTED;		pMgmt->eCurrState = WMAC_STATE_STARTED;
	netif_stop_queue(pDevice->dev);		netif_stop_queue(pDevice->dev);
	pDevice->bLinkPass = FALSE;		pDevice->bLinkPass = false;
	ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);		ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_SLOW);
	}		}
	}		}
	@@ -1459,7 +1459,7 @@ void BSSvClearAnyBSSJoinRecord(struct vnt_private *pDevice)
	int ii;		int ii;

	for (ii = 0; ii < MAX_BSS_NUM; ii++)		for (ii = 0; ii < MAX_BSS_NUM; ii++)
	pMgmt->sBSSList[ii].bSelected = FALSE;		pMgmt->sBSSList[ii].bSelected = false;

	return;		return;
	}		}
	@@ -1474,7 +1474,7 @@ static void s_vCheckPreEDThreshold(struct vnt_private *pDevice)
	pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID);		pBSSList = BSSpAddrIsInBSSList(pDevice, pMgmt->abyCurrBSSID, (PWLAN_IE_SSID)pMgmt->abyCurrSSID);
	if (pBSSList != NULL) {		if (pBSSList != NULL) {
	pDevice->byBBPreEDRSSI = (BYTE) (~(pBSSList->ldBmAverRange) + 1);		pDevice->byBBPreEDRSSI = (BYTE) (~(pBSSList->ldBmAverRange) + 1);
	BBvUpdatePreEDThreshold(pDevice, FALSE);		BBvUpdatePreEDThreshold(pDevice, false);
	}		}
	}		}
	}		}

drivers/staging/vt6656/card.c

+11 −11

Original line number	Original line	Diff line number	Diff line
	@@ -501,7 +501,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
	}		}
	else {// PK_TYPE_11GA & PK_TYPE_11GB		else {// PK_TYPE_11GA & PK_TYPE_11GB
	BYTE byRate = 0;		BYTE byRate = 0;
	bool bOFDMRate = FALSE;		bool bOFDMRate = false;
	unsigned int ii = 0;		unsigned int ii = 0;
	PWLAN_IE_SUPP_RATES pItemRates = NULL;		PWLAN_IE_SUPP_RATES pItemRates = NULL;

	@@ -521,7 +521,7 @@ void vUpdateIFS(struct vnt_private *pDevice)
	break;		break;
	}		}
	}		}
	if (bOFDMRate == FALSE) {		if (bOFDMRate == false) {
	pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt		pItemRates = (PWLAN_IE_SUPP_RATES)pDevice->vnt_mgmt
	.abyCurrExtSuppRates;		.abyCurrExtSuppRates;
	for (ii = 0; ii < pItemRates->len; ii++) {		for (ii = 0; ii < pItemRates->len; ii++) {
	@@ -599,7 +599,7 @@ void CARDvUpdateBasicTopRate(struct vnt_private *pDevice)
	* Out:		* Out:
	* none		* none
	*		*
	* Return Value: TRUE if succeeded; FALSE if failed.		* Return Value: TRUE if succeeded; false if failed.
	*		*
	*/		*/
	void CARDbAddBasicRate(struct vnt_private *pDevice, u16 wRateIdx)		void CARDbAddBasicRate(struct vnt_private *pDevice, u16 wRateIdx)
	@@ -620,7 +620,7 @@ int CARDbIsOFDMinBasicRate(struct vnt_private *pDevice)
	if ((pDevice->wBasicRate) & ((WORD)(1<<ii)))		if ((pDevice->wBasicRate) & ((WORD)(1<<ii)))
	return TRUE;		return TRUE;
	}		}
	return FALSE;		return false;
	}		}

	u8 CARDbyGetPktType(struct vnt_private *pDevice)		u8 CARDbyGetPktType(struct vnt_private *pDevice)
	@@ -723,7 +723,7 @@ void CARDvAdjustTSF(struct vnt_private *pDevice, u8 byRxRate,
	* Out:		* Out:
	* qwCurrTSF - Current TSF counter		* qwCurrTSF - Current TSF counter
	*		*
	* Return Value: TRUE if success; otherwise FALSE		* Return Value: TRUE if success; otherwise false
	*		*
	*/		*/
	bool CARDbGetCurrentTSF(struct vnt_private pDevice, u64 pqwCurrTSF)		bool CARDbGetCurrentTSF(struct vnt_private pDevice, u64 pqwCurrTSF)
	@@ -743,7 +743,7 @@ bool CARDbGetCurrentTSF(struct vnt_private pDevice, u64 pqwCurrTSF)
	* In:		* In:
	* pDevice - The adapter to be read		* pDevice - The adapter to be read
	*		*
	* Return Value: TRUE if success; otherwise FALSE		* Return Value: TRUE if success; otherwise false
	*		*
	*/		*/
	bool CARDbClearCurrentTSF(struct vnt_private *pDevice)		bool CARDbClearCurrentTSF(struct vnt_private *pDevice)
	@@ -899,7 +899,7 @@ void CARDvUpdateNextTBTT(struct vnt_private *pDevice, u64 qwTSF,
	* Out:		* Out:
	* none		* none
	*		*
	* Return Value: TRUE if success; otherwise FALSE		* Return Value: TRUE if success; otherwise false
	*		*
	*/		*/
	int CARDbRadioPowerOff(struct vnt_private *pDevice)		int CARDbRadioPowerOff(struct vnt_private *pDevice)
	@@ -939,7 +939,7 @@ int CARDbRadioPowerOff(struct vnt_private *pDevice)
	* Out:		* Out:
	* none		* none
	*		*
	* Return Value: TRUE if success; otherwise FALSE		* Return Value: TRUE if success; otherwise false
	*		*
	*/		*/
	int CARDbRadioPowerOn(struct vnt_private *pDevice)		int CARDbRadioPowerOn(struct vnt_private *pDevice)
	@@ -947,13 +947,13 @@ int CARDbRadioPowerOn(struct vnt_private *pDevice)
	int bResult = TRUE;		int bResult = TRUE;

	if ((pDevice->bHWRadioOff == TRUE) \|\| (pDevice->bRadioControlOff == TRUE)) {		if ((pDevice->bHWRadioOff == TRUE) \|\| (pDevice->bRadioControlOff == TRUE)) {
	return FALSE;		return false;
	}		}

	//if (pDevice->bRadioOff == FALSE)		//if (pDevice->bRadioOff == false)
	// return TRUE;		// return TRUE;

	pDevice->bRadioOff = FALSE;		pDevice->bRadioOff = false;

	BBvExitDeepSleep(pDevice);		BBvExitDeepSleep(pDevice);

drivers/staging/vt6656/channel.c

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -50,7 +50,7 @@ static int msglevel = MSG_LEVEL_INFO;

	static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =		static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =
	{		{
	{0, 0, FALSE},		{0, 0, false},
	{1, 2412, TRUE},		{1, 2412, TRUE},
	{2, 2417, TRUE},		{2, 2417, TRUE},
	{3, 2422, TRUE},		{3, 2422, TRUE},
	@@ -392,14 +392,14 @@ ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)
	{		{
	bool bValid;		bool bValid;

	bValid = FALSE;		bValid = false;
	/*		/*
	* If Channel Index is invalid, return invalid		* If Channel Index is invalid, return invalid
	*/		*/
	if ((ChannelIndex > CB_MAX_CHANNEL) \|\|		if ((ChannelIndex > CB_MAX_CHANNEL) \|\|
	(ChannelIndex == 0))		(ChannelIndex == 0))
	{		{
	bValid = FALSE;		bValid = false;
	goto exit;		goto exit;
	}		}

	@@ -429,7 +429,7 @@ CHvChannelGetList (
	)		)
	{		{
	if (uCountryCodeIdx >= CCODE_MAX) {		if (uCountryCodeIdx >= CCODE_MAX) {
	return (FALSE);		return (false);
	}		}
	memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);		memcpy(pbyChannelTable, ChannelRuleTab[uCountryCodeIdx].bChannelIdxList, CB_MAX_CHANNEL);
	return (TRUE);		return (TRUE);
	@@ -438,18 +438,18 @@ CHvChannelGetList (

	void CHvInitChannelTable(struct vnt_private *pDevice)		void CHvInitChannelTable(struct vnt_private *pDevice)
	{		{
	int bMultiBand = FALSE;		int bMultiBand = false;
	int ii;		int ii;

	for (ii = 1; ii <= CB_MAX_CHANNEL; ii++)		for (ii = 1; ii <= CB_MAX_CHANNEL; ii++)
	sChannelTbl[ii].bValid = FALSE;		sChannelTbl[ii].bValid = false;

	switch (pDevice->byRFType) {		switch (pDevice->byRFType) {
	case RF_AL2230:		case RF_AL2230:
	case RF_AL2230S:		case RF_AL2230S:
	case RF_VT3226:		case RF_VT3226:
	case RF_VT3226D0:		case RF_VT3226D0:
	bMultiBand = FALSE;		bMultiBand = false;
	break;		break;
	case RF_AIROHA7230:		case RF_AIROHA7230:
	case RF_VT3342A0:		case RF_VT3342A0: