d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change run_rt2870_rf_write() prototype (no functional change)

Browse Source
This commit is contained in:
kevlo 2013-11-29 07:08:17 +00:00
parent b17645aa8b
commit 9f3c182db5
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sys/dev/usb/wlan/if_run.c
View File

@ -344,7 +344,7 @@ static int run_write_region_1(struct run_softc *, uint16_t,
static int run_set_region_4(struct run_softc *, uint16_t, uint32_t, int);
static int run_efuse_read_2(struct run_softc *, uint16_t, uint16_t *);
static int run_eeprom_read_2(struct run_softc *, uint16_t, uint16_t *);
static int run_rt2870_rf_write(struct run_softc *, uint8_t, uint32_t);
static int run_rt2870_rf_write(struct run_softc *, uint32_t);
static int run_rt3070_rf_read(struct run_softc *, uint8_t, uint8_t *);
static int run_rt3070_rf_write(struct run_softc *, uint8_t, uint8_t);
static int run_bbp_read(struct run_softc *, uint8_t, uint8_t *);
@ -1279,7 +1279,7 @@ run_srom_read(struct run_softc *sc, uint16_t addr, uint16_t *val)
}
static int
run_rt2870_rf_write(struct run_softc *sc, uint8_t reg, uint32_t val)
run_rt2870_rf_write(struct run_softc *sc, uint32_t val)
{
uint32_t tmp;
int error, ntries;
@ -3684,24 +3684,24 @@ run_rt2870_set_chan(struct run_softc *sc, u_int chan)
r4 |= (txpow2 << 6);
}
run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
run_rt2870_rf_write(sc, RT2860_RF2, r2);
run_rt2870_rf_write(sc, RT2860_RF3, r3 & ~(1 << 2));
run_rt2870_rf_write(sc, RT2860_RF4, r4);
run_rt2870_rf_write(sc, rfprog[i].r1);
run_rt2870_rf_write(sc, r2);
run_rt2870_rf_write(sc, r3 & ~(1 << 2));
run_rt2870_rf_write(sc, r4);
run_delay(sc, 10);
run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
run_rt2870_rf_write(sc, RT2860_RF2, r2);
run_rt2870_rf_write(sc, RT2860_RF3, r3 | (1 << 2));
run_rt2870_rf_write(sc, RT2860_RF4, r4);
run_rt2870_rf_write(sc, rfprog[i].r1);
run_rt2870_rf_write(sc, r2);
run_rt2870_rf_write(sc, r3 | (1 << 2));
run_rt2870_rf_write(sc, r4);
run_delay(sc, 10);
run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1);
run_rt2870_rf_write(sc, RT2860_RF2, r2);
run_rt2870_rf_write(sc, RT2860_RF3, r3 & ~(1 << 2));
run_rt2870_rf_write(sc, RT2860_RF4, r4);
run_rt2870_rf_write(sc, rfprog[i].r1);
run_rt2870_rf_write(sc, r2);
run_rt2870_rf_write(sc, r3 & ~(1 << 2));
run_rt2870_rf_write(sc, r4);
}
static void

5
sys/dev/usb/wlan/if_runreg.h
View File

@ -844,11 +844,6 @@ struct rt2860_rxwi {
sizeof (struct ieee80211_htframe) + \
sizeof (uint16_t))
#define RT2860_RF1 0
#define RT2860_RF2 2
#define RT2860_RF3 1
#define RT2860_RF4 3
#define RT2860_RF_2820 0x0001 /* 2T3R */
#define RT2860_RF_2850 0x0002 /* dual-band 2T3R */
#define RT2860_RF_2720 0x0003 /* 1T2R */