mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

Fix max TX power settings for RT5390/RT5392.

Browse Source 
While here remove wrong definition of RT2860_USB_PHY_MAN_RST.
This commit is contained in:
Kevin Lo 2015-10-04 13:39:00 +00:00
parent b86860001b
commit 24c838f059
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=288666
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1692,14 +1692,14 @@ run_get_txpower(struct run_softc *sc)
/* Fix broken Tx power entries. */ /* Fix broken Tx power entries. */
for (i = 0; i < 14; i++) { for (i = 0; i < 14; i++) {
if (sc->mac_ver >= 0x5390) { if (sc->mac_ver >= 0x5390) {
if (sc->txpow1[i] < 0 || sc->txpow1[i] > 27) if (sc->txpow1[i] < 0 || sc->txpow1[i] > 39)
sc->txpow1[i] = 5; sc->txpow1[i] = 5;
} else { } else {
if (sc->txpow1[i] < 0 || sc->txpow1[i] > 31) if (sc->txpow1[i] < 0 || sc->txpow1[i] > 31)
sc->txpow1[i] = 5; sc->txpow1[i] = 5;
} }
if (sc->mac_ver > 0x5390) { if (sc->mac_ver > 0x5390) {
if (sc->txpow2[i] < 0 || sc->txpow2[i] > 27) if (sc->txpow2[i] < 0 || sc->txpow2[i] > 39)
sc->txpow2[i] = 5; sc->txpow2[i] = 5;
} else if (sc->mac_ver < 0x5390) { } else if (sc->mac_ver < 0x5390) {
if (sc->txpow2[i] < 0 || sc->txpow2[i] > 31) if (sc->txpow2[i] < 0 || sc->txpow2[i] > 31)

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

@ -274,7 +274,6 @@
#define RT2860_USB_TXOP_HALT (1 << 20) #define RT2860_USB_TXOP_HALT (1 << 20)
#define RT2860_USB_TX_CLEAR (1 << 19) #define RT2860_USB_TX_CLEAR (1 << 19)
#define RT2860_USB_PHY_WD_EN (1 << 16) #define RT2860_USB_PHY_WD_EN (1 << 16)
#define RT2860_USB_PHY_MAN_RST (1 << 15)
#define RT2860_USB_RX_AGG_LMT(x) ((x) << 8) /* in unit of 1KB */ #define RT2860_USB_RX_AGG_LMT(x) ((x) << 8) /* in unit of 1KB */
#define RT2860_USB_RX_AGG_TO(x) ((x) & 0xff) /* in unit of 33ns */ #define RT2860_USB_RX_AGG_TO(x) ((x) & 0xff) /* in unit of 33ns */