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

Commit 8c5e7a5f authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Gather channel information in structure 



Channel information which is read from EEPROM should
be read into an array containing per-channel information.
This removes the requirement of multiple arrays and makes
the channel handling a bit cleaner and easier to expand.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 906c110f

drivers/net/wireless/rt2x00/rt2400pci.c

+24 −16
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
 * RF value list for RF2420 & RF2421

 * Supports: 2.4 GHz

 */

static const struct rf_channel rf_vals_bg[] = {

static const struct rf_channel rf_vals_b[] = {

	{ 1,  0x00022058, 0x000c1fda, 0x00000101, 0 },

	{ 2,  0x00022058, 0x000c1fee, 0x00000101, 0 },

	{ 3,  0x00022058, 0x000c2002, 0x00000101, 0 },
@@ -1421,10 +1421,11 @@ static const struct rf_channel rf_vals_bg[] = { 
	{ 14, 0x00022058, 0x000c20fa, 0x00000101, 0 },

};



static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

{

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	u8 *txpower;

	struct channel_info *info;

	char *tx_power;

	unsigned int i;



	/*
@@ -1439,24 +1440,29 @@ static void rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
				rt2x00_eeprom_addr(rt2x00dev,

						   EEPROM_MAC_ADDR_0));



	/*

	 * Convert tx_power array in eeprom.

	 */

	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);



	/*

	 * Initialize hw_mode information.

	 */

	spec->supported_bands = SUPPORT_BAND_2GHZ;

	spec->supported_rates = SUPPORT_RATE_CCK;

	spec->tx_power_a = NULL;

	spec->tx_power_bg = txpower;

	spec->tx_power_default = DEFAULT_TXPOWER;



	spec->num_channels = ARRAY_SIZE(rf_vals_bg);

	spec->channels = rf_vals_bg;

	spec->num_channels = ARRAY_SIZE(rf_vals_b);

	spec->channels = rf_vals_b;



	/*

	 * Create channel information array

	 */

	info = kzalloc(spec->num_channels * sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	spec->channels_info = info;



	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);



	return 0;

}



static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev)
@@ -1477,7 +1483,9 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize hw specifications.

	 */

	rt2400pci_probe_hw_mode(rt2x00dev);

	retval = rt2400pci_probe_hw_mode(rt2x00dev);

	if (retval)

		return retval;



	/*

	 * This device requires the atim queue and DMA-mapped skbs.

drivers/net/wireless/rt2x00/rt2400pci.h

+8 −14
Original line number Diff line number Diff line
@@ -938,19 +938,13 @@ 
#define MAX_TXPOWER	62

#define DEFAULT_TXPOWER	39



#define __CLAMP_TX(__txpower) \

	clamp_t(char, (__txpower), MIN_TXPOWER, MAX_TXPOWER)



#define TXPOWER_FROM_DEV(__txpower) \

({									\

	((__txpower) > MAX_TXPOWER) ? DEFAULT_TXPOWER - MIN_TXPOWER :	\

	((__txpower) < MIN_TXPOWER) ? DEFAULT_TXPOWER - MIN_TXPOWER :	\

	(((__txpower) - MAX_TXPOWER) + MIN_TXPOWER);			\

})

	((__CLAMP_TX(__txpower) - MAX_TXPOWER) + MIN_TXPOWER)



#define TXPOWER_TO_DEV(__txpower) \

({							\

	(__txpower) += MIN_TXPOWER;			\

	((__txpower) <= MIN_TXPOWER) ? MAX_TXPOWER :	\

	(((__txpower) >= MAX_TXPOWER) ? MIN_TXPOWER :	\

	(MAX_TXPOWER - ((__txpower) - MIN_TXPOWER)));	\

})

	MAX_TXPOWER - (__CLAMP_TX(__txpower) - MIN_TXPOWER)



#endif /* RT2400PCI_H */

drivers/net/wireless/rt2x00/rt2500pci.c

+26 −13
Original line number Diff line number Diff line
@@ -1721,10 +1721,11 @@ static const struct rf_channel rf_vals_5222[] = { 
	{ 161, 0x00022020, 0x000090be, 0x00000101, 0x00000a07 },

};



static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

{

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	u8 *txpower;

	struct channel_info *info;

	char *tx_power;

	unsigned int i;



	/*
@@ -1740,21 +1741,11 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
				rt2x00_eeprom_addr(rt2x00dev,

						   EEPROM_MAC_ADDR_0));



	/*

	 * Convert tx_power array in eeprom.

	 */

	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);



	/*

	 * Initialize hw_mode information.

	 */

	spec->supported_bands = SUPPORT_BAND_2GHZ;

	spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;

	spec->tx_power_a = NULL;

	spec->tx_power_bg = txpower;

	spec->tx_power_default = DEFAULT_TXPOWER;



	if (rt2x00_rf(&rt2x00dev->chip, RF2522)) {

		spec->num_channels = ARRAY_SIZE(rf_vals_bg_2522);
@@ -1776,6 +1767,26 @@ static void rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
		spec->num_channels = ARRAY_SIZE(rf_vals_5222);

		spec->channels = rf_vals_5222;

	}



	/*

	 * Create channel information array

	 */

	info = kzalloc(spec->num_channels * sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	spec->channels_info = info;



	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);



	if (spec->num_channels > 14) {

		for (i = 14; i < spec->num_channels; i++)

			info[i].tx_power1 = DEFAULT_TXPOWER;

	}



	return 0;

}



static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev)
@@ -1796,7 +1807,9 @@ static int rt2500pci_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize hw specifications.

	 */

	rt2500pci_probe_hw_mode(rt2x00dev);

	retval = rt2500pci_probe_hw_mode(rt2x00dev);

	if (retval)

		return retval;



	/*

	 * This device requires the atim queue and DMA-mapped skbs.

drivers/net/wireless/rt2x00/rt2500pci.h

+5 −12
Original line number Diff line number Diff line
@@ -1224,16 +1224,9 @@ 
#define DEFAULT_TXPOWER	24



#define TXPOWER_FROM_DEV(__txpower) \

({						\

	((__txpower) > MAX_TXPOWER) ?		\

		DEFAULT_TXPOWER : (__txpower);	\

})

	(((u8)(__txpower)) > MAX_TXPOWER) ? DEFAULT_TXPOWER : (__txpower)



#define TXPOWER_TO_DEV(__txpower) \

({							\

	((__txpower) <= MIN_TXPOWER) ? MIN_TXPOWER :	\

	(((__txpower) >= MAX_TXPOWER) ? MAX_TXPOWER :	\

	(__txpower));					\

})

	clamp_t(char, __txpower, MIN_TXPOWER, MAX_TXPOWER)



#endif /* RT2500PCI_H */

drivers/net/wireless/rt2x00/rt2500usb.c

+26 −13
Original line number Diff line number Diff line
@@ -1665,10 +1665,11 @@ static const struct rf_channel rf_vals_5222[] = { 
	{ 161, 0x00022020, 0x000090be, 0x00000101, 0x00000a07 },

};



static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)

{

	struct hw_mode_spec *spec = &rt2x00dev->spec;

	u8 *txpower;

	struct channel_info *info;

	char *tx_power;

	unsigned int i;



	/*
@@ -1686,21 +1687,11 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
				rt2x00_eeprom_addr(rt2x00dev,

						   EEPROM_MAC_ADDR_0));



	/*

	 * Convert tx_power array in eeprom.

	 */

	txpower = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		txpower[i] = TXPOWER_FROM_DEV(txpower[i]);



	/*

	 * Initialize hw_mode information.

	 */

	spec->supported_bands = SUPPORT_BAND_2GHZ;

	spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;

	spec->tx_power_a = NULL;

	spec->tx_power_bg = txpower;

	spec->tx_power_default = DEFAULT_TXPOWER;



	if (rt2x00_rf(&rt2x00dev->chip, RF2522)) {

		spec->num_channels = ARRAY_SIZE(rf_vals_bg_2522);
@@ -1722,6 +1713,26 @@ static void rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 
		spec->num_channels = ARRAY_SIZE(rf_vals_5222);

		spec->channels = rf_vals_5222;

	}



	/*

	 * Create channel information array

	 */

	info = kzalloc(spec->num_channels * sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	spec->channels_info = info;



	tx_power = rt2x00_eeprom_addr(rt2x00dev, EEPROM_TXPOWER_START);

	for (i = 0; i < 14; i++)

		info[i].tx_power1 = TXPOWER_FROM_DEV(tx_power[i]);



	if (spec->num_channels > 14) {

		for (i = 14; i < spec->num_channels; i++)

			info[i].tx_power1 = DEFAULT_TXPOWER;

	}



	return 0;

}



static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev)
@@ -1742,7 +1753,9 @@ static int rt2500usb_probe_hw(struct rt2x00_dev *rt2x00dev) 
	/*

	 * Initialize hw specifications.

	 */

	rt2500usb_probe_hw_mode(rt2x00dev);

	retval = rt2500usb_probe_hw_mode(rt2x00dev);

	if (retval)

		return retval;



	/*

	 * This device requires the atim queue