Merge enough FreeBSD code to make RT5592 work.

This commit is contained in:
mlelstv 2016-09-16 09:25:30 +00:00
parent 2ad613d4d2
commit faca41fb2b
4 changed files with 1242 additions and 119 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: rt2860reg.h,v 1.5 2016/07/08 01:24:53 christos Exp $ */
/* $NetBSD: rt2860reg.h,v 1.6 2016/09/16 09:25:30 mlelstv Exp $ */
/* $OpenBSD: rt2860reg.h,v 1.32 2014/05/24 10:10:17 stsp Exp $ */
/*-
@ -83,6 +83,8 @@
#define RT3070_LDO_CFG0 0x05d4
#define RT3070_GPIO_SWITCH 0x05dc
/* RT5592 registers */
#define RT5592_DEBUG_INDEX 0x05e8
@ -783,6 +785,12 @@
/* possible flags for RT3053 RF register 51 */
#define RT3593_TX_LO1 (1U << 4)
/* Possible flags for RT5390 RF register 2. */
#define RT5390_RESCAL (1 << 7)
/* Possible flags for RT5390 RF register 3. */
#define RT5390_VCOCAL (1 << 7)
/* Possible flags for RT5390 BBP register 4. */
#define RT5390_MAC_IF_CTRL (1U << 6)

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
/* $NetBSD: if_runvar.h,v 1.2 2016/04/23 10:15:31 skrll Exp $ */
/* $NetBSD: if_runvar.h,v 1.3 2016/09/16 09:25:30 mlelstv Exp $ */
/* $OpenBSD: if_runvar.h,v 1.8 2010/02/08 18:46:47 damien Exp $ */
/*-
@ -147,7 +147,7 @@ struct run_softc {
uint16_t mac_ver;
uint16_t mac_rev;
uint8_t rf_rev;
uint16_t rf_rev;
uint8_t freq;
uint8_t ntxchains;
uint8_t nrxchains;
@ -167,6 +167,7 @@ struct run_softc {
uint8_t txmixgain_5ghz;
int8_t txpow1[54];
int8_t txpow2[54];
int8_t txpow3[54];
int8_t rssi_2ghz[3];
int8_t rssi_5ghz[3];
uint8_t lna[4];

View File

@ -1,4 +1,4 @@
/* $NetBSD: ieee80211.h,v 1.27 2016/04/27 20:17:00 christos Exp $ */
/* $NetBSD: ieee80211.h,v 1.28 2016/09/16 09:25:30 mlelstv Exp $ */
/*-
* Copyright (c) 2001 Atsushi Onoe
* Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@ -181,6 +181,9 @@ struct ieee80211_qosframe_addr4 {
#define IEEE80211_FC1_DIR_FROMDS 0x02 /* AP ->STA */
#define IEEE80211_FC1_DIR_DSTODS 0x03 /* AP ->AP */
#define IEEE80211_IS_DSTODS(wh) \
(((wh)->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS)
#define IEEE80211_FC1_MORE_FRAG 0x04
#define IEEE80211_FC1_RETRY 0x08
#define IEEE80211_FC1_PWR_MGT 0x10
@ -213,6 +216,12 @@ struct ieee80211_qosframe_addr4 {
#define IEEE80211_QOS_ESOP_S 4
#define IEEE80211_QOS_TID 0x000f
/* does frame have QoS sequence control data */
#define IEEE80211_QOS_HAS_SEQ(wh) \
(((wh)->i_fc[0] & \
(IEEE80211_FC0_TYPE_MASK | IEEE80211_FC0_SUBTYPE_QOS)) == \
(IEEE80211_FC0_TYPE_DATA | IEEE80211_FC0_SUBTYPE_QOS))
/*
* WME/802.11e information element.
*/