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

Commit 7573cb5b authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

rt2800lib: merge same defines 



Merge 3290 and 5390 POWER_BOUND and FREQ_OFFSET_BOUND defines.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d7d55d6

drivers/net/wireless/rt2x00/rt2800lib.c

+12 −17
Original line number Diff line number Diff line
@@ -1940,10 +1940,8 @@ static void rt2800_config_channel_rf3052(struct rt2x00_dev *rt2x00dev, 
	rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);

}



#define RT3290_POWER_BOUND     0x27

#define RT3290_FREQ_OFFSET_BOUND       0x5f

#define RT5390_POWER_BOUND     0x27

#define RT5390_FREQ_OFFSET_BOUND       0x5f

#define POWER_BOUND		0x27

#define FREQ_OFFSET_BOUND	0x5f



static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,

					 struct ieee80211_conf *conf,
@@ -1959,16 +1957,15 @@ static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev, 
	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);

	if (info->default_power1 > RT3290_POWER_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, RT3290_POWER_BOUND);

	if (info->default_power1 > POWER_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);

	else

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);

	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);

	if (rt2x00dev->freq_offset > RT3290_FREQ_OFFSET_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE,

				  RT3290_FREQ_OFFSET_BOUND);

	if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);

	else

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);

	rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
@@ -2002,17 +1999,16 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, 
	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 49, &rfcsr);

	if (info->default_power1 > RT5390_POWER_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, RT5390_POWER_BOUND);

	if (info->default_power1 > POWER_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);

	else

		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);

	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);



	if (rt2x00_rt(rt2x00dev, RT5392)) {

		rt2800_rfcsr_read(rt2x00dev, 50, &rfcsr);

		if (info->default_power1 > RT5390_POWER_BOUND)

			rt2x00_set_field8(&rfcsr, RFCSR50_TX,

					  RT5390_POWER_BOUND);

		if (info->default_power1 > POWER_BOUND)

			rt2x00_set_field8(&rfcsr, RFCSR50_TX, POWER_BOUND);

		else

			rt2x00_set_field8(&rfcsr, RFCSR50_TX,

					  info->default_power2);
@@ -2031,9 +2027,8 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, 
	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);



	rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);

	if (rt2x00dev->freq_offset > RT5390_FREQ_OFFSET_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE,

				  RT5390_FREQ_OFFSET_BOUND);

	if (rt2x00dev->freq_offset > FREQ_OFFSET_BOUND)

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, FREQ_OFFSET_BOUND);

	else

		rt2x00_set_field8(&rfcsr, RFCSR17_CODE, rt2x00dev->freq_offset);

	rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);