Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 956be1a1 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6656: remove old channel tables 



Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4c9a92d

drivers/staging/vt6656/channel.c

+0 −137
Original line number Diff line number Diff line
@@ -34,147 +34,10 @@ 
 *

 */



#include <linux/kernel.h>

#include "device.h"

#include "channel.h"

#include "rf.h"



static SChannelTblElement sChannelTbl[CB_MAX_CHANNEL+1] =

{

  {0,   0,    false},

  {1,   2412, true},

  {2,   2417, true},

  {3,   2422, true},

  {4,   2427, true},

  {5,   2432, true},

  {6,   2437, true},

  {7,   2442, true},

  {8,   2447, true},

  {9,   2452, true},

  {10,  2457, true},

  {11,  2462, true},

  {12,  2467, true},

  {13,  2472, true},

  {14,  2484, true},

  {183, 4915, true}, //15

  {184, 4920, true}, //16

  {185, 4925, true}, //17

  {187, 4935, true}, //18

  {188, 4940, true}, //19

  {189, 4945, true}, //20

  {192, 4960, true}, //21

  {196, 4980, true}, //22

  {7,   5035, true}, //23

  {8,   5040, true}, //24

  {9,   5045, true}, //25

  {11,  5055, true}, //26

  {12,  5060, true}, //27

  {16,  5080, true}, //28

  {34,  5170, true}, //29

  {36,  5180, true}, //30

  {38,  5190, true}, //31

  {40,  5200, true}, //32

  {42,  5210, true}, //33

  {44,  5220, true}, //34

  {46,  5230, true}, //35

  {48,  5240, true}, //36

  {52,  5260, true}, //37

  {56,  5280, true}, //38

  {60,  5300, true}, //39

  {64,  5320, true}, //40

  {100, 5500, true}, //41

  {104, 5520, true}, //42

  {108, 5540, true}, //43

  {112, 5560, true}, //44

  {116, 5580, true}, //45

  {120, 5600, true}, //46

  {124, 5620, true}, //47

  {128, 5640, true}, //48

  {132, 5660, true}, //49

  {136, 5680, true}, //50

  {140, 5700, true}, //51

  {149, 5745, true}, //52

  {153, 5765, true}, //53

  {157, 5785, true}, //54

  {161, 5805, true}, //55

  {165, 5825, true}  //56

};





/************************************************************************

 * Country Channel Valid

 *  Input:  CountryCode, ChannelNum

 *          ChanneIndex is defined as VT3253 MAC channel:

 *              1   = 2.4G channel 1

 *              2   = 2.4G channel 2

 *              ...

 *              14  = 2.4G channel 14

 *              15  = 4.9G channel 183

 *              16  = 4.9G channel 184

 *              .....

 *  Output: true if the specified 5GHz band is allowed to be used.

            False otherwise.

// 4.9G => Ch 183, 184, 185, 187, 188, 189, 192, 196 (Value:15 ~ 22)



// 5G => Ch 7, 8, 9, 11, 12, 16, 34, 36, 38, 40, 42, 44, 46, 48, 52, 56, 60, 64,

// 100, 104, 108, 112, 116, 120, 124, 128, 132, 136, 140, 149, 153, 157, 161, 165 (Value 23 ~ 56)

 ************************************************************************/

bool

ChannelValid(unsigned int CountryCode, unsigned int ChannelIndex)

{

    bool    bValid;



    bValid = false;

    /*

     * If Channel Index is invalid, return invalid

     */

    if ((ChannelIndex > CB_MAX_CHANNEL) ||

        (ChannelIndex == 0))

    {

        bValid = false;

        goto exit;

    }



    bValid = sChannelTbl[ChannelIndex].bValid;



exit:

    return (bValid);



} /* end ChannelValid */



void CHvInitChannelTable(struct vnt_private *pDevice)

{

	bool bMultiBand = false;

	int ii;



    for (ii = 1; ii <= CB_MAX_CHANNEL; ii++)

	sChannelTbl[ii].bValid = false;



    switch (pDevice->byRFType) {

        case RF_AL2230:

        case RF_AL2230S:

        case RF_VT3226:

        case RF_VT3226D0:

            bMultiBand = false;

            break;

        case RF_AIROHA7230:

        case RF_VT3342A0:

        default :

            bMultiBand = true;

            break;

    }



        if (bMultiBand == true) {

		for (ii = 0; ii < CB_MAX_CHANNEL; ii++) {

			sChannelTbl[ii+1].bValid = true;

		}

        } else {

		for (ii = 0; ii < CB_MAX_CHANNEL_24G; ii++) {

			sChannelTbl[ii+1].bValid = true;

		}

        }

}



static struct ieee80211_rate vnt_rates_bg[] = {

	{ .bitrate = 10,  .hw_value = RATE_1M },

	{ .bitrate = 20,  .hw_value = RATE_2M },

drivers/staging/vt6656/channel.h

+0 −9
Original line number Diff line number Diff line
@@ -32,15 +32,6 @@ 


#include "device.h"



typedef struct tagSChannelTblElement {

    u8    byChannelNumber;

    unsigned int    uFrequency;

    bool    bValid;

} SChannelTblElement, *PSChannelTblElement;



bool    ChannelValid(unsigned int CountryCode, unsigned int ChannelNum);

void    CHvInitChannelTable(struct vnt_private *pDevice);



void vnt_init_bands(struct vnt_private *);



#endif  /* _CHANNEL_H_ */

drivers/staging/vt6656/main_usb.c

+0 −2
Original line number Diff line number Diff line
@@ -323,8 +323,6 @@ static int device_init_registers(struct vnt_private *pDevice) 
			pDevice->wCurrentRate = RATE_54M;

	}



	CHvInitChannelTable(pDevice);



	pDevice->byTopOFDMBasicRate = RATE_24M;

	pDevice->byTopCCKBasicRate = RATE_1M;