diff options
author | hselasky <hselasky@FreeBSD.org> | 2014-01-22 09:57:26 +0000 |
---|---|---|
committer | hselasky <hselasky@FreeBSD.org> | 2014-01-22 09:57:26 +0000 |
commit | ce97156ddbcbae32950bb1ed413d665d53b4b1a9 (patch) | |
tree | 3e590d03e0b7e4219731ff75b24d1d86b6365dcd /sys/dev/usb/wlan/if_run.c | |
parent | ded3d7758a66b36a9e1c4f6a01fd9ea2f48b0c67 (diff) | |
download | FreeBSD-src-ce97156ddbcbae32950bb1ed413d665d53b4b1a9.zip FreeBSD-src-ce97156ddbcbae32950bb1ed413d665d53b4b1a9.tar.gz |
- Fix some non-portable code with regard to endianness. Don't use memmove().
- Fix a range check for maximum transmit length.
- Fix read from missing field when transmitting data.
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/usb/wlan/if_run.c')
-rw-r--r-- | sys/dev/usb/wlan/if_run.c | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/sys/dev/usb/wlan/if_run.c b/sys/dev/usb/wlan/if_run.c index 8541a7c..9394792 100644 --- a/sys/dev/usb/wlan/if_run.c +++ b/sys/dev/usb/wlan/if_run.c @@ -1356,11 +1356,22 @@ run_efuse_read(struct run_softc *sc, uint16_t addr, uint16_t *val, int count) uint16_t reg; int error, ntries; + switch (count) { + case 1: + *val = 0xff; /* address not found */ + break; + case 2: + *val = 0xffff; /* address not found */ + addr *= 2; + break; + default: + *val = 0xffff; /* address not found */ + return (USB_ERR_INVAL); + } + if ((error = run_read(sc, RT3070_EFUSE_CTRL, &tmp)) != 0) return (error); - if (count == 2) - addr *= 2; /*- * Read one 16-byte block into registers EFUSE_DATA[0-3]: * DATA0: F E D C @@ -1381,21 +1392,21 @@ run_efuse_read(struct run_softc *sc, uint16_t addr, uint16_t *val, int count) if (ntries == 100) return (ETIMEDOUT); - if ((tmp & RT3070_EFUSE_AOUT_MASK) == RT3070_EFUSE_AOUT_MASK) { - *val = 0xffff; /* address not found */ + if ((tmp & RT3070_EFUSE_AOUT_MASK) == RT3070_EFUSE_AOUT_MASK) return (0); - } + /* determine to which 32-bit register our 16-bit word belongs */ reg = RT3070_EFUSE_DATA3 - (addr & 0xc); if ((error = run_read(sc, reg, &tmp)) != 0) return (error); - if (count == 2) - *val = (addr & 2) ? tmp >> 16 : tmp & 0xffff; - else { - tmp >>= (8 *(addr & 0x3)); - memmove(val, &tmp, sizeof(*val)); - } + /* get correct bytes */ + *val = (uint16_t)(tmp >> (8 * (addr & 0x3))); + + /* mask for byte read, if any */ + if (count == 1) + *val &= 0xff; + return (0); } @@ -3083,10 +3094,9 @@ tr_setup: STAILQ_REMOVE_HEAD(&pq->tx_qh, next); m = data->m; - size = (sc->mac_ver == 0x5592) ? - RUN_MAX_TXSZ + sizeof(uint32_t) : RUN_MAX_TXSZ; - if ((m->m_pkthdr.len + - sizeof(data->desc) + 3 + 8) > size) { + size = (sc->mac_ver == 0x5592) ? + sizeof(data->desc) + sizeof(uint32_t) : sizeof(data->desc); + if ((m->m_pkthdr.len + size + 3 + 8) > RUN_MAX_TXSZ) { DPRINTF("data overflow, %u bytes\n", m->m_pkthdr.len); @@ -3098,8 +3108,6 @@ tr_setup: } pc = usbd_xfer_get_frame(xfer, 0); - size = (sc->mac_ver == 0x5592) ? - sizeof(data->desc) + sizeof(uint32_t) : sizeof(data->desc); usbd_copy_in(pc, 0, &data->desc, size); usbd_m_copy_in(pc, size, m, 0, m->m_pkthdr.len); size += m->m_pkthdr.len; |