aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorAndriy Voskoboinyk <avos@FreeBSD.org>2017-08-27 12:44:56 +0000
committerAndriy Voskoboinyk <avos@FreeBSD.org>2017-08-27 12:44:56 +0000
commit5c7083ce99b97afeefb045eea2723b7030297cba (patch)
treed025be96ef5d1667bb702f9d488cd70061a2cb11 /sys
parent58d8f357c7399fd03d0cd6c5a8e6d6d7ed7bc562 (diff)
downloadsrc-5c7083ce99b97afeefb045eea2723b7030297cba.tar.gz
src-5c7083ce99b97afeefb045eea2723b7030297cba.zip
rtwn(4): change type for Tx power values (RTL8192C / RTL8188EU).
Tx power values can easily fit into uint8_t + only 8 bits are written to registers; values may overflow only in case if ROM contains malformed data (but limit is checked anyway). Tested with RTL8188CUS, dev.rtwn.1.debug=0x2000 (no changes).
Notes
Notes: svn path=/head/; revision=322949
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/rtwn/rtl8188e/r88e.h2
-rw-r--r--sys/dev/rtwn/rtl8188e/r88e_chan.c2
-rw-r--r--sys/dev/rtwn/rtl8192c/r92c.h2
-rw-r--r--sys/dev/rtwn/rtl8192c/r92c_chan.c6
-rw-r--r--sys/dev/rtwn/rtl8192c/r92c_var.h2
5 files changed, 7 insertions, 7 deletions
diff --git a/sys/dev/rtwn/rtl8188e/r88e.h b/sys/dev/rtwn/rtl8188e/r88e.h
index 1c03ddd31823..3a3c0865a43e 100644
--- a/sys/dev/rtwn/rtl8188e/r88e.h
+++ b/sys/dev/rtwn/rtl8188e/r88e.h
@@ -49,7 +49,7 @@ uint8_t r88e_temp_read(struct rtwn_softc *);
/* r88e_chan.c */
void r88e_get_txpower(struct rtwn_softc *, int,
- struct ieee80211_channel *, uint16_t[]);
+ struct ieee80211_channel *, uint8_t[]);
void r88e_set_bw20(struct rtwn_softc *, uint8_t);
void r88e_set_gain(struct rtwn_softc *, uint8_t);
diff --git a/sys/dev/rtwn/rtl8188e/r88e_chan.c b/sys/dev/rtwn/rtl8188e/r88e_chan.c
index 6c7995b19214..9eac85c2aec4 100644
--- a/sys/dev/rtwn/rtl8188e/r88e_chan.c
+++ b/sys/dev/rtwn/rtl8188e/r88e_chan.c
@@ -85,7 +85,7 @@ r88e_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c)
void
r88e_get_txpower(struct rtwn_softc *sc, int chain,
- struct ieee80211_channel *c, uint16_t power[RTWN_RIDX_COUNT])
+ struct ieee80211_channel *c, uint8_t power[RTWN_RIDX_COUNT])
{
struct r92c_softc *rs = sc->sc_priv;
const struct rtwn_r88e_txpwr *rt = rs->rs_txpwr;
diff --git a/sys/dev/rtwn/rtl8192c/r92c.h b/sys/dev/rtwn/rtl8192c/r92c.h
index 5ac666d083db..ff6b8d277a69 100644
--- a/sys/dev/rtwn/rtl8192c/r92c.h
+++ b/sys/dev/rtwn/rtl8192c/r92c.h
@@ -55,7 +55,7 @@ uint8_t r92c_temp_read(struct rtwn_softc *);
/* r92c_chan.c */
void r92c_get_txpower(struct rtwn_softc *, int,
- struct ieee80211_channel *, uint16_t[]);
+ struct ieee80211_channel *, uint8_t[]);
void r92c_set_bw20(struct rtwn_softc *, uint8_t);
void r92c_set_chan(struct rtwn_softc *, struct ieee80211_channel *);
void r92c_set_gain(struct rtwn_softc *, uint8_t);
diff --git a/sys/dev/rtwn/rtl8192c/r92c_chan.c b/sys/dev/rtwn/rtl8192c/r92c_chan.c
index 4126194cfa91..e51f98b41a86 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_chan.c
+++ b/sys/dev/rtwn/rtl8192c/r92c_chan.c
@@ -82,7 +82,7 @@ r92c_get_power_group(struct rtwn_softc *sc, struct ieee80211_channel *c)
/* XXX recheck */
void
r92c_get_txpower(struct rtwn_softc *sc, int chain,
- struct ieee80211_channel *c, uint16_t power[RTWN_RIDX_COUNT])
+ struct ieee80211_channel *c, uint8_t power[RTWN_RIDX_COUNT])
{
struct r92c_softc *rs = sc->sc_priv;
struct rtwn_r92c_txpwr *rt = rs->rs_txpwr;
@@ -158,7 +158,7 @@ r92c_get_txpower(struct rtwn_softc *sc, int chain,
static void
r92c_write_txpower(struct rtwn_softc *sc, int chain,
- uint16_t power[RTWN_RIDX_COUNT])
+ uint8_t power[RTWN_RIDX_COUNT])
{
uint32_t reg;
@@ -221,7 +221,7 @@ r92c_write_txpower(struct rtwn_softc *sc, int chain,
static void
r92c_set_txpower(struct rtwn_softc *sc, struct ieee80211_channel *c)
{
- uint16_t power[RTWN_RIDX_COUNT];
+ uint8_t power[RTWN_RIDX_COUNT];
int i;
for (i = 0; i < sc->ntxchains; i++) {
diff --git a/sys/dev/rtwn/rtl8192c/r92c_var.h b/sys/dev/rtwn/rtl8192c/r92c_var.h
index c48318d9feb3..79592449ebf7 100644
--- a/sys/dev/rtwn/rtl8192c/r92c_var.h
+++ b/sys/dev/rtwn/rtl8192c/r92c_var.h
@@ -53,7 +53,7 @@ struct r92c_softc {
void (*rs_set_bw20)(struct rtwn_softc *, uint8_t);
void (*rs_get_txpower)(struct rtwn_softc *, int,
- struct ieee80211_channel *, uint16_t[]);
+ struct ieee80211_channel *, uint8_t[]);
void (*rs_set_gain)(struct rtwn_softc *, uint8_t);
void (*rs_tx_enable_ampdu)(void *, int);
void (*rs_tx_setup_hwseq)(void *);