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

Get rid of memmove(). It's not portable.

Browse Source 
Tested on RT3071, RT3573, RT3570, RT3572, and RT5572.

Reviewed by:	hselasky
This commit is contained in:
Kevin Lo 2014-01-24 09:17:29 +00:00
parent 5fa3fdd3d9
commit 56ae078529
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=261118
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,8 +359,6 @@ static int run_write(struct run_softc *, uint16_t, uint32_t);
static int run_write_region_1(struct run_softc *, uint16_t,
const uint8_t *, int);
static int run_set_region_4(struct run_softc *, uint16_t, uint32_t, int);
static int run_rf3593_efuse_read_1(struct run_softc *, uint16_t,
uint16_t *);
static int run_efuse_read(struct run_softc *, uint16_t, uint16_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 *);
@ -1343,12 +1341,6 @@ run_set_region_4(struct run_softc *sc, uint16_t reg, uint32_t val, int len)
return (error);
}
static int
run_rf3593_efuse_read_1(struct run_softc *sc, uint16_t addr, uint16_t *val)
{
return (run_efuse_read(sc, addr * 2, val, 1));
}
static int
run_efuse_read(struct run_softc *sc, uint16_t addr, uint16_t *val, int count)
{
@ -1390,12 +1382,9 @@ run_efuse_read(struct run_softc *sc, uint16_t addr, uint16_t *val, int count)
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));
}
tmp >>= (8 * (addr & 0x3));
*val = (addr & 1) ? tmp >> 16 : tmp & 0xffff;
return (0);
}
@ -1753,10 +1742,8 @@ run_read_eeprom(struct run_softc *sc)
if (sc->mac_ver >= 0x3070) {
run_read(sc, RT3070_EFUSE_CTRL, &tmp);
DPRINTF("EFUSE_CTRL=0x%08x\n", tmp);
if ((tmp & RT3070_SEL_EFUSE) && sc->mac_ver != 0x3593)
if ((tmp & RT3070_SEL_EFUSE) || sc->mac_ver == 0x3593)
sc->sc_srom_read = run_efuse_read_2;
else
sc->sc_srom_read = run_rf3593_efuse_read_1;
}
/* read ROM version */